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

r59 - in trunk: . mapstoragemanagerarch mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/ui/gui msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap
by dlanglais＠users.nuiton.org 07 Feb '10

07 Feb '10

Author: dlanglais Date: 2010-02-07 03:26:34 +0100 (Sun, 07 Feb 2010) New Revision: 59 Removed: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable1.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java Modified: trunk/mapstoragemanagerarch/pom.xml trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/Core.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/MainTestCore.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java trunk/pom.xml Log: Corrections d'erreur mineurs (checkstyle... Sonar) Modified: trunk/mapstoragemanagerarch/pom.xml =================================================================== --- trunk/mapstoragemanagerarch/pom.xml 2010-02-07 01:17:05 UTC (rev 58) +++ trunk/mapstoragemanagerarch/pom.xml 2010-02-07 02:26:34 UTC (rev 59) @@ -152,14 +152,14 @@ </properties> <build> - <resources> - <resource> - <directory>src/main/java/org/nuiton/mapstoragemanager/plugins</directory> - <excludes> - <exclude>HBase.java</exclude> - </excludes> - </resource> - </resources> + <resources> + <resource> + <directory>src/main/java/org/nuiton/mapstoragemanager/plugins</directory> + <excludes> + <exclude>HBase.java</exclude> + </excludes> + </resource> + </resources> Modified: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/Core.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/Core.java 2010-02-07 01:17:05 UTC (rev 58) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/Core.java 2010-02-07 02:26:34 UTC (rev 59) @@ -4,7 +4,9 @@ import java.io.IOException; import java.net.URL; import java.util.ArrayList; +import java.util.List; import java.util.HashMap; +import java.util.Map; import org.nuiton.mapstoragemanager.plugins.BigTable; @@ -19,7 +21,7 @@ /** * A map "name of the plugin" - "plugin instance". */ - private HashMap < String, BigTable > bases = + private Map < String, BigTable > bases = new HashMap < String, BigTable > (); /** @@ -77,7 +79,7 @@ * Returns an ArrayList of all the plugins instances. * @return an ArrayList of all the plugins instances */ - public final ArrayList < BigTable > getAvailableBases() { + public final List < BigTable > getAvailableBases() { ArrayList < BigTable > bigTables = new ArrayList < BigTable > (); for (BigTable bigTable : bases.values()) { bigTables.add(bigTable); @@ -89,7 +91,7 @@ * Returns an ArrayList of all the plugins class names. * @return an ArrayList of all the plugins class names */ - public final ArrayList < String > listPlugins() { + public final List < String > listPlugins() { ArrayList < String > s = new ArrayList<String>(); for (String plugin : this.bases.keySet()) { s.add(plugin); Modified: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/MainTestCore.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/MainTestCore.java 2010-02-07 01:17:05 UTC (rev 58) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/MainTestCore.java 2010-02-07 02:26:34 UTC (rev 59) @@ -1,13 +1,9 @@ package org.nuiton.mapstoragemanager.core; -import org.apache.commons.logging.LogFactory; -import org.apache.commons.logging.Log; import org.nuiton.mapstoragemanager.plugins.BigTable; public class MainTestCore { - private static final Log log = LogFactory.getLog(MainTestCore.class); - /** * test for plugins loading and basic functions. * @param args args @@ -15,17 +11,17 @@ public static void main(final String[] args) { Core core = new Core(); - - log.info("Plugins disponibles"); + + System.out.println("Plugins disponibles"); for (String base : core.listPlugins()) { - log.info("* " + base); + System.out.println("* " + base); } /* Test du plugins */ for (BigTable bigTable : core.getAvailableBases()) { bigTable.put("clé", "valeur"); - log.info(bigTable.get("clé")); + System.out.println(bigTable.get("clé")); } } Modified: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java 2010-02-07 01:17:05 UTC (rev 58) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java 2010-02-07 02:26:34 UTC (rev 59) @@ -7,6 +7,7 @@ import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; +import java.util.List; import java.util.Enumeration; import java.util.jar.JarEntry; import java.util.jar.JarFile; @@ -27,7 +28,7 @@ /** * The plugin classes. */ - private ArrayList < Class < ? > > classes = + private List < Class < ? > > classes = new ArrayList < Class < ? > > (); /** @@ -152,7 +153,7 @@ * Returns the plugin classes. * @return the plugin classes */ - public final ArrayList < Class < ? > > getPluginsClasses() { + public final List < Class < ? > > getPluginsClasses() { return classes; } Modified: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-02-07 01:17:05 UTC (rev 58) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-02-07 02:26:34 UTC (rev 59) @@ -1,8 +1,6 @@ package org.nuiton.mapstoragemanager.core; import java.net.MalformedURLException; -import org.apache.commons.logging.LogFactory; -import org.apache.commons.logging.Log; /** * @author fdesbois @@ -11,13 +9,12 @@ @Deprecated public class TestServiceLoader { - private static final Log log = LogFactory.getLog(TestServiceLoader.class); - public TestServiceLoader() { try { BigTableLoader p = - new BigTableLoader("plugins", this.getClass().getClassLoader()); - log.info(p.getBigTable()); + new BigTableLoader("plugins", + this.getClass().getClassLoader()); + System.out.println(p.getBigTable()); } catch (MalformedURLException e) { // TODO Auto-generated catch block e.printStackTrace(); Modified: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java 2010-02-07 01:17:05 UTC (rev 58) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java 2010-02-07 02:26:34 UTC (rev 59) @@ -1,8 +1,8 @@ + import java.io.IOException; +import java.util.ArrayList; import java.util.HashSet; import java.util.Set; -import org.apache.commons.logging.LogFactory; -import org.apache.commons.logging.Log; import org.nuiton.mapstoragemanager.plugins.BigTable; import org.apache.hadoop.hbase.HBaseConfiguration; @@ -14,76 +14,73 @@ import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.util.Bytes; - public class HBase implements BigTable { - private static final Log log = LogFactory.getLog(BigTable.class); - - 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); - log.info("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)); + private HBaseConfiguration config; + private HTable table; + private String familyName = "mylittlecolumnfamily"; + private String rowName = "myLittleRow"; + private String tableName = "mylittletable"; - // 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)); + 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"); + } - // 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) + @Override + public void put(String key, String value) { - /*try { - table.put(p); - } catch (IOException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } -*/ - } + // 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)); - @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; + // 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), @@ -91,80 +88,78 @@ // } 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>(); + // If we convert the value bytes, we should get back 'Some Value', the + // value we inserted at this location. + String valueStr = Bytes.toString(value); - // 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(); - } + return "valeur"; + //return valueStr; + } - // 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 Set<String> getKeys() { - @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(); - } + 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(); + } } Modified: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap.java 2010-02-07 01:17:05 UTC (rev 58) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap.java 2010-02-07 02:26:34 UTC (rev 59) @@ -1,30 +1,34 @@ package org.nuiton.mapstoragemanager.plugins; import java.util.HashMap; +import java.util.Map; import java.util.Set; -public class OurHashMap implements BigTable { +public class OurHashMap implements BigTable{ - HashMap<String, String> map = new HashMap<String, String>(); + private Map<String,String> map = new HashMap<String, String>(); + + public String get(String key) { + return map.get(key); + } - public String get(String key) { - return map.get(key); - } + public Set<String> getKeys() { + return map.keySet(); + } - public Set<String> getKeys() { - return map.keySet(); - } + public void put(String key, String value) { + map.put(key, value); + } - 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 connect(String host, String base, String username, - String password) { - // TODO Auto-generated method stub - } + public void selectTable(String table) { + // TODO Auto-generated method stub + + } - public void selectTable(String table) { - // TODO Auto-generated method stub - } } Modified: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable.java 2010-02-07 01:17:05 UTC (rev 58) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable.java 2010-02-07 02:26:34 UTC (rev 59) @@ -9,123 +9,127 @@ */ public interface nvBigTable { - /** + /** * Connects to the database. * @param host the server - * @param port the port + * @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. + * @return return true if connexion is established, else return false. */ - boolean connect( - String host, int port, String base, String username, String passwd); + boolean connect( + String host, int port, String base, String username,String passwd); - /****************** - * Tables * - ******************/ + /****************** + * 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); + /** + * 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); + /** + * 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(); + /** + * 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 column in the table table - * @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 column in the table table - * @param table the table name - * @param column the column name - */ - void deleteColumn(String table, String column); + /******************* + * Columns * + *******************/ - /** - * Get the columns' name of one table. + /** + * Create a new column in a table. + * Add a column column in the table table + * @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 column in the table table + * @param table the table name + * @param column the column name + */ + void deleteColumn(String table, String column); + + /** + * Get the columns' name of one table. * @param table the table name - * @return Return a set containing the columns' name of the table + * @return Return a set containing the columns' name of the table * table - */ - Set<String> getColumnsNames(String table); + */ + Set<String> getColumnsNames(String table); - /*************** - * Cell * - ***************/ - /** - * Put a new content in the table. - * Put a new content in the column column of the table - * table with the key key. - * @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); + /*************** + * Cell * + ***************/ - /** - * Get a content in the table. - * Get a content in the table table from the column column - * where the key is key. - * -> 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); + /** + * Put a new content in the table. + * Put a new content in the column column of the table + * table with the key key. + * @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 table from the column column - * where the key is key. - * -> get the content with the version version. - * @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 a content in the table. + * Get a content in the table table from the column column + * where the key is key. + * -> 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 the row identified by the key key from the table table - * @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 a content in the table. + * Get a content in the table table from the column column + * where the key is key. + * -> get the content with the version version. + * @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 keys from a table. - * @param table the table - * @return return a Set containing the keys a the table table. - */ - Set<String> getKeys(String table); + /** + * Get the row identified by the key key from the table table + * @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 table. + */ + Set<String> getKeys(String table); } Modified: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-02-07 01:17:05 UTC (rev 58) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-02-07 02:26:34 UTC (rev 59) @@ -3,8 +3,6 @@ import java.util.Locale; import java.util.ResourceBundle; import javax.swing.JOptionPane; -import org.apache.commons.logging.LogFactory; -import org.apache.commons.logging.Log; /** * Engine Class with methods for application user interface. @@ -13,8 +11,6 @@ */ public class ApplicationEngine { - private static final Log log = LogFactory.getLog(ApplicationEngine.class); - Locale currentLocale; ResourceBundle messages; @@ -46,6 +42,7 @@ public void setLocale(String language, String country) { currentLocale= new Locale(language,country); messages = ResourceBundle.getBundle("mapstoragemanager",currentLocale); - log.info("ok"); + System.out.println(messages.getString("ok")); + } } Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java 2010-02-07 01:17:05 UTC (rev 58) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java 2010-02-07 02:26:34 UTC (rev 59) @@ -26,9 +26,9 @@ void deleteColumn(final String columnName); /** - * Get the columns' name of the table. - * @return Return a set containing the columns' name of the table - */ + * Get the columns' name of the table. + * @return Return a set containing the columns' name of the table + */ Set<String> getColumnsNames(); /** Deleted: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable1.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable1.java 2010-02-07 01:17:05 UTC (rev 58) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable1.java 2010-02-07 02:26:34 UTC (rev 59) @@ -1,135 +0,0 @@ -package org.nuiton.mapstoragemanager.plugins; - -import java.util.Map; -import java.util.Set; - -/** - * The interface for all the BigTable implementations. - * @author Dorian Langlais - */ -public interface nvBigTable1 { - - /** - * 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 column in the table table - * @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 column in the table table - * @param table the table name - * @param column the column name - */ - void deleteColumn(String table, String column); - - /** - * Get the columns' name of one table. - * @param table the table name - * @return Return a set containing the columns' name of the table - * table - */ - Set<String> getColumnsNames(String table); - - /*************** - * Cell * - ***************/ - - /** - * Put a new content in the table. - * Put a new content in the column column of the table - * table with the key key. - * @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 table from the column column - * where the key is key. - * -> 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 table from the column column - * where the key is key. - * -> get the content with the version version. - * @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 key from the table table - * @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 table. - */ - Set<String> getKeys(String table); -} Deleted: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java 2010-02-07 01:17:05 UTC (rev 58) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java 2010-02-07 02:26:34 UTC (rev 59) @@ -1,5 +0,0 @@ -package org.nuiton.mapstoragemanager.plugins; -/** - * The plugins interfaces. - */ - Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-02-07 01:17:05 UTC (rev 58) +++ trunk/pom.xml 2010-02-07 02:26:34 UTC (rev 59) @@ -123,28 +123,28 @@ </properties> <build> -  +  <plugins> -  +  <plugin> <groupId>org.nuiton.jaxx</groupId>

1 0

r58 - in trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager: core plugins ui/gui
by dlanglais＠users.nuiton.org 07 Feb '10

07 Feb '10

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

1 0

r57 - in trunk: mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap
by dlanglais＠users.nuiton.org 07 Feb '10

07 Feb '10

Author: dlanglais Date: 2010-02-07 02:05:18 +0100 (Sun, 07 Feb 2010) New Revision: 57 Modified: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java Log: Apr?\195?\168s un petit passage sur sonar, j'ai d?\195?\169cid?\195?\169 de corriger quelques erreurs "checkstyle"... Modified: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java 2010-02-07 00:32:05 UTC (rev 56) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java 2010-02-07 01:05:18 UTC (rev 57) @@ -1,5 +1,4 @@ import java.io.IOException; -import java.util.ArrayList; import java.util.HashSet; import java.util.Set; import org.nuiton.mapstoragemanager.plugins.BigTable; Modified: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap.java 2010-02-07 00:32:05 UTC (rev 56) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap.java 2010-02-07 01:05:18 UTC (rev 57) @@ -3,31 +3,28 @@ import java.util.HashMap; import java.util.Set; -public class OurHashMap implements BigTable{ +public class OurHashMap implements BigTable { - HashMap<String,String> map = new HashMap<String, String>(); - - public String get(String key) { - return map.get(key); - } + HashMap<String, String> map = new HashMap<String, String>(); - public Set<String> getKeys() { - return map.keySet(); - } + public String get(String key) { + return map.get(key); + } - public void put(String key, String value) { - map.put(key, value); - } + public Set<String> getKeys() { + return map.keySet(); + } - public void connect(String host, String base, String username, - String password) { - // TODO Auto-generated method stub - - } + public void put(String key, String value) { + map.put(key, value); + } - public void selectTable(String table) { - // TODO Auto-generated method stub - - } + 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 + } } Modified: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable.java 2010-02-07 00:32:05 UTC (rev 56) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable.java 2010-02-07 01:05:18 UTC (rev 57) @@ -9,127 +9,123 @@ */ public interface nvBigTable { - /** + /** * Connects to the database. * @param host the server - * @param port the port + * @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. + * @return return true if connexion is established, else return false. */ - boolean connect( - String host, int port, String base, String username,String passwd); + boolean connect( + String host, int port, String base, String username, String passwd); - /****************** - * Tables * - ******************/ - + /****************** + * 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); + /** + * 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); + /** + * 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(); + /** + * 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 column in the table table + * @param table the table name + * @param column the column name + */ + void createColumn(String table, String column); - /******************* - * Columns * - *******************/ + /** + * Delete a column in a table. + * Delete the column column in the table table + * @param table the table name + * @param column the column name + */ + void deleteColumn(String table, String column); - /** - * Create a new column in a table. - * Add a column column in the table table - * @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 column in the table table - * @param table the table name - * @param column the column name - */ - void deleteColumn(String table, String column); - - /** - * Get the columns' name of one table. + /** + * Get the columns' name of one table. * @param table the table name - * @return Return a set containing the columns' name of the table + * @return Return a set containing the columns' name of the table * table - */ - Set<String> getColumnsNames(String table); + */ + Set<String> getColumnsNames(String table); - /*************** - * Cell * - ***************/ + /*************** + * Cell * + ***************/ + /** + * Put a new content in the table. + * Put a new content in the column column of the table + * table with the key key. + * @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); - /** - * Put a new content in the table. - * Put a new content in the column column of the table - * table with the key key. - * @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 table from the column column + * where the key is key. + * -> 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 table from the column column - * where the key is key. - * -> 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 table from the column column + * where the key is key. + * -> get the content with the version version. + * @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 a content in the table. - * Get a content in the table table from the column column - * where the key is key. - * -> get the content with the version version. - * @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 key from the table table + * @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 row identified by the key key from the table table - * @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 table. - */ - Set<String> getKeys(String table); + /** + * Get the keys from a table. + * @param table the table + * @return return a Set containing the keys a the table table. + */ + Set<String> getKeys(String table); } Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-02-07 00:32:05 UTC (rev 56) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-02-07 01:05:18 UTC (rev 57) @@ -12,7 +12,15 @@ */ public class BigHashMap implements nvBigTable { + /** + * tables. + * hashMap with value is table, and key its name. + */ private Map<String, Table> tables; + /** + * currentTable. + * the table which is selected. + */ private Table currentTable; /** Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java 2010-02-07 00:32:05 UTC (rev 56) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java 2010-02-07 01:05:18 UTC (rev 57) @@ -12,8 +12,7 @@ * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet. * @licence GPL. */ -public class CellImpl<T /**extends Serializable*/ - > implements Cell<T> { +public class CellImpl<T> implements Cell<T> { /** * cell. @@ -56,7 +55,7 @@ * {@inheritDoc} */ public final T get() { - if (cell.size() == 0) { + if (this.cell.isEmpty()) { throw new NoSuchElementException(); } Long max = 0L; @@ -72,7 +71,7 @@ * {@inheritDoc} */ public int hashCode() { - if (this.cell.size() != 0) { + if (! this.cell.isEmpty()) { return this.get().hashCode(); } else { return 0; @@ -88,7 +87,7 @@ if (o instanceof CellImpl) { CellImpl another = (CellImpl) o; if(this.cell.size() == another.cell.size()) { - if(this.cell.size() == 0) { + if(this.cell.isEmpty()) { return true; } else { return this.get().equals(another.get()); @@ -105,7 +104,7 @@ */ public String toString() { - if (this.cell.size() != 0) { + if (! this.cell.isEmpty()) { return ((T) this.get()).toString(); } else { return ""; Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java 2010-02-07 00:32:05 UTC (rev 56) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java 2010-02-07 01:05:18 UTC (rev 57) @@ -11,8 +11,7 @@ * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet. * @licence GPL. */ -public class ColumnImpl<T /**extends Serializable*/ - > implements Column<T> { +public class ColumnImpl<T> implements Column<T> { /** * column. Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java 2010-02-07 00:32:05 UTC (rev 56) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java 2010-02-07 01:05:18 UTC (rev 57) @@ -16,24 +16,21 @@ * structure. * hashMap with key the column name, and value the column class. */ - private Map<String, Class<? /**extends Serializable*/ - >> structure; + private Map<String, Class<?>> structure; /** * Default constructor. */ public StructureImpl() { this.structure = - new HashMap<String, Class<? /**extends Serializable*/ - >>(); + new HashMap<String, Class<?>>(); } /** * {@inheritDoc} */ public final void createColumn(final String columnName, - final Class<? /**extends Serializable*/ - > columnClass) { + final Class<?> columnClass) { this.structure.put(columnName, columnClass); } @@ -47,8 +44,7 @@ /** * {@inheritDoc} */ - public final Class<? /**extends Serializable*/ - > getColumnClass( + public final Class<?> getColumnClass( final String columnName) { return this.structure.get(columnName); } Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java 2010-02-07 00:32:05 UTC (rev 56) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java 2010-02-07 01:05:18 UTC (rev 57) @@ -34,9 +34,8 @@ /** * {@inheritDoc} */ - public final <columnClass /**extends Serializable*/ - > void createColumn( - final String columnName, final Class<?> columnClass) { + public final <columnClass> void createColumn(final String columnName, + final Class<?> columnClass) { ColumnImpl<columnClass> column = new ColumnImpl<columnClass>(); this.tableColumns.put(columnName, column); this.tableStructure.createColumn(columnName, columnClass); @@ -54,11 +53,9 @@ * {@inheritDoc} */ public final Row getRow(final String key) { - Map<String, Object> rowContent = - new HashMap<String, Object>(); + Map<String, Object> rowContent = new HashMap<String, Object>(); for (String columnName : tableStructure.getColumnsNames()) { - rowContent.put(columnName, - tableColumns.get(columnName).get(key)); + rowContent.put(columnName, tableColumns.get(columnName).get(key)); } return new RowImpl(tableStructure, rowContent); }

1 0

r56 - in trunk: . mapstoragemanagerarch mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins mapstoragemanagerarch/src/test/java/org/nuiton/mapstoragemanager/plugins msm-bighashmap msm-bighashmap/src msm-bighashmap/src/main msm-bighashmap/src/main/java msm-bighashmap/src/main/java/org msm-bighashmap/src/main/java/org/nuiton msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins msm-bighashmap
by dlanglais＠users.nuiton.org 07 Feb '10

07 Feb '10

Author: dlanglais Date: 2010-02-07 01:32:05 +0100 (Sun, 07 Feb 2010) New Revision: 56 Added: trunk/msm-bighashmap/ trunk/msm-bighashmap/LICENSE.txt trunk/msm-bighashmap/README.txt trunk/msm-bighashmap/changelog.txt trunk/msm-bighashmap/pom.xml trunk/msm-bighashmap/src/ trunk/msm-bighashmap/src/main/ trunk/msm-bighashmap/src/main/java/ trunk/msm-bighashmap/src/main/java/org/ trunk/msm-bighashmap/src/main/java/org/nuiton/ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/package-info.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable1.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java trunk/msm-bighashmap/src/main/resources/ trunk/msm-bighashmap/src/main/resources/i18n/ trunk/msm-bighashmap/src/main/resources/i18n/mapstoragemanager-en_GB.properties trunk/msm-bighashmap/src/main/resources/i18n/mapstoragemanager-fr_FR.properties trunk/msm-bighashmap/src/main/resources/i18n/mapstoragemanagerarch-en_GB.properties trunk/msm-bighashmap/src/main/resources/i18n/mapstoragemanagerarch-fr_FR.properties trunk/msm-bighashmap/src/main/resources/i18n/msn-bighashmap-fr_FR.properties trunk/msm-bighashmap/src/main/resources/log4j.properties trunk/msm-bighashmap/src/site/ trunk/msm-bighashmap/src/test/ trunk/msm-bighashmap/src/test/java/ trunk/msm-bighashmap/src/test/java/org/ trunk/msm-bighashmap/src/test/java/org/nuiton/ trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/ trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/ trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowTest.java trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java trunk/msm-bighashmap/src/test/resources/ trunk/msm-bighashmap/src/test/resources/log4j.properties Removed: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ trunk/mapstoragemanagerarch/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ Modified: trunk/mapstoragemanagerarch/pom.xml trunk/pom.xml Log: Le projet est maintenant pleinement modulaire. Ainsi, voici l'architecture du projet : + mapstoragemanager +- pom.xml +- mapstoragemanagerarch | +- pom.xml | +- ... sources de l'achi (core, ui... peut-?\195?\170tre a renommer...) +- bighashmap +- pom.xml +- ... sources du plugin. Concernant le nom du sous-projet principal "mapstoragemanagerarch", j'ai du choisir tout seul, mais je voulais absolument boucler ?\195?\167a ce week-end. A voir pour changer son nom... Modified: trunk/mapstoragemanagerarch/pom.xml =================================================================== --- trunk/mapstoragemanagerarch/pom.xml 2010-02-06 22:52:58 UTC (rev 55) +++ trunk/mapstoragemanagerarch/pom.xml 2010-02-07 00:32:05 UTC (rev 56) @@ -152,14 +152,14 @@ </properties> <build> - <resources> - <resource> - <directory>src/main/java/org/nuiton/mapstoragemanager/plugins</directory> - <excludes> - <exclude>HBase.java</exclude> - </excludes> - </resource> - </resources> + <resources> + <resource> + <directory>src/main/java/org/nuiton/mapstoragemanager/plugins</directory> + <excludes> + <exclude>HBase.java</exclude> + </excludes> + </resource> + </resources> Added: trunk/msm-bighashmap/LICENSE.txt =================================================================== --- trunk/msm-bighashmap/LICENSE.txt (rev 0) +++ trunk/msm-bighashmap/LICENSE.txt 2010-02-07 00:32:05 UTC (rev 56) @@ -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/msm-bighashmap/changelog.txt =================================================================== --- trunk/msm-bighashmap/changelog.txt (rev 0) +++ trunk/msm-bighashmap/changelog.txt 2010-02-07 00:32:05 UTC (rev 56) @@ -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/msm-bighashmap/pom.xml =================================================================== --- trunk/msm-bighashmap/pom.xml (rev 0) +++ trunk/msm-bighashmap/pom.xml 2010-02-07 00:32:05 UTC (rev 56) @@ -0,0 +1,261 @@ +<?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"> + +  + <repositories> + <repository> + <id>org.nuiton</id> + <url>http://maven.nuiton.org/release</url> + </repository> + </repositories> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>2.0.4</version> + </parent> + + <version>0.1-SNAPSHOT</version> + <artifactId>msn-bighashmap</artifactId> + + <dependencies> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>mapstoragemanagerarch</artifactId> + <version>0.1-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${lutinutil.version}</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</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> +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.7</version> + <scope>test</scope> + </dependency> + </dependencies> + +  +  +  + + <name>MSM-BigHashMap</name> + + <description>Creation of a graphic user interface for Hbase </description> + <inceptionYear>2010</inceptionYear> + + <developers> + <developer> + <id>tchemit</id> + <name>Tony Chemit</name> + <email>chemit(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>fdesbois</id> + <name>Florian Desbois</name> + <email>fdesbois(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>fgilet</id> + <name>Florent Gilet</name> + <email>florent.gilet(a)etu.univ-nantes.fr</email> + <organization>Université de nantes</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>gcrieloue</id> + <name>Gilles Crieloue</name> + <email>gilles.crieloue(a)etu.univ-nantes.fr</email> + <organization>Université de nantes</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>afages</id> + <name>Amaury Fages</name> + <email>amaury.fages(a)etu.univ-nantes.fr</email> + <organization>Université de nantes</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>dlanglais</id> + <name>Dorian langlais</name> + <email>dorain.langlais(a)etu.univ-nantes.fr</email> + <organization>Université de nantes</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + </developers> + +  +  +  + <packaging>jar</packaging> + + <properties> + +  + <jaxx.version>2.0.0-beta-3</jaxx.version> + <lutinutil.version>1.1.2</lutinutil.version> + <i18n.version>1.0.1</i18n.version> + +  + </properties> + + <build> + + <plugins> + +  + + <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> + +  +  + + </plugins> + </pluginManagement> + </build> + +</project> + Added: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java (rev 0) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-02-07 00:32:05 UTC (rev 56) @@ -0,0 +1,130 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import org.nuiton.mapstoragemanager.plugins.nvBigTable; + +/** + * Interface listant les méthodes nécéssaires sur une base de données. + * @author Dorian Langlais + * + */ +public class BigHashMap implements nvBigTable { + + private Map<String, Table> tables; + private Table currentTable; + + /** + * Default constructor. + */ + public BigHashMap() { + this.tables = new HashMap<String, Table>(); + currentTable = null; + } + + /** + * {@inheritDoc} + * Create a new HashMap database. + */ + public boolean connect(String host, int port, String base, String username, String passwd) { + //throw new UnsupportedOperationException("Not supported yet."); + new BigHashMap(); + return true; + } + + /** + * {@inheritDoc} + */ + public void selectTable(String table) { + this.currentTable = tables.get(table); + } + + /** + * {@inheritDoc} + */ + public void createTable(String table) { + this.tables.put(table, new TableImpl()); + } + + /** + * {@inheritDoc} + */ + public void deleteTable(String table) { + this.tables.remove(table); + } + + /** + * {@inheritDoc} + */ + public Set<String> getTablesNames() { + return this.tables.keySet(); + } + + /** + * {@inheritDoc} + */ + public void createColumn(String table, String column) { + this.tables.get(table).createColumn(column, null); + } + + /** + * {@inheritDoc} + */ + public void deleteColumn(String table, String column) { + this.tables.get(table).deleteColumn(column); + } + + /** + * {@inheritDoc} + */ + public Set<String> getColumnsNames(String table) { + return this.tables.get(table).getColumnsNames(); + } + + /** + * {@inheritDoc} + */ + public void put(String table, String column, String key, String content) { + this.tables.get(table).put(column, key, content); + } + + /** + * {@inheritDoc} + */ + public String get(String table, String column, String key) { + return this.tables.get(table).get(column, key).toString(); + } + + /** + * {@inheritDoc} + */ + public String get(String table, String column, String key, int version) { + return this.tables.get(table).get(column, key, version).toString(); + } + + /** + * {@inheritDoc} + */ + public Map<String, String> getRow(String table, String key) { + + Row row = this.tables.get(table).getRow(key); + + Map<String,Object> rowContent = row.getRowContent(); + Map<String,String> rowMap = new HashMap<String,String>(); + + for(String rowKey : rowContent.keySet()) { + String rowValue = rowContent.get(rowKey).toString(); + rowMap.put(rowKey, rowValue); + } + return rowMap; + } + + /** + * {@inheritDoc} + */ + public Set<String> getKeys(String table) { + return this.tables.get(table).getKeys(); + } + +} Added: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java (rev 0) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java 2010-02-07 00:32:05 UTC (rev 56) @@ -0,0 +1,47 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +/** + * Interface to present the method an a Cell. + * @author Dorian Langlais + * + * @param <T> Class of the object stored in the cells. + */ +public interface Cell<T> { + + /** + * Get the most recent object put in the cell. + * @return The most recent object stored in the cell. + */ + T get(); + + /** + * Put a new object in the cell. + * @param t Objet to store in the cell. + */ + void put(T t); + + /** + * Get an object from its "version". + * The version number start at 0, and increase one by one at each new + * version. + * @param t the version wanted (it can be timestamp, number..). + * @return The object corresponding to the "version". + */ + T get(Long t); + + /** + * hashCode(). + * @return + */ + int hashCode(); + + /** + * equals(). + */ + boolean equals(Object o); + + /** + * toString(). + */ + String toString(); +} Added: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java (rev 0) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java 2010-02-07 00:32:05 UTC (rev 56) @@ -0,0 +1,114 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.Map; +import java.util.NoSuchElementException; + +/** + * Class Cell. + * A cell contain different version of a content. + * So a cell store objects and its version. + * @param <T> The type of the stored objects. + * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet. + * @licence GPL. + */ +public class CellImpl<T /**extends Serializable*/ + > implements Cell<T> { + + /** + * cell. + * hashMap with key as timestamp and value, as object of T class. + */ + private Map<Long, T> cell; + + /** + * Default constructor. + */ + public CellImpl() { + this.cell = new HashMap<Long, T>(); + } + + /** + * Constructor with object. + * @param t The object to store. + */ + public CellImpl(T t) { + this.cell = new HashMap<Long, T>(); + this.put(t); + } + + /** + * {@inheritDoc} + */ + public final void put(final T t) { + cell.put((long)cell.size(), t); + //cell.put(System.currentTimeMillis(), t); + } + + /** + * {@inheritDoc} + */ + 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 = 0L; + for (Long current : cell.keySet()) { + if (max < current) { + max = current; + } + } + return cell.get(max); + } + + /** + * {@inheritDoc} + */ + public int hashCode() { + if (this.cell.size() != 0) { + return this.get().hashCode(); + } else { + return 0; + } + } + + /** + * {@inheritDoc} + * //TODO : we consider only the last item... but it will be better to + * //TODO verify all the "versions" of the cell. + */ + public boolean equals(Object o) { + if (o instanceof CellImpl) { + CellImpl another = (CellImpl) o; + if(this.cell.size() == another.cell.size()) { + if(this.cell.size() == 0) { + return true; + } else { + return this.get().equals(another.get()); + } + } else { + return false; + } + } else { + return false; + } + } + /** + * {@inheritDoc} + */ + public String toString() { + + if (this.cell.size() != 0) { + return ((T) this.get()).toString(); + } else { + return ""; + } + } +} Added: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java (rev 0) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java 2010-02-07 00:32:05 UTC (rev 56) @@ -0,0 +1,62 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.Set; + +/** + * Interface to present the method to implement for en Column. + * @author Dorian Langlais + * + * @param <T> Class of the object stored in the columns. + */ +public interface Column<T> { + + /** + * Get the object which has key key</key>. + * @param key the key. + * @return the object stored at the line identified by key + */ + T get(String key); + + /** + * Get the object which has key key</key> and version version. + * @param key + * @param version the version wanted (it can be timestamp, number..). + * @return The object corresponding to the "version". + */ + T get(String key, Long version); + + /** + * Put object t with the key key. + * @param key the key + * @param t object to store + */ + void put(String key, Object t); + + /** + * Delete an object by its key. + * @param key the key + */ + void delete(String key); + + /** + * hashCode(). + * @return + */ + int hashCode(); + + /** + * equals(). + */ + boolean equals(Object o); + + /** + * toString(). + */ + String toString(); + + /** + * Get the keys of the column. + * @return return a Set containing all the keys of the column. + */ + Set<String> getKeys(); +} Added: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java (rev 0) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java 2010-02-07 00:32:05 UTC (rev 56) @@ -0,0 +1,110 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Set; + +/** + * 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> { + + /** + * column. + * hashMap with key the key of the line, and value a column. + */ + private Map<String, CellImpl<T>> column; + + /** + * Default constructor. + */ + public ColumnImpl() { + column = new HashMap<String, CellImpl<T>>(); + } + + /** + * {@inheritDoc} + */ + 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 Object content) { + try { + this.column.get(key).put((T)content); + } catch (NullPointerException e) { + this.column.put(key, new CellImpl<T>((T)content)); + } + } + + /** + * {@inheritDoc} + */ + public final void delete(final String key) { + this.column.remove(key); + } + + /** + * {@inheritDoc} + */ + public final int hashCode() { + int hash = 0; + for(Cell c : column.values()) { + hash += c.hashCode(); + } + return hash; + } + + /** + * {@inheritDoc} + */ + public boolean equals(Object o) { + if (o instanceof Column) { + + ColumnImpl other = (ColumnImpl) o; + + return other.column.equals(this.column); + + } else { + return false; + } + } + + /** + * {@inheritDoc} + */ + public final String toString() { + String ret = ""; + + for (String key : column.keySet()) { + ret += key + "\t" + column.get(key); + } + + return ret; + } + + /** + * {@inheritDoc} + */ + public Set<String> getKeys() { + return this.column.keySet(); + } +} Added: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java (rev 0) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java 2010-02-07 00:32:05 UTC (rev 56) @@ -0,0 +1,36 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.Map; + +/** + * Interface to present the methods on a Row + * @author Dorian Langlais + * + */ +public interface Row { + + /** + * to string a row. + * @return the row in textual format. + */ + String toString(); + + /** + * Get row structure. + * @return the row structure + */ + Structure getRowStructure(); + + /** + * Get row content. + * @return the row content + */ + Map<String, Object> getRowContent(); + + /** + * Get an element of the row. + * @param columnName the column name. + * @return the content of the "cell". + */ + Object getContent(String columnName); +} Added: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java (rev 0) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java 2010-02-07 00:32:05 UTC (rev 56) @@ -0,0 +1,65 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.Map; + +/** + * Class RowImpl. + * A row of a table. + * @author Dorian Langlais. + */ +public class RowImpl implements Row { + + /** + * Structure of the row. + */ + private Structure rowStructure; + /** + * Content of the row. + */ + private Map<String, Object> rowContent; + + /** + * Row constructor. + * @param struct the row structure + * @param content the row content + */ + public RowImpl(final Structure 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 Structure getRowStructure() { + return rowStructure; + } + + /** + * {@inheritDoc} + */ + public Map<String, Object> getRowContent() { + return rowContent; + } + + /** + * {@inheritDoc} + */ + public final String toString() { + String ret; + ret = rowContent.values().toString(); + return ret; + } + + /** + * {@inheritDoc} + */ + public Object getContent(String columnName) { + return rowContent.get(columnName); + } +} Added: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java (rev 0) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java 2010-02-07 00:32:05 UTC (rev 56) @@ -0,0 +1,51 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.Set; + +/** + * Interface to present the method on a structure. + * A structure is a description of a table. + * @author Dorian Langlais + * + */ +public interface Structure { + + /** + * Add a new column in the structure. + * @param columnName the column name + * @param columnClass the column class + */ + void createColumn(String columnName, Class<?> columnClass); + + /** + * Get the columns' names. + * @return return a set containing the name of the columns. + */ + Set<String> getColumnsNames(); + + /** + * Get the class of object of the column columnName. + * @param columnName the column name + * @return return the column class + */ + Class<?> getColumnClass(String columnName); + + /** + * Remove a column of the structure by its name. + * @param columnName the column name + */ + void deleteColumn(String columnName); + + /** + * get the hashCode of the structure. + * @return return the hashCode of the structure. + */ + int hashCode(); + + /** + * Permit to verify if this is equals to another object. + * @param another the object to compare + * @return true if this is equals to another + */ + boolean equals(Object o); +} Added: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java (rev 0) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java 2010-02-07 00:32:05 UTC (rev 56) @@ -0,0 +1,92 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +/** + * Class Structure. + * Represente the mapping between a row and the column of a table. + * @author Dorian Langlais + * + */ +public class StructureImpl implements Structure { + + /** + * structure. + * hashMap with key the column name, and value the column class. + */ + private Map<String, Class<? /**extends Serializable*/ + >> structure; + + /** + * Default constructor. + */ + public StructureImpl() { + this.structure = + new HashMap<String, Class<? /**extends Serializable*/ + >>(); + } + + /** + * {@inheritDoc} + */ + public final void createColumn(final String columnName, + final Class<? /**extends Serializable*/ + > columnClass) { + this.structure.put(columnName, columnClass); + } + + /** + * {@inheritDoc} + */ + public final void deleteColumn(final String columnName) { + this.structure.remove(columnName); + } + + /** + * {@inheritDoc} + */ + public final Class<? /**extends Serializable*/ + > getColumnClass( + final String columnName) { + return this.structure.get(columnName); + } + + /** + * {@inheritDoc} + */ + public final Set<String> getColumnsNames() { + return this.structure.keySet(); + } + + /** + * {@inheritDoc} + */ + public final int hashCode() { + if (structure.isEmpty()) { + return 0; + } else { + int hash = 0; + for (String key : structure.keySet() ) { + hash += key.hashCode(); + hash += structure.get(key).hashCode(); + } + return hash; + } + } + + /** + * {@inheritDoc} + */ + public final boolean equals(Object o) { + if (o instanceof StructureImpl) { + StructureImpl another = (StructureImpl) o; + + return this.structure.equals(another.structure); + + } else { + return false; + } + } +} Added: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java (rev 0) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java 2010-02-07 00:32:05 UTC (rev 56) @@ -0,0 +1,82 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.Set; + +/** + * Interface to present the method on a table. + * A table is like a table in SGBD, but in BigTable, the data are stored in + * columns not in rows. + * @author Dorian Langlais + */ +public interface Table { + + /** + * Create a column in the table. + * @param columnName the column name + * @param columnClass the column class + * @param <columnClass> generics to spécify the class of the stored objects. + */ + <columnClass> void createColumn(final String columnName, + final Class<?> columnClass); + + /** + * Delete a colum of the table. + * @param columnName the column name. + */ + void deleteColumn(final String columnName); + + /** + * Get the columns' name of the table. + * @return Return a set containing the columns' name of the table + */ + Set<String> getColumnsNames(); + + /** + * Get a "virtual" rom from the table. + * @param key the key of the row to get + * @return return the row which has key as key + */ + Row getRow(final String key); + + /** + * Remove a row by its key. + * @param key the key + */ + void deleteRow(final String key); + + /** + * Put an object in the table. + * Put the objct o in the column columnName at the key + * key. + * @param columnName the columnName + * @param key the key + * @param o the object + */ + void put(final String columnName, final String key, final Object o); + + /** + * Get an object from the table. + * Get an object from the column columnName with the key key. + * @param columnName the columnName + * @param key the key + * @return return the object stored + */ + Object get(final String columnName, final String key); + + /** + * Get an object from the table. + * Get an object from the column columnName with the key key + * and the versiion number version. + * @param columnName the columnName + * @param key the key + * @param version the version wanted + * @return return the object stored + */ + Object get(final String columnName, final String key, final long version); + + /** + * Get the keys of the table. + * @return return a set which contains all the keys of the table. + */ + Set<String> getKeys(); +} Added: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java (rev 0) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java 2010-02-07 00:32:05 UTC (rev 56) @@ -0,0 +1,113 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +/** + * Class Table. + * Implements the interface Table. + * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet. + * @licence GPL. + */ +public class TableImpl implements Table { + + /** + * Table. + * hashMap with key as column name and value, a colum of the table. + */ + private Map<String, Column<?>> tableColumns; + /** + * Structure of the table. + */ + private StructureImpl tableStructure; + + /** + * Default constructor. + */ + public TableImpl() { + this.tableColumns = new HashMap<String, Column<?>>(); + this.tableStructure = new StructureImpl(); + } + + /** + * {@inheritDoc} + */ + public final <columnClass /**extends Serializable*/ + > void createColumn( + final String columnName, final Class<?> columnClass) { + ColumnImpl<columnClass> column = new ColumnImpl<columnClass>(); + this.tableColumns.put(columnName, column); + this.tableStructure.createColumn(columnName, columnClass); + } + + /** + * {@inheritDoc} + */ + public final void deleteColumn(final String columnName) { + this.tableColumns.remove(columnName); + this.tableStructure.deleteColumn(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, + tableColumns.get(columnName).get(key)); + } + return new RowImpl(tableStructure, rowContent); + } + + /** + * {@inheritDoc} + */ + public void deleteRow(final String key) { + for (Column column : tableColumns.values()) { + column.delete(key); + } + } + + /** + * {@inheritDoc} + */ + public void put(String columnName, String key, Object o) { + this.tableColumns.get(columnName).put(key, o); + } + + /** + * {@inheritDoc} + */ + public Object get(String columnName, String key) { + return this.tableColumns.get(columnName).get(key); + } + + /** + * {@inheritDoc} + */ + public Object get(String columnName, String key, long version) { + return this.tableColumns.get(columnName).get(key, version); + } + + /** + * {@inheritDoc} + */ + public Set<String> getColumnsNames() { + return this.tableColumns.keySet(); + } + + /** + * {@inheritDoc} + */ + public Set<String> getKeys() { + Set<String> keys = new HashSet<String>(); + for(Column col : this.tableColumns.values()){ + keys.addAll(col.getKeys()); + } + return keys; + } +} Added: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/package-info.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/package-info.java (rev 0) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/package-info.java 2010-02-07 00:32:05 UTC (rev 56) @@ -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. + */ Added: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable1.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable1.java (rev 0) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable1.java 2010-02-07 00:32:05 UTC (rev 56) @@ -0,0 +1,135 @@ +package org.nuiton.mapstoragemanager.plugins; + +import java.util.Map; +import java.util.Set; + +/** + * The interface for all the BigTable implementations. + * @author Dorian Langlais + */ +public interface nvBigTable1 { + + /** + * 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 column in the table table + * @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 column in the table table + * @param table the table name + * @param column the column name + */ + void deleteColumn(String table, String column); + + /** + * Get the columns' name of one table. + * @param table the table name + * @return Return a set containing the columns' name of the table + * table + */ + Set<String> getColumnsNames(String table); + + /*************** + * Cell * + ***************/ + + /** + * Put a new content in the table. + * Put a new content in the column column of the table + * table with the key key. + * @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 table from the column column + * where the key is key. + * -> 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 table from the column column + * where the key is key. + * -> get the content with the version version. + * @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 key from the table table + * @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 table. + */ + Set<String> getKeys(String table); +} Added: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java (rev 0) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java 2010-02-07 00:32:05 UTC (rev 56) @@ -0,0 +1,5 @@ +package org.nuiton.mapstoragemanager.plugins; +/** + * The plugins interfaces. + */ + Added: trunk/msm-bighashmap/src/main/resources/i18n/mapstoragemanager-en_GB.properties =================================================================== --- trunk/msm-bighashmap/src/main/resources/i18n/mapstoragemanager-en_GB.properties (rev 0) +++ trunk/msm-bighashmap/src/main/resources/i18n/mapstoragemanager-en_GB.properties 2010-02-07 00:32:05 UTC (rev 56) @@ -0,0 +1,32 @@ +Map\ Storage\ Manager=Map Storage Manager +TABLE\ NAME\ \:\ TODO= +login\ \:=Login +mapstoragemanager.action.aboutUs=About us +mapstoragemanager.action.aboutUs.tip=About Code Lutin +mapstoragemanager.action.connect=Connect +mapstoragemanager.action.connect.tip=Start a new connection +mapstoragemanager.action.disconnect=Disconnect +mapstoragemanager.action.disconnect.tip=Disconnect the current session +mapstoragemanager.action.edit=Edit +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit=Exit +mapstoragemanager.action.exit.tip= +mapstoragemanager.action.file=File +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr=French +mapstoragemanager.action.fr.tip=Change to french language +mapstoragemanager.action.help=Help +mapstoragemanager.action.help.tip= +mapstoragemanager.action.language=Choose language +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp=Help +mapstoragemanager.action.menuHelp.tip= +mapstoragemanager.action.preferences=Preferences +mapstoragemanager.action.preferences.tip= +mapstoragemanager.action.uk=English +mapstoragemanager.action.uk.tip=Change to english language +mapstoragemanager.action.visitSite=Visit our site +mapstoragemanager.action.visitSite.tip= +name\ base\ \:=Name base +ok=Validate +password\ \:=Password Added: trunk/msm-bighashmap/src/main/resources/i18n/mapstoragemanager-fr_FR.properties =================================================================== --- trunk/msm-bighashmap/src/main/resources/i18n/mapstoragemanager-fr_FR.properties (rev 0) +++ trunk/msm-bighashmap/src/main/resources/i18n/mapstoragemanager-fr_FR.properties 2010-02-07 00:32:05 UTC (rev 56) @@ -0,0 +1,32 @@ +Map\ Storage\ Manager=Map Storage Manager +TABLE\ NAME\ \:\ TODO= +login\ \:=Identifiant +mapstoragemanager.action.aboutUs=A propos +mapstoragemanager.action.aboutUs.tip=A propos de Code Lutin +mapstoragemanager.action.connect=Connexion +mapstoragemanager.action.connect.tip=Etablis une nouvelle connexion +mapstoragemanager.action.disconnect=D\u00E9connexion +mapstoragemanager.action.disconnect.tip=D\u00E9connecte la session courante +mapstoragemanager.action.edit=Edition +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit=Quitter +mapstoragemanager.action.exit.tip=Quitte l'application +mapstoragemanager.action.file=Fichier +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr=Fran\u00E7ais +mapstoragemanager.action.fr.tip=Changer la langue en fran\u00E7ais +mapstoragemanager.action.help=Aide +mapstoragemanager.action.help.tip= +mapstoragemanager.action.language=choisir la langue +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp=Aide +mapstoragemanager.action.menuHelp.tip=Aide contextuelle +mapstoragemanager.action.preferences=Pr\u00E9f\u00E9rences +mapstoragemanager.action.preferences.tip=Permet de configurer l'application +mapstoragemanager.action.uk=Anglais +mapstoragemanager.action.uk.tip=Changer la langue en anglais +mapstoragemanager.action.visitSite=Visiter notre site +mapstoragemanager.action.visitSite.tip= +name\ base\ \:=Nom de la base +ok=Valider +password\ \:=Mot de passe Added: trunk/msm-bighashmap/src/main/resources/i18n/mapstoragemanagerarch-en_GB.properties =================================================================== --- trunk/msm-bighashmap/src/main/resources/i18n/mapstoragemanagerarch-en_GB.properties (rev 0) +++ trunk/msm-bighashmap/src/main/resources/i18n/mapstoragemanagerarch-en_GB.properties 2010-02-07 00:32:05 UTC (rev 56) @@ -0,0 +1,32 @@ +Map\ Storage\ Manager= +TABLE\ NAME\ \:\ TODO= +login\ \:= +mapstoragemanager.action.aboutUs= +mapstoragemanager.action.aboutUs.tip= +mapstoragemanager.action.connect= +mapstoragemanager.action.connect.tip= +mapstoragemanager.action.disconnect= +mapstoragemanager.action.disconnect.tip= +mapstoragemanager.action.edit= +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit= +mapstoragemanager.action.exit.tip= +mapstoragemanager.action.file= +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr= +mapstoragemanager.action.fr.tip= +mapstoragemanager.action.help= +mapstoragemanager.action.help.tip= +mapstoragemanager.action.language= +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp= +mapstoragemanager.action.menuHelp.tip= +mapstoragemanager.action.preferences= +mapstoragemanager.action.preferences.tip= +mapstoragemanager.action.uk= +mapstoragemanager.action.uk.tip= +mapstoragemanager.action.visitSite= +mapstoragemanager.action.visitSite.tip= +name\ base\ \:= +ok= +password\ \:= Added: trunk/msm-bighashmap/src/main/resources/i18n/mapstoragemanagerarch-fr_FR.properties =================================================================== --- trunk/msm-bighashmap/src/main/resources/i18n/mapstoragemanagerarch-fr_FR.properties (rev 0) +++ trunk/msm-bighashmap/src/main/resources/i18n/mapstoragemanagerarch-fr_FR.properties 2010-02-07 00:32:05 UTC (rev 56) @@ -0,0 +1,32 @@ +Map\ Storage\ Manager= +TABLE\ NAME\ \:\ TODO= +login\ \:= +mapstoragemanager.action.aboutUs= +mapstoragemanager.action.aboutUs.tip= +mapstoragemanager.action.connect= +mapstoragemanager.action.connect.tip= +mapstoragemanager.action.disconnect= +mapstoragemanager.action.disconnect.tip= +mapstoragemanager.action.edit= +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit= +mapstoragemanager.action.exit.tip= +mapstoragemanager.action.file= +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr= +mapstoragemanager.action.fr.tip= +mapstoragemanager.action.help= +mapstoragemanager.action.help.tip= +mapstoragemanager.action.language= +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp= +mapstoragemanager.action.menuHelp.tip= +mapstoragemanager.action.preferences= +mapstoragemanager.action.preferences.tip= +mapstoragemanager.action.uk= +mapstoragemanager.action.uk.tip= +mapstoragemanager.action.visitSite= +mapstoragemanager.action.visitSite.tip= +name\ base\ \:= +ok= +password\ \:= Added: trunk/msm-bighashmap/src/main/resources/log4j.properties =================================================================== --- trunk/msm-bighashmap/src/main/resources/log4j.properties (rev 0) +++ trunk/msm-bighashmap/src/main/resources/log4j.properties 2010-02-07 00:32:05 UTC (rev 56) @@ -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 Added: trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java =================================================================== --- trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java (rev 0) +++ trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java 2010-02-07 00:32:05 UTC (rev 56) @@ -0,0 +1,182 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +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 { + + private static final Log log = LogFactory.getLog(CellTest.class); + private Cell<Object> cellActual; + private Cell<Object> cell2Actual; + private Object objectExcepted; + private Object object2Excepted; + private Object object3Excepted; + + /** + * On teste le comportement de get avec une cellule vide. + */ + public void testGetVoid() { + cellActual = new CellImpl<Object>(); + try { + assertNull(cellActual.get()); + Assert.fail(); + } catch (NoSuchElementException e) { + log.info("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() { + + cellActual = new CellImpl<Object>(); + + objectExcepted = new Object(); + + try { + assertNull(cellActual.get()); + Assert.fail(); + } catch (NoSuchElementException e) { + log.info("Exception levée correctement"); + } + cellActual.put(objectExcepted); + + assertEquals(cellActual.get(), objectExcepted); + } + + /** + * 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() { + + cellActual = new CellImpl<Object>(); + + objectExcepted = new Object(); + + try { + assertNull(cellActual.get()); + Assert.fail(); + } catch (NoSuchElementException e) { + log.info("Exception levée correctement"); + } + cellActual.put(objectExcepted); + + assertEquals(cellActual.get(), objectExcepted); + + object2Excepted = new Object(); + + cellActual.put(object2Excepted); + + assertEquals(cellActual.get(), object2Excepted); + + object3Excepted = new Object(); + + cellActual.put(object3Excepted); + + assertEquals(cellActual.get(), object3Excepted); + } + + /** + * We make two cells with the same objects, and we verify that they are + * equals. + */ + public void testEquals() { + + /** + * We create two cells. + */ + cellActual = new CellImpl<Object>(); + cell2Actual = new CellImpl<Object>(); + assertEquals(cellActual, cell2Actual); + + objectExcepted = new Integer(10); + + /** + * We put one item in the first Cell, and not in the second. + */ + cellActual.put(objectExcepted); + assertNotSame(cellActual, cell2Actual); + + /** + * We put the same object in the second cell. + */ + cell2Actual.put(objectExcepted); + assertEquals(cellActual, cell2Actual); + } + + /** + * We make two cells with the same objects, and we verify that thay have + * the same hashCode. + */ + public void testHashCode() { + + /** + * We create two cells. + */ + cellActual = new CellImpl<Object>(); + cell2Actual = new CellImpl<Object>(); + assertEquals(cellActual.hashCode(), cell2Actual.hashCode()); + + objectExcepted = new Integer(10); + + /** + * We put one item in the first Cell, and not in the second. + */ + cellActual.put(objectExcepted); + assertNotSame(cellActual.hashCode(), cell2Actual.hashCode()); + + /** + * We put the same object in the second cell. + */ + cell2Actual.put(objectExcepted); + assertEquals(cellActual.hashCode(), cell2Actual.hashCode()); + } + + /** + * we test that toString do what we want. + */ + public void testToString() { + + /** + * We create one cell and werify that toString equals "" when the cell + * is empty. + */ + cellActual = new CellImpl<Object>(); + assertEquals(cellActual.toString(), ""); + + /** + * We create and put one object Integer(1337) and control that + * toString() equals "1337" + */ + objectExcepted = new Integer(1337); + cellActual.put(objectExcepted); + assertEquals(cellActual.toString(), objectExcepted.toString()); + assertEquals(cellActual.toString(), "1337"); + + /** + * We create and put another object String("String for testing") and + * control that toString() equals "String for testing". + */ + objectExcepted = new String("String for testing"); + cellActual.put(objectExcepted); + assertEquals(cellActual.toString(), objectExcepted.toString()); + assertEquals(cellActual.toString(), "String for testing"); + } +} Added: trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java =================================================================== --- trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java (rev 0) +++ trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java 2010-02-07 00:32:05 UTC (rev 56) @@ -0,0 +1,269 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import junit.framework.Assert; +import junit.framework.TestCase; + +public final class ColumnTest extends TestCase { + + private static final Log log = LogFactory.getLog(ColumnTest.class); + private Column columnActual; + private Column column2Actual; + private Object expected; + private Object expected2; + + /** + * We test column when empty. + */ + public void testGetVoid() { + columnActual = new ColumnImpl<Object>(); + try { + columnActual.get("test"); + Assert.fail(); + } catch (NoSuchElementException e) { + log.info("Exception levée correctement"); + } + } + + /** + * We put one object and we try to get it. + */ + public void testPutAndGet() { + columnActual = new ColumnImpl<Object>(); + + expected = new Object(); + + try { + columnActual.get("object 1"); + Assert.fail(); + } catch (NoSuchElementException e) { + log.info("Exception levée correctement"); + } + + columnActual.put("object 1", expected); + + assertEquals(columnActual.get("object 1"), expected); + + } + + /** + * We put two object, we verify that they are in the column. + * Then, we try to remove them. + */ + public void testDelete() { + columnActual = new ColumnImpl<Integer>(); + + expected = new Integer(1); + expected2 = new Integer(2); + + columnActual.put("integer 1", expected); + columnActual.put("integer 2", expected2); + + assertEquals(columnActual.get("integer 1"), expected); + assertEquals(columnActual.get("integer 2"), expected2); + + /** + * Now we try to remove integer 1. + */ + columnActual.delete("integer 1"); + try{ + columnActual.get("integer 1"); + Assert.fail(); + } catch (NoSuchElementException e) { + log.info("Exception levée correctement."); + } + assertEquals(columnActual.get("integer 2"), expected2); + + /** + * Finally, we try to remove integer 2. + */ + columnActual.delete("integer 2"); + try{ + columnActual.get("integer 2"); + Assert.fail(); + } catch (NoSuchElementException e) { + log.info("Exception levée correctement."); + } + } + + /** + * testhashCode(). + */ + public void testHashCode() { + + int hashCodeSum = 0; + Object toStore; + + /** + * We create a new column and verify that hashCode is 0. + */ + columnActual = new ColumnImpl<Integer>(); + assertEquals(columnActual.hashCode(), 0); + + /** + * We put a Integer(10) and control that hashCode is already ok. + */ + toStore = new Integer(10); + columnActual.put("key1", toStore); + hashCodeSum += toStore.hashCode(); + assertEquals(columnActual.hashCode(), hashCodeSum); + + toStore = new String("peanuts"); + columnActual.put("key2", toStore); + hashCodeSum += toStore.hashCode(); + assertEquals(columnActual.hashCode(), hashCodeSum); + } + + /** + * testEquals(). + */ + public void testEquals() { + + /** + * We create two columns. + */ + columnActual = new ColumnImpl<Object>(); + column2Actual = new ColumnImpl<Object>(); + assertEquals(columnActual, column2Actual); + + /** + * We put one object in the first column, and not in the second. + */ + expected = new Integer(10); + columnActual.put("key1",expected); + assertNotSame(columnActual, column2Actual); + + /** + * We put the same object in the second column at the same key. + */ + column2Actual.put("key1",expected); + assertEquals(columnActual, column2Actual); + + /** + * We put the same object in the two column but at a different key. + */ + expected2 = new String("Tomatoes"); + columnActual.put("key2",expected2); + column2Actual.put("key3",expected2); + assertNotSame(columnActual, column2Actual); + } + + /** + * We test the method toString() on Column. + */ + public void testToString() { + + Object toStore, toStore2; + Map<String,Object> columnContent; + String toStringExpected; + /** + * We create one columns. + */ + columnActual = new ColumnImpl<Object>(); + columnContent = new HashMap<String, Object>(); + toStringExpected = new String(); + for (String key : columnContent.keySet()) { + toStringExpected += key + "\t" + columnContent.get(key).toString(); + } + assertEquals(columnActual.toString(), toStringExpected); + + /** + * We put one object in the column. + */ + toStore = new Integer(10); + columnActual.put("key1", toStore); + columnContent.put("key1", toStore); + toStringExpected = new String(); + for (String key : columnContent.keySet()) { + toStringExpected += key + "\t" + columnContent.get(key).toString(); + } + assertEquals(columnActual.toString(), toStringExpected); + + /** + * We put another object in the column. + */ + toStore2 = new String("yahoo !"); + columnActual.put("key2", toStore2); + columnContent.put("key2", toStore2); + toStringExpected = new String(); + for (String key : columnContent.keySet()) { + toStringExpected += key + "\t" + columnContent.get(key).toString(); + } + assertEquals(columnActual.toString(), toStringExpected); + } + + /** + * We put objects in the columns and we get the keys. + * We compare with the key set attempt. + */ + public void testGetKeys(){ + + columnActual = new ColumnImpl<Object>(); + + Set<String> expectedSet = new HashSet<String>(); + + /** + * We put object, we and verify that the keySet returned is good. + */ + columnActual.put("obj1", new Object()); + expectedSet.add("obj1"); + assertEquals(expectedSet, columnActual.getKeys()); + + columnActual.put("obj2", new Object()); + expectedSet.add("obj2"); + assertEquals(expectedSet, columnActual.getKeys()); + + columnActual.put("obj3", new Object()); + expectedSet.add("obj3"); + assertEquals(expectedSet, columnActual.getKeys()); + + columnActual.put("obj4", new Object()); + expectedSet.add("obj4"); + assertEquals(expectedSet, columnActual.getKeys()); + + columnActual.put("obj5", new Object()); + expectedSet.add("obj5"); + assertEquals(expectedSet, columnActual.getKeys()); + + /** + * We try to add already exist key. + */ + columnActual.put("obj5", new Object()); + expectedSet.add("obj5"); + assertEquals(expectedSet, columnActual.getKeys()); + + /** + * Now, we will remove object by their keys, and we verify the keySet. + */ + columnActual.delete("obj1"); + expectedSet.remove("obj1"); + assertEquals(expectedSet, columnActual.getKeys()); + + columnActual.delete("obj3"); + expectedSet.remove("obj3"); + assertEquals(expectedSet, columnActual.getKeys()); + + columnActual.delete("obj5"); + expectedSet.remove("obj5"); + assertEquals(expectedSet, columnActual.getKeys()); + + /** + * We try to remove no exist keys : + */ + columnActual.delete("obj6"); + expectedSet.remove("obj6"); + assertEquals(expectedSet, columnActual.getKeys()); + + } +} Added: trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowTest.java =================================================================== --- trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowTest.java (rev 0) +++ trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowTest.java 2010-02-07 00:32:05 UTC (rev 56) @@ -0,0 +1,153 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.Map; +import junit.framework.TestCase; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +public class RowTest extends TestCase { + + private static final Log log = LogFactory.getLog(RowTest.class); + private Structure structureExpected; + private Map<String, Object> contentExpected; + private Row rowActual; + + public void testToString() { + { + structureExpected = new StructureImpl(); + contentExpected = new HashMap<String, Object>(); + rowActual = new RowImpl(structureExpected, contentExpected); + + assertEquals(rowActual.toString(), contentExpected.values().toString()); + } + + { + structureExpected = new StructureImpl(); + structureExpected.createColumn("Test", String.class); + contentExpected = new HashMap<String, Object>(); + contentExpected.put("Test", "StringDeTest"); + rowActual = new RowImpl(structureExpected, contentExpected); + + assertEquals(rowActual.toString(), contentExpected.values().toString()); + } + + { + structureExpected = new StructureImpl(); + structureExpected.createColumn("Test1", String.class); + structureExpected.createColumn("Test2", Integer.class); + structureExpected.createColumn("Test3", Double.class); + contentExpected = new HashMap<String, Object>(); + contentExpected.put("Test1", "StringDeTest"); + contentExpected.put("Test2", new Integer(1)); + contentExpected.put("Test3", new Double(0.07)); + rowActual = new RowImpl(structureExpected, contentExpected); + + assertEquals(rowActual.toString(), contentExpected.values().toString()); + } + } + + public void testGetRowContent() { + { + structureExpected = new StructureImpl(); + contentExpected = new HashMap<String, Object>(); + rowActual = new RowImpl(structureExpected, contentExpected); + + assertEquals(rowActual.getRowContent(), contentExpected); + } + + { + structureExpected = new StructureImpl(); + structureExpected.createColumn("Test", String.class); + contentExpected = new HashMap<String, Object>(); + contentExpected.put("Test", "StringDeTest"); + rowActual = new RowImpl(structureExpected, contentExpected); + + assertEquals(rowActual.getRowContent(), contentExpected); + } + + { + structureExpected = new StructureImpl(); + structureExpected.createColumn("Test1", String.class); + structureExpected.createColumn("Test2", Integer.class); + structureExpected.createColumn("Test3", Double.class); + contentExpected = new HashMap<String, Object>(); + contentExpected.put("Test1", "StringDeTest"); + contentExpected.put("Test2", new Integer(1)); + contentExpected.put("Test3", new Double(0.07)); + rowActual = new RowImpl(structureExpected, contentExpected); + + assertEquals(rowActual.getRowContent(), contentExpected); + } + } + + public void testGetRowStructure() { + { + structureExpected = new StructureImpl(); + contentExpected = new HashMap<String, Object>(); + rowActual = new RowImpl(structureExpected, contentExpected); + + assertEquals(rowActual.getRowStructure(), structureExpected); + } + + { + structureExpected = new StructureImpl(); + structureExpected.createColumn("Test", String.class); + contentExpected = new HashMap<String, Object>(); + contentExpected.put("Test", "StringDeTest"); + rowActual = new RowImpl(structureExpected, contentExpected); + + assertEquals(rowActual.getRowStructure(), structureExpected); + } + + { + structureExpected = new StructureImpl(); + structureExpected.createColumn("Test1", String.class); + structureExpected.createColumn("Test2", Integer.class); + structureExpected.createColumn("Test3", Double.class); + contentExpected = new HashMap<String, Object>(); + contentExpected.put("Test1", "StringDeTest"); + contentExpected.put("Test2", new Integer(1)); + contentExpected.put("Test3", new Double(0.07)); + rowActual = new RowImpl(structureExpected, contentExpected); + + assertEquals(rowActual.getRowStructure(), structureExpected); + } + } + + public void testGetContent() { + { + structureExpected = new StructureImpl(); + contentExpected = new HashMap<String, Object>(); + rowActual = new RowImpl(structureExpected, contentExpected); + + assertEquals(rowActual.getContent(""), null); + } + + { + structureExpected = new StructureImpl(); + structureExpected.createColumn("Test", String.class); + contentExpected = new HashMap<String, Object>(); + contentExpected.put("Test", "StringDeTest"); + rowActual = new RowImpl(structureExpected, contentExpected); + + assertEquals(rowActual.getContent("Test"), "StringDeTest"); + } + + { + structureExpected = new StructureImpl(); + structureExpected.createColumn("Test1", String.class); + structureExpected.createColumn("Test2", Integer.class); + structureExpected.createColumn("Test3", Double.class); + contentExpected = new HashMap<String, Object>(); + contentExpected.put("Test1", "StringDeTest"); + contentExpected.put("Test2", new Integer(1)); + contentExpected.put("Test3", new Double(0.07)); + rowActual = new RowImpl(structureExpected, contentExpected); + + assertEquals(rowActual.getContent("Test1"), "StringDeTest"); + assertEquals(rowActual.getContent("Test2"), new Integer(1)); + assertEquals(rowActual.getContent("Test3"), new Double(0.07)); + } + } +} Added: trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java =================================================================== --- trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java (rev 0) +++ trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java 2010-02-07 00:32:05 UTC (rev 56) @@ -0,0 +1,335 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; + +import junit.framework.TestCase; +import org.apache.commons.logging.LogFactory; +import org.apache.commons.logging.Log; + +public class StructureTest extends TestCase { + + private static final Log log = LogFactory.getLog(StructureTest.class); + private Structure structureActual; + private Map<String, Class<?>> structureContentActual; + private Map<String, Class<?>> structureContentExpected; + private Class<?> columnsClassActual; + private Class<?> columnsClassExpected; + private Set<String> columnsNamesActual; + private Set<String> columnsNamesExpected; + + public void testGetColumnsNamesVoid() { + structureActual = new StructureImpl(); + Set<String> columnNames = structureActual.getColumnsNames(); + assertEquals(0, columnNames.size()); + } + + /** + * we add a column with name and class. + * We use reflexivity to verify that the map of the structure is like we + * want. + */ + public void testAddColumn() { + + structureContentExpected = new HashMap<String, Class<?>>(); + + try { + structureActual = new StructureImpl(); + + Field fStructure = structureActual.getClass().getDeclaredField("structure"); + fStructure.setAccessible(true); + Map<String, Class<?>> structureContentActual = + (Map<String, Class<?>>) fStructure.get(structureActual); + + + structureActual.createColumn("Test1", String.class); + structureContentExpected.put("Test1", String.class); + assertEquals(structureContentExpected, structureContentActual); + + structureActual.createColumn("Test2", Object.class); + structureContentExpected.put("Test2", Object.class); + assertEquals(structureContentExpected, structureContentActual); + + structureActual.createColumn("Test3", Map.class); + structureContentExpected.put("Test3", Map.class); + assertEquals(structureContentExpected, structureContentActual); + + } catch (IllegalArgumentException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (IllegalAccessException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (NoSuchFieldException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (SecurityException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } + } + + /** + * we add a column with name and class. + * We use reflexivity to verify that the map of the structure is like we + * want. + * We remove column, and we continue to verify that the map of the structure + * is always good. + */ + public void testRemoveColumn() { + + structureContentExpected = new HashMap<String, Class<?>>(); + + try { + structureActual = new StructureImpl(); + + Field fStructure = structureActual.getClass().getDeclaredField("structure"); + fStructure.setAccessible(true); + Map<String, Class<?>> structureContentActual = + (Map<String, Class<?>>) fStructure.get(structureActual); + + + structureActual.createColumn("Test1", String.class); + structureContentExpected.put("Test1", String.class); + structureActual.createColumn("Test2", Object.class); + structureContentExpected.put("Test2", Object.class); + structureActual.createColumn("Test3", Map.class); + structureContentExpected.put("Test3", Map.class); + assertEquals(structureContentExpected, structureContentActual); + + structureActual.deleteColumn("Test1"); + structureContentExpected.remove("Test1"); + assertEquals(structureContentExpected, structureContentActual); + + /** + * the key "Test1TOTO" is not in the structure. + */ + structureActual.deleteColumn("Test1TOTO"); + structureContentExpected.remove("Test1TOTO"); + assertEquals(structureContentExpected, structureContentActual); + + structureActual.deleteColumn("Test2"); + structureContentExpected.remove("Test2"); + assertEquals(structureContentExpected, structureContentActual); + + structureActual.deleteColumn("Test3"); + structureContentExpected.remove("Test3"); + assertEquals(structureContentExpected, structureContentActual); + + /** + * We try to remove an other key, but the map is empty. + */ + structureActual.deleteColumn("Test4"); + structureContentExpected.remove("Test4"); + + assertEquals(structureContentExpected, structureContentActual); + + + } catch (IllegalArgumentException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (IllegalAccessException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (NoSuchFieldException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (SecurityException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } + } + + /** + * we add a column with name and class. + * We use reflexivity to verify that the columsNames returned are goods. + * We remove column, and we continue to verify that the columsNames is + * always good. + */ + public void testGetColumnsNames() { + + structureActual = new StructureImpl(); + + columnsNamesExpected = new HashSet<String>(); + columnsNamesActual = structureActual.getColumnsNames(); + + + structureActual.createColumn("Test1", String.class); + columnsNamesExpected.add("Test1"); + assertEquals(columnsNamesExpected, columnsNamesActual); + + structureActual.createColumn("Test2", Object.class); + columnsNamesExpected.add("Test2"); + assertEquals(columnsNamesExpected, columnsNamesActual); + + structureActual.createColumn("Test3", Map.class); + columnsNamesExpected.add("Test3"); + assertEquals(columnsNamesExpected, columnsNamesActual); + + structureActual.deleteColumn("Test1"); + columnsNamesExpected.remove("Test1"); + assertEquals(columnsNamesExpected, columnsNamesActual); + + /** + * the key "Test1TOTO" is not in the structure. + */ + structureActual.deleteColumn("Test1TOTO"); + columnsNamesExpected.remove("Test1TOTO"); + assertEquals(columnsNamesExpected, columnsNamesActual); + + structureActual.deleteColumn("Test2"); + columnsNamesExpected.remove("Test2"); + assertEquals(columnsNamesExpected, columnsNamesActual); + + structureActual.deleteColumn("Test3"); + columnsNamesExpected.remove("Test3"); + assertEquals(columnsNamesExpected, columnsNamesActual); + + /** + * We try to remove an other key, but the map is empty. + */ + structureActual.deleteColumn("Test4"); + columnsNamesExpected.remove("Test4"); + + assertEquals(columnsNamesExpected, columnsNamesActual); + + } + + /** + * we add a column with name and class. + * We use reflexivity to verify that the columsNames returned are goods. + * We remove column, and we continue to verify that the columsNames is + * always good. + */ + public void testGetColumnClass() { + + structureActual = new StructureImpl(); + +// columnsClassExpected; +// columnsClassActual; + + + /** + * We put "Test1" + */ + structureActual.createColumn("Test1", String.class); + columnsClassActual = structureActual.getColumnClass("Test1"); + columnsClassExpected = String.class; + assertEquals(columnsClassExpected, columnsClassActual); + + /** + * We put "Test2" + */ + structureActual.createColumn("Test2", Object.class); + columnsClassActual = structureActual.getColumnClass("Test1"); + columnsClassExpected = String.class; + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = structureActual.getColumnClass("Test2"); + columnsClassExpected = Object.class; + assertEquals(columnsClassExpected, columnsClassActual); + + /** + * We put "Test3" + */ + structureActual.createColumn("Test3", Map.class); + columnsClassActual = structureActual.getColumnClass("Test1"); + columnsClassExpected = String.class; + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = structureActual.getColumnClass("Test2"); + columnsClassExpected = Object.class; + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = structureActual.getColumnClass("Test3"); + columnsClassExpected = Map.class; + assertEquals(columnsClassExpected, columnsClassActual); + + /** + * we remove "Test1" + */ + structureActual.deleteColumn("Test1"); + columnsClassActual = structureActual.getColumnClass("Test1"); + columnsClassExpected = null; + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = structureActual.getColumnClass("Test2"); + columnsClassExpected = Object.class; + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = structureActual.getColumnClass("Test3"); + columnsClassExpected = Map.class; + assertEquals(columnsClassExpected, columnsClassActual); + + /** + * the key "Test1TOTO" is not in the structure. + * We try to remove it. + */ + structureActual.deleteColumn("Test1TOTO"); + columnsClassActual = structureActual.getColumnClass("Test1TOTO"); + columnsClassExpected = null; + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = structureActual.getColumnClass("Test2"); + columnsClassExpected = Object.class; + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = structureActual.getColumnClass("Test3"); + columnsClassExpected = Map.class; + assertEquals(columnsClassExpected, columnsClassActual); + + /** + * We remove "Test2" + */ + structureActual.deleteColumn("Test2"); + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = structureActual.getColumnClass("Test2"); + columnsClassExpected = null; + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = structureActual.getColumnClass("Test3"); + columnsClassExpected = Map.class; + assertEquals(columnsClassExpected, columnsClassActual); + + /** + * We remove "Test3" + */ + structureActual.deleteColumn("Test3"); + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = structureActual.getColumnClass("Test3"); + columnsClassExpected = null; + assertEquals(columnsClassExpected, columnsClassActual); + + /** + * We try to remove an other key, but the map is empty. + */ + structureActual.deleteColumn("Test4"); + columnsClassActual = structureActual.getColumnClass("Test4"); + columnsClassExpected = null; + + assertEquals(columnsClassExpected, columnsClassActual); + + } + + /** + * we create and delete columns. + * we calculate hashcode and compare to hashCode(). + */ + public void testHashCode() { + + structureActual = new StructureImpl(); + int hashCodeExpected = 0; + assertEquals(structureActual.hashCode(), hashCodeExpected); + + /** + * We create column "Test1" + */ + structureActual.createColumn("Test1", String.class); + hashCodeExpected += "Test1".hashCode() + String.class.hashCode(); + assertEquals(structureActual.hashCode(), hashCodeExpected); + + /** + * We create column "Test2" + */ + structureActual.createColumn("Test2", Integer.class); + hashCodeExpected += "Test2".hashCode() + Integer.class.hashCode(); + assertEquals(structureActual.hashCode(), hashCodeExpected); + + /** + * We delete column "Test1" + */ + structureActual.deleteColumn("Test1"); + hashCodeExpected -= "Test1".hashCode() + String.class.hashCode(); + assertEquals(structureActual.hashCode(), hashCodeExpected); + + } +} Added: trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java =================================================================== --- trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java (rev 0) +++ trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java 2010-02-07 00:32:05 UTC (rev 56) @@ -0,0 +1,498 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; +import junit.framework.Assert; +import junit.framework.TestCase; +import org.apache.commons.logging.LogFactory; +import org.apache.commons.logging.Log; + +/** + * + * @author Dorian Langlais + */ +public class TableTest extends TestCase { + + private static final Log log = LogFactory.getLog(TableTest.class); + + private Table tableActual; + private Structure tableStructureActual; + private HashMap<String, Column<?>> tableColumnsActual; + private Structure tableStructureExpected; + private HashMap<String, Column<?>> tableColumnsExpected; + + /** + * We create a new table and we verify that the fields are correctly + * initialized. + */ + public void testNewTable() { + + tableActual = new TableImpl(); + + tableStructureExpected = new StructureImpl(); + tableColumnsExpected = new HashMap<String, Column<?>>(); + + try { + Field fTableStructure = + tableActual.getClass().getDeclaredField("tableStructure"); + Field fTablecolumns = + tableActual.getClass().getDeclaredField("tableColumns"); + fTableStructure.setAccessible(true); + fTablecolumns.setAccessible(true); + tableStructureActual = (Structure) fTableStructure.get(tableActual); + tableColumnsActual = (HashMap<String, Column<?>>) fTablecolumns.get(tableActual); + + assertEquals(tableStructureActual, tableStructureExpected); + assertEquals(tableColumnsActual, tableColumnsExpected); + + } catch (IllegalArgumentException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (IllegalAccessException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (NoSuchFieldException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (SecurityException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } + + } + + /** + * We create columns and we verify that they are actually in the table and + * in the structure of the table. + */ + public void testCreateColumn() { + + tableActual = new TableImpl(); + + tableStructureExpected = new StructureImpl(); + tableColumnsExpected = new HashMap<String, Column<?>>(); + + try { + Field fTableStructure = + tableActual.getClass().getDeclaredField("tableStructure"); + Field fTablecolumns = + tableActual.getClass().getDeclaredField("tableColumns"); + fTableStructure.setAccessible(true); + fTablecolumns.setAccessible(true); + tableStructureActual = (Structure) fTableStructure.get(tableActual); + tableColumnsActual = (HashMap<String, Column<?>>) fTablecolumns.get(tableActual); + + /** + * We add one column. + */ + tableActual.createColumn("Test1", String.class); + tableStructureExpected.createColumn("Test1", String.class); + tableColumnsExpected.put("Test1", new ColumnImpl<String>()); + + assertEquals(tableStructureActual, tableStructureExpected); + assertEquals(tableColumnsActual, tableColumnsExpected); + + /** + * We add another column. + */ + tableActual.createColumn("Test2", Map.class); + tableStructureExpected.createColumn("Test2", Map.class); + tableColumnsExpected.put("Test2", new ColumnImpl<Map>()); + + assertEquals(tableStructureActual, tableStructureExpected); + assertEquals(tableColumnsActual, tableColumnsExpected); + + /** + * add an already existing column has no effect. + */ + tableActual.createColumn("Test1", String.class); + + assertEquals(tableStructureActual, tableStructureExpected); + assertEquals(tableColumnsActual, tableColumnsExpected); + + } catch (IllegalArgumentException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (IllegalAccessException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (NoSuchFieldException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (SecurityException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } + + } + + /** + * We create some columns and remove them. + * After add them, we verify that the are actually in the table and in the + * structure. + * The we remove them one by one, and we verify that they are really removed + * of the table and of the structure. + */ + public void testRemoveColumn() { + + tableActual = new TableImpl(); + + tableStructureExpected = new StructureImpl(); + tableColumnsExpected = new HashMap<String, Column<?>>(); + + try { + Field fTableStructure = + tableActual.getClass().getDeclaredField("tableStructure"); + Field fTablecolumns = + tableActual.getClass().getDeclaredField("tableColumns"); + fTableStructure.setAccessible(true); + fTablecolumns.setAccessible(true); + tableStructureActual = (Structure) fTableStructure.get(tableActual); + tableColumnsActual = (HashMap<String, Column<?>>) fTablecolumns.get(tableActual); + + /** + * We add two columns. + */ + tableActual.createColumn("Test1", String.class); + tableStructureExpected.createColumn("Test1", String.class); + tableColumnsExpected.put("Test1", new ColumnImpl<String>()); + tableActual.createColumn("Test2", Map.class); + tableStructureExpected.createColumn("Test2", Map.class); + tableColumnsExpected.put("Test2", new ColumnImpl<Map>()); + + assertEquals(tableStructureActual, tableStructureExpected); + assertEquals(tableColumnsActual, tableColumnsExpected); + + /** + * We try to remove a column. + */ + tableActual.deleteColumn("Test1"); + tableStructureExpected.deleteColumn("Test1"); + tableColumnsExpected.remove("Test1"); + + assertEquals(tableStructureActual, tableStructureExpected); + assertEquals(tableColumnsActual, tableColumnsExpected); + + /** + * We try to remove another column. + */ + tableActual.deleteColumn("Test2"); + tableStructureExpected.deleteColumn("Test2"); + tableColumnsExpected.remove("Test2"); + + assertEquals(tableStructureActual, tableStructureExpected); + assertEquals(tableColumnsActual, tableColumnsExpected); + + + } catch (IllegalArgumentException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (IllegalAccessException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (NoSuchFieldException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (SecurityException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } + + } + + /** + * We create a new Table, with two columns. + * We put objects in this columns and we use reflexivity to verify that + * objects are really stored in the table. + */ + public void testPut() { + + /** + * We create object to put + */ + String expectedString1 = new String("string1"); + String expectedString2 = new String("string2"); + Integer expectedInteger1 = new Integer(1); + Integer expectedInteger2 = new Integer(2); + /** + * We create the table and columns. + */ + tableActual = new TableImpl(); + tableActual.createColumn("String", String.class); + tableActual.createColumn("Integer", Integer.class); + /** + * We put objects in the table. + */ + tableActual.put("String", "string1", expectedString1); + tableActual.put("String", "string2", expectedString2); + tableActual.put("Integer", "integer1", expectedInteger1); + tableActual.put("Integer", "integer2", expectedInteger2); + + try { + /** + * We use reflexivity to verify that objects are really stored. + */ + Field fTableColumns = tableActual.getClass().getDeclaredField("tableColumns"); + fTableColumns.setAccessible(true); + Map<String, Column<?>> tableColumns = (Map<String, Column<?>>) fTableColumns.get(tableActual); + + assertEquals(expectedString1, tableColumns.get("String").get("string1")); + assertEquals(expectedString2, tableColumns.get("String").get("string2")); + assertEquals(expectedInteger1, tableColumns.get("Integer").get("integer1")); + assertEquals(expectedInteger2, tableColumns.get("Integer").get("integer2")); + + } catch (NoSuchFieldException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (SecurityException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (IllegalArgumentException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (IllegalAccessException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } + } + + /** + * We create a new Table, with two columns. + * We put objects in this columns and we try to get them. + */ + public void testGet() { + + /** + * We create object to put (and get) + */ + String expectedString1 = new String("string1"); + String expectedString2 = new String("string2"); + Integer expectedInteger1 = new Integer(1); + Integer expectedInteger2 = new Integer(2); + + /** + * We create the table and columns. + */ + tableActual = new TableImpl(); + tableActual.createColumn("String", String.class); + tableActual.createColumn("Integer", Integer.class); + + /** + * We put objects in the table. + */ + tableActual.put("String", "string1", expectedString1); + tableActual.put("String", "string2", expectedString2); + tableActual.put("Integer", "integer1", expectedInteger1); + tableActual.put("Integer", "integer2", expectedInteger2); + + /** + * We try to get them. + */ + assertEquals(expectedString1, tableActual.get("String", "string1")); + assertEquals(expectedString2, tableActual.get("String", "string2")); + assertEquals(expectedInteger1, tableActual.get("Integer", "integer1")); + assertEquals(expectedInteger2, tableActual.get("Integer", "integer2")); + } + + /** + * We create a new Table, with two columns. + * We put objects in this columns and we try to get it. + */ + public void testPutAndGetWithVersion() { + + /** + * We create object to put (and get). + */ + String expectedString1 = new String("string1"); + String expectedString2 = new String("string2"); + Integer expectedInteger1 = new Integer(1); + Integer expectedInteger2 = new Integer(2); + + /** + * We create the table and columns. + */ + tableActual = new TableImpl(); + tableActual.createColumn("String", String.class); + tableActual.createColumn("Integer", Integer.class); + + /** + * We put objects in the table. + */ + tableActual.put("String", "string1", expectedString1); + tableActual.put("String", "string2", expectedString2); + tableActual.put("Integer", "integer1", expectedInteger1); + tableActual.put("Integer", "integer2", expectedInteger2); + + /** + * We try to get them. + */ + assertEquals(expectedString1, tableActual.get("String", "string1")); + assertEquals(expectedString2, tableActual.get("String", "string2")); + assertEquals(expectedInteger1, tableActual.get("Integer", "integer1")); + assertEquals(expectedInteger2, tableActual.get("Integer", "integer2")); + + /** + * We try to get them with their version number. + */ + assertEquals(expectedString1, tableActual.get("String", "string1",0)); + assertEquals(expectedString2, tableActual.get("String", "string2",0)); + assertEquals(expectedInteger1, tableActual.get("Integer", "integer1",0)); + assertEquals(expectedInteger2, tableActual.get("Integer", "integer2",0)); + + /** + * We create new object to store in the table. + */ + String expectedString1v2 = new String("string1v2"); + String expectedString2v2 = new String("string2v2"); + Integer expectedInteger1v2 = new Integer(12); + Integer expectedInteger2v2 = new Integer(22); + + /** + * We put them in the table. + */ + tableActual.put("String", "string1", expectedString1v2); + tableActual.put("String", "string2", expectedString2v2); + tableActual.put("Integer", "integer1", expectedInteger1v2); + tableActual.put("Integer", "integer2", expectedInteger2v2); + + /** + * We try to get them by get() : normally we get the last version. + */ + assertEquals(expectedString1v2, tableActual.get("String", "string1")); + assertEquals(expectedString2v2, tableActual.get("String", "string2")); + assertEquals(expectedInteger1v2, tableActual.get("Integer", "integer1")); + assertEquals(expectedInteger2v2, tableActual.get("Integer", "integer2")); + + /** + * We try get the the first version. + */ + assertEquals(expectedString1, tableActual.get("String", "string1",0)); + assertEquals(expectedString2, tableActual.get("String", "string2",0)); + assertEquals(expectedInteger1, tableActual.get("Integer", "integer1",0)); + assertEquals(expectedInteger2, tableActual.get("Integer", "integer2",0)); + + /** + * We try to get the actual version by its version number. + */ + assertEquals(expectedString1v2, tableActual.get("String", "string1",1)); + assertEquals(expectedString2v2, tableActual.get("String", "string2",1)); + assertEquals(expectedInteger1v2, tableActual.get("Integer", "integer1",1)); + assertEquals(expectedInteger2v2, tableActual.get("Integer", "integer2",1)); + + } + + /** + * We pu object in the table and we verify that the ketset return is good. + */ + public void testGetKeys() { + + Set<String> keySet = new HashSet<String>(); + + /** + * We create object to put. + */ + String expectedString1 = new String("string1"); + String expectedString2 = new String("string2"); + Integer expectedInteger1 = new Integer(1); + Integer expectedInteger2 = new Integer(2); + + /** + * We create the table and columns. + */ + tableActual = new TableImpl(); + tableActual.createColumn("String", String.class); + tableActual.createColumn("Integer", Integer.class); + + /** + * We put objects in the table and their keys in the keySet. + */ + tableActual.put("String", "string1", expectedString1); + keySet.add("string1"); + assertEquals(keySet, tableActual.getKeys()); + + tableActual.put("String", "string2", expectedString2); + keySet.add("string2"); + assertEquals(keySet, tableActual.getKeys()); + + tableActual.put("Integer", "integer1", expectedInteger1); + keySet.add("integer1"); + assertEquals(keySet, tableActual.getKeys()); + + tableActual.put("Integer", "integer2", expectedInteger2); + keySet.add("integer2"); + assertEquals(keySet, tableActual.getKeys()); + } + + /** + * We create a new Table, with two columns. + * We put objects in this columns and we try to remove them. + */ + public void testDelete() { + + /** + * We create object to put (and get) + */ + String expectedString1 = new String("string1"); + String expectedString2 = new String("string2"); + Integer expectedInteger1 = new Integer(1); + Integer expectedInteger2 = new Integer(2); + + /** + * We create the table and columns. + */ + tableActual = new TableImpl(); + tableActual.createColumn("String", String.class); + tableActual.createColumn("Integer", Integer.class); + + /** + * We put objects in the table. + */ + tableActual.put("String", "string1", expectedString1); + tableActual.put("String", "string2", expectedString2); + tableActual.put("Integer", "integer1", expectedInteger1); + tableActual.put("Integer", "integer2", expectedInteger2); + + /** + * We try to get them. + */ + assertEquals(expectedString1, tableActual.get("String", "string1")); + assertEquals(expectedString2, tableActual.get("String", "string2")); + assertEquals(expectedInteger1, tableActual.get("Integer", "integer1")); + assertEquals(expectedInteger2, tableActual.get("Integer", "integer2")); + + /** + * Now, we will try to delete them. + */ + tableActual.deleteRow("string1"); + try{ + tableActual.get("String", "string1"); + Assert.fail(); + } catch (NoSuchElementException e) { + log.info("Exception levée correctement."); + } + assertEquals(expectedString2, tableActual.get("String", "string2")); + assertEquals(expectedInteger1, tableActual.get("Integer", "integer1")); + assertEquals(expectedInteger2, tableActual.get("Integer", "integer2")); + + tableActual.deleteRow("string2"); + try{ + tableActual.get("String", "string2"); + Assert.fail(); + } catch (NoSuchElementException e) { + log.info("Exception levée correctement."); + } + assertEquals(expectedInteger1, tableActual.get("Integer", "integer1")); + assertEquals(expectedInteger2, tableActual.get("Integer", "integer2")); + + tableActual.deleteRow("integer1"); + try{ + tableActual.get("Integer", "integer1"); + Assert.fail(); + } catch (NoSuchElementException e) { + log.info("Exception levée correctement."); + } + assertEquals(expectedInteger2, tableActual.get("Integer", "integer2")); + + tableActual.deleteRow("integer2"); + try{ + tableActual.get("Integer", "integer2"); + Assert.fail(); + } catch (NoSuchElementException e) { + log.info("Exception levée correctement."); + } + } +} Added: trunk/msm-bighashmap/src/test/resources/log4j.properties =================================================================== --- trunk/msm-bighashmap/src/test/resources/log4j.properties (rev 0) +++ trunk/msm-bighashmap/src/test/resources/log4j.properties 2010-02-07 00:32:05 UTC (rev 56) @@ -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 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-02-06 22:52:58 UTC (rev 55) +++ trunk/pom.xml 2010-02-07 00:32:05 UTC (rev 56) @@ -27,6 +27,7 @@ <modules> <module>mapstoragemanagerarch</module> + <module>msm-bighashmap</module> </modules>

1 0

r55 - in trunk: . mapstoragemanagerarch
by dlanglais＠users.nuiton.org 06 Feb '10

06 Feb '10

Author: dlanglais Date: 2010-02-06 23:52:58 +0100 (Sat, 06 Feb 2010) New Revision: 55 Removed: trunk/mapstoragemanagerarch/target/ trunk/src/ Log: Excuses pour le pr?\195?\169c?\195?\169dent commit... J'ai import le dossier mapstoragemanager qui contenant le dossier target. Je n'avais pas non plus supprim?\195?\169 le dossier src original... (sous la nouvelle racine du projet...).

1 0

r54 - trunk
by dlanglais＠users.nuiton.org 06 Feb '10

06 Feb '10

Author: dlanglais Date: 2010-02-06 23:30:40 +0100 (Sat, 06 Feb 2010) New Revision: 54 Modified: trunk/pom.xml Log: Pr?\195?\169paration du projet pour modularisation. Ainsi, ?\195?\160 la racine nous aurons un projet pom modulaire. Sous la racine, nous aurons le projet principal ("coeur", ui....) et un projet maven par plugin. Reste ?\195?\160 spliter le plugin "BigHashMap" du projet principal -> j'ai mis toute la soir?\195?\169e pour r?\195?\169ussir ?\195?\160 builder mon pom modulaire... (surement optimisable d'ailleurs -> redondances entre pom MSM et pom MSMArch..). Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-02-06 22:29:39 UTC (rev 53) +++ trunk/pom.xml 2010-02-06 22:30:40 UTC (rev 54) @@ -7,10 +7,10 @@ <repositories> <repository> <id>org.nuiton</id> - <url>http://maven.nuiton.org/release/</url> + <url>http://maven.nuiton.org/release</url> </repository> </repositories> - + <modelVersion>4.0.0</modelVersion>  @@ -24,41 +24,11 @@ <version>0.1-SNAPSHOT</version> <artifactId>mapstoragemanager</artifactId> + + <modules> + <module>mapstoragemanagerarch</module> + </modules> - <dependencies> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>${lutinutil.version}</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</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> -  - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.7</version> - <scope>test</scope> - </dependency> - </dependencies> -    @@ -130,42 +100,42 @@ </roles> </developer> </developers> - +    - <packaging>jar</packaging> + <packaging>pom</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> +  </properties> <build> - <resources> +  - + <plugins> - <plugin> +  <plugin> <groupId>org.nuiton.jaxx</groupId> @@ -188,12 +158,12 @@ </executions> </plugin> - <plugin> +  + silent>true</silent <entries> <entry> <basedir>${maven.gen.dir}/java/</basedir> @@ -208,7 +178,7 @@ </goals> </execution> </executions> - </plugin> + </plugin>--> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -228,9 +198,9 @@ </configuration> </execution> </executions> - + </plugin> - + </plugins> <pluginManagement> @@ -257,7 +227,7 @@ </plugin>  - <plugin> +  + </plugins> </pluginManagement> </build> - + </project> +

1 0

06 Feb '10

Author: dlanglais Date: 2010-02-06 23:29:39 +0100 (Sat, 06 Feb 2010) New Revision: 53 Added: trunk/mapstoragemanagerarch/ trunk/mapstoragemanagerarch/LICENSE.txt trunk/mapstoragemanagerarch/README.txt trunk/mapstoragemanagerarch/changelog.txt trunk/mapstoragemanagerarch/pom.xml trunk/mapstoragemanagerarch/src/ trunk/mapstoragemanagerarch/src/main/ trunk/mapstoragemanagerarch/src/main/java/ trunk/mapstoragemanagerarch/src/main/java/org/ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/Main.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/Core.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/MainTestCore.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/Messages.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/messages.properties trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/package-info.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/BigTable.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/package-info.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/ui/ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java trunk/mapstoragemanagerarch/src/main/resources/ trunk/mapstoragemanagerarch/src/main/resources/i18n/ trunk/mapstoragemanagerarch/src/main/resources/i18n/mapstoragemanager-en_GB.properties trunk/mapstoragemanagerarch/src/main/resources/i18n/mapstoragemanager-fr_FR.properties trunk/mapstoragemanagerarch/src/main/resources/i18n/mapstoragemanagerarch-en_GB.properties trunk/mapstoragemanagerarch/src/main/resources/i18n/mapstoragemanagerarch-fr_FR.properties trunk/mapstoragemanagerarch/src/main/resources/log4j.properties trunk/mapstoragemanagerarch/src/site/ trunk/mapstoragemanagerarch/src/site/doc/ trunk/mapstoragemanagerarch/src/site/doc/bigtable/ trunk/mapstoragemanagerarch/src/site/doc/bigtable/HowToHbase.rst trunk/mapstoragemanagerarch/src/site/doc/bigtable/analyseBT.rst trunk/mapstoragemanagerarch/src/site/doc/bigtable/bigTable.pdf trunk/mapstoragemanagerarch/src/site/doc/bigtable/hbase-files.png trunk/mapstoragemanagerarch/src/site/doc/bigtable/projetHBase.rst trunk/mapstoragemanagerarch/src/site/reports/ trunk/mapstoragemanagerarch/src/site/reports/week3.rst trunk/mapstoragemanagerarch/src/site/reports/week4.rst trunk/mapstoragemanagerarch/src/site/reports/week5.rst trunk/mapstoragemanagerarch/src/site/rst/ trunk/mapstoragemanagerarch/src/test/ trunk/mapstoragemanagerarch/src/test/java/ trunk/mapstoragemanagerarch/src/test/java/org/ trunk/mapstoragemanagerarch/src/test/java/org/nuiton/ trunk/mapstoragemanagerarch/src/test/java/org/nuiton/mapstoragemanager/ trunk/mapstoragemanagerarch/src/test/java/org/nuiton/mapstoragemanager/core/ trunk/mapstoragemanagerarch/src/test/java/org/nuiton/mapstoragemanager/core/BigTableLoaderTest.java trunk/mapstoragemanagerarch/src/test/java/org/nuiton/mapstoragemanager/plugins/ trunk/mapstoragemanagerarch/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ trunk/mapstoragemanagerarch/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java trunk/mapstoragemanagerarch/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java trunk/mapstoragemanagerarch/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowTest.java trunk/mapstoragemanagerarch/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java trunk/mapstoragemanagerarch/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java trunk/mapstoragemanagerarch/src/test/resources/ trunk/mapstoragemanagerarch/src/test/resources/log4j.properties trunk/mapstoragemanagerarch/target/ trunk/mapstoragemanagerarch/target/classes/ trunk/mapstoragemanagerarch/target/classes/BigTable.java trunk/mapstoragemanagerarch/target/classes/META-INF/ trunk/mapstoragemanagerarch/target/classes/META-INF/mapstoragemanagerarch-i18n-definition.properties trunk/mapstoragemanagerarch/target/classes/META-INF/mapstoragemanagerarch-i18n-en_GB.properties trunk/mapstoragemanagerarch/target/classes/META-INF/mapstoragemanagerarch-i18n-fr_FR.properties trunk/mapstoragemanagerarch/target/classes/OurHashMap.java trunk/mapstoragemanagerarch/target/classes/bighashmap/ trunk/mapstoragemanagerarch/target/classes/bighashmap/BigHashMap.java trunk/mapstoragemanagerarch/target/classes/bighashmap/Cell.java trunk/mapstoragemanagerarch/target/classes/bighashmap/CellImpl.java trunk/mapstoragemanagerarch/target/classes/bighashmap/Column.java trunk/mapstoragemanagerarch/target/classes/bighashmap/ColumnImpl.java trunk/mapstoragemanagerarch/target/classes/bighashmap/Row.java trunk/mapstoragemanagerarch/target/classes/bighashmap/RowImpl.java trunk/mapstoragemanagerarch/target/classes/bighashmap/Structure.java trunk/mapstoragemanagerarch/target/classes/bighashmap/StructureImpl.java trunk/mapstoragemanagerarch/target/classes/bighashmap/Table.java trunk/mapstoragemanagerarch/target/classes/bighashmap/TableImpl.java trunk/mapstoragemanagerarch/target/classes/bighashmap/package-info.java trunk/mapstoragemanagerarch/target/classes/nvBigTable.java trunk/mapstoragemanagerarch/target/classes/org/ trunk/mapstoragemanagerarch/target/classes/org/nuiton/ trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/ trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/Main$1.class trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/Main.class trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/core/ trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/core/BigTableLoader.class trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/core/Core.class trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/core/MainTestCore.class trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/core/Messages.class trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/core/PluginLoader.class trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/core/TestServiceLoader.class trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/ trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/BigTable.class trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/OurHashMap.class trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/ trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.class trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.class trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.class trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.class trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.class trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.class trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.class trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.class trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.class trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.class trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.class trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/nvBigTable.class trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/ui/ trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/ui/MainUI$1.class trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/ui/MainUI.class trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/ui/gui/ trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.class trunk/mapstoragemanagerarch/target/classes/package-info.java trunk/mapstoragemanagerarch/target/generated-sources/ trunk/mapstoragemanagerarch/target/generated-sources/i18n/ trunk/mapstoragemanagerarch/target/generated-sources/i18n/java.getter trunk/mapstoragemanagerarch/target/generated-sources/i18n/mapstoragemanagerarch-en_GB.properties trunk/mapstoragemanagerarch/target/generated-sources/i18n/mapstoragemanagerarch-fr_FR.properties trunk/mapstoragemanagerarch/target/generated-sources/i18n/mapstoragemanagerarch.properties trunk/mapstoragemanagerarch/target/generated-sources/java/ trunk/mapstoragemanagerarch/target/generated-sources/java/org/ trunk/mapstoragemanagerarch/target/generated-sources/java/org/nuiton/ trunk/mapstoragemanagerarch/target/generated-sources/java/org/nuiton/mapstoragemanager/ trunk/mapstoragemanagerarch/target/generated-sources/java/org/nuiton/mapstoragemanager/ui/ trunk/mapstoragemanagerarch/target/generated-sources/java/org/nuiton/mapstoragemanager/ui/MainUI.java trunk/mapstoragemanagerarch/target/generated-sources/resources/ trunk/mapstoragemanagerarch/target/generated-sources/resources/META-INF/ trunk/mapstoragemanagerarch/target/generated-sources/resources/META-INF/mapstoragemanagerarch-i18n-definition.properties trunk/mapstoragemanagerarch/target/generated-sources/resources/META-INF/mapstoragemanagerarch-i18n-en_GB.properties trunk/mapstoragemanagerarch/target/generated-sources/resources/META-INF/mapstoragemanagerarch-i18n-fr_FR.properties trunk/mapstoragemanagerarch/target/lib/ trunk/mapstoragemanagerarch/target/lib/commons-beanutils-1.8.2.jar trunk/mapstoragemanagerarch/target/lib/commons-collections-3.2.1.jar trunk/mapstoragemanagerarch/target/lib/commons-io-1.4.jar trunk/mapstoragemanagerarch/target/lib/commons-jxpath-1.3.jar trunk/mapstoragemanagerarch/target/lib/commons-lang-2.4.jar trunk/mapstoragemanagerarch/target/lib/commons-logging-1.1.1.jar trunk/mapstoragemanagerarch/target/lib/commons-primitives-1.0.jar trunk/mapstoragemanagerarch/target/lib/filters-2.0.235.jar trunk/mapstoragemanagerarch/target/lib/javahelp-2.0.02.jar trunk/mapstoragemanagerarch/target/lib/jaxx-runtime-2.0.0-beta-3.jar trunk/mapstoragemanagerarch/target/lib/jaxx-widgets-2.0.0-beta-3.jar trunk/mapstoragemanagerarch/target/lib/junit-4.7.jar trunk/mapstoragemanagerarch/target/lib/jxlayer-3.0.3.jar trunk/mapstoragemanagerarch/target/lib/log4j-1.2.14.jar trunk/mapstoragemanagerarch/target/lib/nuiton-i18n-api-1.0.1.jar trunk/mapstoragemanagerarch/target/lib/nuiton-utils-1.1.2.jar trunk/mapstoragemanagerarch/target/lib/ognl-2.6.11.jar trunk/mapstoragemanagerarch/target/lib/swing-worker-1.1.jar trunk/mapstoragemanagerarch/target/lib/swingx-1.0.jar trunk/mapstoragemanagerarch/target/lib/xwork-2.1.3.jar trunk/mapstoragemanagerarch/target/mapstoragemanagerarch-0.1-SNAPSHOT.jar trunk/mapstoragemanagerarch/target/maven-archiver/ trunk/mapstoragemanagerarch/target/maven-archiver/pom.properties trunk/mapstoragemanagerarch/target/surefire-reports/ trunk/mapstoragemanagerarch/target/surefire-reports/TEST-org.nuiton.mapstoragemanager.core.BigTableLoaderTest.xml trunk/mapstoragemanagerarch/target/surefire-reports/TEST-org.nuiton.mapstoragemanager.plugins.bighashmap.CellTest.xml trunk/mapstoragemanagerarch/target/surefire-reports/TEST-org.nuiton.mapstoragemanager.plugins.bighashmap.ColumnTest.xml trunk/mapstoragemanagerarch/target/surefire-reports/TEST-org.nuiton.mapstoragemanager.plugins.bighashmap.RowTest.xml trunk/mapstoragemanagerarch/target/surefire-reports/TEST-org.nuiton.mapstoragemanager.plugins.bighashmap.StructureTest.xml trunk/mapstoragemanagerarch/target/surefire-reports/TEST-org.nuiton.mapstoragemanager.plugins.bighashmap.TableTest.xml trunk/mapstoragemanagerarch/target/surefire-reports/org.nuiton.mapstoragemanager.core.BigTableLoaderTest.txt trunk/mapstoragemanagerarch/target/surefire-reports/org.nuiton.mapstoragemanager.plugins.bighashmap.CellTest.txt trunk/mapstoragemanagerarch/target/surefire-reports/org.nuiton.mapstoragemanager.plugins.bighashmap.ColumnTest.txt trunk/mapstoragemanagerarch/target/surefire-reports/org.nuiton.mapstoragemanager.plugins.bighashmap.RowTest.txt trunk/mapstoragemanagerarch/target/surefire-reports/org.nuiton.mapstoragemanager.plugins.bighashmap.StructureTest.txt trunk/mapstoragemanagerarch/target/surefire-reports/org.nuiton.mapstoragemanager.plugins.bighashmap.TableTest.txt trunk/mapstoragemanagerarch/target/test-classes/ trunk/mapstoragemanagerarch/target/test-classes/log4j.properties trunk/mapstoragemanagerarch/target/test-classes/org/ trunk/mapstoragemanagerarch/target/test-classes/org/nuiton/ trunk/mapstoragemanagerarch/target/test-classes/org/nuiton/mapstoragemanager/ trunk/mapstoragemanagerarch/target/test-classes/org/nuiton/mapstoragemanager/core/ trunk/mapstoragemanagerarch/target/test-classes/org/nuiton/mapstoragemanager/core/BigTableLoaderTest.class trunk/mapstoragemanagerarch/target/test-classes/org/nuiton/mapstoragemanager/plugins/ trunk/mapstoragemanagerarch/target/test-classes/org/nuiton/mapstoragemanager/plugins/bighashmap/ trunk/mapstoragemanagerarch/target/test-classes/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.class trunk/mapstoragemanagerarch/target/test-classes/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.class trunk/mapstoragemanagerarch/target/test-classes/org/nuiton/mapstoragemanager/plugins/bighashmap/RowTest.class trunk/mapstoragemanagerarch/target/test-classes/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.class trunk/mapstoragemanagerarch/target/test-classes/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.class Log: MSMArch import (tentative...). Added: trunk/mapstoragemanagerarch/LICENSE.txt =================================================================== --- trunk/mapstoragemanagerarch/LICENSE.txt (rev 0) +++ trunk/mapstoragemanagerarch/LICENSE.txt 2010-02-06 22:29:39 UTC (rev 53) @@ -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/mapstoragemanagerarch/changelog.txt =================================================================== --- trunk/mapstoragemanagerarch/changelog.txt (rev 0) +++ trunk/mapstoragemanagerarch/changelog.txt 2010-02-06 22:29:39 UTC (rev 53) @@ -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/mapstoragemanagerarch/pom.xml =================================================================== --- trunk/mapstoragemanagerarch/pom.xml (rev 0) +++ trunk/mapstoragemanagerarch/pom.xml 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,276 @@ +<?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"> + +  + <repositories> + <repository> + <id>org.nuiton</id> + <url>http://maven.nuiton.org/release</url> + </repository> + </repositories> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>2.0.4</version> + </parent> + + <version>0.1-SNAPSHOT</version> + <artifactId>mapstoragemanagerarch</artifactId> + + <dependencies> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${lutinutil.version}</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</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> +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.7</version> + <scope>test</scope> + </dependency> + </dependencies> + +  +  +  + + <name>MapStorageManagerArch</name> + + <description>Creation of a graphic user interface for Hbase </description> + <inceptionYear>2010</inceptionYear> + + <developers> + <developer> + <id>tchemit</id> + <name>Tony Chemit</name> + <email>chemit(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>fdesbois</id> + <name>Florian Desbois</name> + <email>fdesbois(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>fgilet</id> + <name>Florent Gilet</name> + <email>florent.gilet(a)etu.univ-nantes.fr</email> + <organization>Université de nantes</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>gcrieloue</id> + <name>Gilles Crieloue</name> + <email>gilles.crieloue(a)etu.univ-nantes.fr</email> + <organization>Université de nantes</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>afages</id> + <name>Amaury Fages</name> + <email>amaury.fages(a)etu.univ-nantes.fr</email> + <organization>Université de nantes</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>dlanglais</id> + <name>Dorian langlais</name> + <email>dorain.langlais(a)etu.univ-nantes.fr</email> + <organization>Université de nantes</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + </developers> + +  +  +  + <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> + <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> + <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/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/Main.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/Main.java (rev 0) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-02-06 22:29:39 UTC (rev 53) @@ -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: 4 $ + * + * Mise a jour: $Date: 2010-01-21 15:24:35 +0100 (jeu., 21 janv. 2010) $ 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); + } + }); + } + + +} Added: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java (rev 0) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,79 @@ +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/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/Core.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/Core.java (rev 0) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/Core.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,99 @@ +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; + +/** + * 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 = + 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/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/MainTestCore.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/MainTestCore.java (rev 0) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/MainTestCore.java 2010-02-06 22:29:39 UTC (rev 53) @@ -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. + * @param args args + */ + public static void main(final 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/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/Messages.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/Messages.java (rev 0) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/Messages.java 2010-02-06 22:29:39 UTC (rev 53) @@ -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/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java (rev 0) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,159 @@ +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/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java (rev 0) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,28 @@ +package org.nuiton.mapstoragemanager.core; + +import java.net.MalformedURLException; + +/** + * @author fdesbois + * @deprecated Use org.nuiton.mapstoragemanager.core.BigTableLoaderText instead + */ +@Deprecated +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(final String[] args) { + + TestServiceLoader t = new TestServiceLoader(); + } +} \ No newline at end of file Added: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/messages.properties =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/messages.properties (rev 0) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/messages.properties 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1 @@ +Config.url=plugins/ Added: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/package-info.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/package-info.java (rev 0) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/package-info.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,5 @@ +/** + * The core architecture. + * It deals with plugins discovery, loading, and such. + */ +package org.nuiton.mapstoragemanager.core; Added: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/BigTable.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/BigTable.java (rev 0) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/BigTable.java 2010-02-06 22:29:39 UTC (rev 53) @@ -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/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java (rev 0) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java 2010-02-06 22:29:39 UTC (rev 53) @@ -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/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap.java (rev 0) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,33 @@ +package org.nuiton.mapstoragemanager.plugins; + +import java.util.HashMap; +import java.util.Set; + +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 + + } + +} Added: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java (rev 0) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,130 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import org.nuiton.mapstoragemanager.plugins.nvBigTable; + +/** + * Interface listant les méthodes nécéssaires sur une base de données. + * @author Dorian Langlais + * + */ +public class BigHashMap implements nvBigTable { + + private Map<String, Table> tables; + private Table currentTable; + + /** + * Default constructor. + */ + public BigHashMap() { + this.tables = new HashMap<String, Table>(); + currentTable = null; + } + + /** + * {@inheritDoc} + * Create a new HashMap database. + */ + public boolean connect(String host, int port, String base, String username, String passwd) { + //throw new UnsupportedOperationException("Not supported yet."); + new BigHashMap(); + return true; + } + + /** + * {@inheritDoc} + */ + public void selectTable(String table) { + this.currentTable = tables.get(table); + } + + /** + * {@inheritDoc} + */ + public void createTable(String table) { + this.tables.put(table, new TableImpl()); + } + + /** + * {@inheritDoc} + */ + public void deleteTable(String table) { + this.tables.remove(table); + } + + /** + * {@inheritDoc} + */ + public Set<String> getTablesNames() { + return this.tables.keySet(); + } + + /** + * {@inheritDoc} + */ + public void createColumn(String table, String column) { + this.tables.get(table).createColumn(column, null); + } + + /** + * {@inheritDoc} + */ + public void deleteColumn(String table, String column) { + this.tables.get(table).deleteColumn(column); + } + + /** + * {@inheritDoc} + */ + public Set<String> getColumnsNames(String table) { + return this.tables.get(table).getColumnsNames(); + } + + /** + * {@inheritDoc} + */ + public void put(String table, String column, String key, String content) { + this.tables.get(table).put(column, key, content); + } + + /** + * {@inheritDoc} + */ + public String get(String table, String column, String key) { + return this.tables.get(table).get(column, key).toString(); + } + + /** + * {@inheritDoc} + */ + public String get(String table, String column, String key, int version) { + return this.tables.get(table).get(column, key, version).toString(); + } + + /** + * {@inheritDoc} + */ + public Map<String, String> getRow(String table, String key) { + + Row row = this.tables.get(table).getRow(key); + + Map<String,Object> rowContent = row.getRowContent(); + Map<String,String> rowMap = new HashMap<String,String>(); + + for(String rowKey : rowContent.keySet()) { + String rowValue = rowContent.get(rowKey).toString(); + rowMap.put(rowKey, rowValue); + } + return rowMap; + } + + /** + * {@inheritDoc} + */ + public Set<String> getKeys(String table) { + return this.tables.get(table).getKeys(); + } + +} Added: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java (rev 0) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,47 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +/** + * Interface to present the method an a Cell. + * @author Dorian Langlais + * + * @param <T> Class of the object stored in the cells. + */ +public interface Cell<T> { + + /** + * Get the most recent object put in the cell. + * @return The most recent object stored in the cell. + */ + T get(); + + /** + * Put a new object in the cell. + * @param t Objet to store in the cell. + */ + void put(T t); + + /** + * Get an object from its "version". + * The version number start at 0, and increase one by one at each new + * version. + * @param t the version wanted (it can be timestamp, number..). + * @return The object corresponding to the "version". + */ + T get(Long t); + + /** + * hashCode(). + * @return + */ + int hashCode(); + + /** + * equals(). + */ + boolean equals(Object o); + + /** + * toString(). + */ + String toString(); +} Added: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java (rev 0) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,114 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.Map; +import java.util.NoSuchElementException; + +/** + * Class Cell. + * A cell contain different version of a content. + * So a cell store objects and its version. + * @param <T> The type of the stored objects. + * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet. + * @licence GPL. + */ +public class CellImpl<T /**extends Serializable*/ + > implements Cell<T> { + + /** + * cell. + * hashMap with key as timestamp and value, as object of T class. + */ + private Map<Long, T> cell; + + /** + * Default constructor. + */ + public CellImpl() { + this.cell = new HashMap<Long, T>(); + } + + /** + * Constructor with object. + * @param t The object to store. + */ + public CellImpl(T t) { + this.cell = new HashMap<Long, T>(); + this.put(t); + } + + /** + * {@inheritDoc} + */ + public final void put(final T t) { + cell.put((long)cell.size(), t); + //cell.put(System.currentTimeMillis(), t); + } + + /** + * {@inheritDoc} + */ + 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 = 0L; + for (Long current : cell.keySet()) { + if (max < current) { + max = current; + } + } + return cell.get(max); + } + + /** + * {@inheritDoc} + */ + public int hashCode() { + if (this.cell.size() != 0) { + return this.get().hashCode(); + } else { + return 0; + } + } + + /** + * {@inheritDoc} + * //TODO : we consider only the last item... but it will be better to + * //TODO verify all the "versions" of the cell. + */ + public boolean equals(Object o) { + if (o instanceof CellImpl) { + CellImpl another = (CellImpl) o; + if(this.cell.size() == another.cell.size()) { + if(this.cell.size() == 0) { + return true; + } else { + return this.get().equals(another.get()); + } + } else { + return false; + } + } else { + return false; + } + } + /** + * {@inheritDoc} + */ + public String toString() { + + if (this.cell.size() != 0) { + return ((T) this.get()).toString(); + } else { + return ""; + } + } +} Added: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java (rev 0) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,62 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.Set; + +/** + * Interface to present the method to implement for en Column. + * @author Dorian Langlais + * + * @param <T> Class of the object stored in the columns. + */ +public interface Column<T> { + + /** + * Get the object which has key key</key>. + * @param key the key. + * @return the object stored at the line identified by key + */ + T get(String key); + + /** + * Get the object which has key key</key> and version version. + * @param key + * @param version the version wanted (it can be timestamp, number..). + * @return The object corresponding to the "version". + */ + T get(String key, Long version); + + /** + * Put object t with the key key. + * @param key the key + * @param t object to store + */ + void put(String key, Object t); + + /** + * Delete an object by its key. + * @param key the key + */ + void delete(String key); + + /** + * hashCode(). + * @return + */ + int hashCode(); + + /** + * equals(). + */ + boolean equals(Object o); + + /** + * toString(). + */ + String toString(); + + /** + * Get the keys of the column. + * @return return a Set containing all the keys of the column. + */ + Set<String> getKeys(); +} Added: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java (rev 0) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,110 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Set; + +/** + * 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> { + + /** + * column. + * hashMap with key the key of the line, and value a column. + */ + private Map<String, CellImpl<T>> column; + + /** + * Default constructor. + */ + public ColumnImpl() { + column = new HashMap<String, CellImpl<T>>(); + } + + /** + * {@inheritDoc} + */ + 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 Object content) { + try { + this.column.get(key).put((T)content); + } catch (NullPointerException e) { + this.column.put(key, new CellImpl<T>((T)content)); + } + } + + /** + * {@inheritDoc} + */ + public final void delete(final String key) { + this.column.remove(key); + } + + /** + * {@inheritDoc} + */ + public final int hashCode() { + int hash = 0; + for(Cell c : column.values()) { + hash += c.hashCode(); + } + return hash; + } + + /** + * {@inheritDoc} + */ + public boolean equals(Object o) { + if (o instanceof Column) { + + ColumnImpl other = (ColumnImpl) o; + + return other.column.equals(this.column); + + } else { + return false; + } + } + + /** + * {@inheritDoc} + */ + public final String toString() { + String ret = ""; + + for (String key : column.keySet()) { + ret += key + "\t" + column.get(key); + } + + return ret; + } + + /** + * {@inheritDoc} + */ + public Set<String> getKeys() { + return this.column.keySet(); + } +} Added: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java (rev 0) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,36 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.Map; + +/** + * Interface to present the methods on a Row + * @author Dorian Langlais + * + */ +public interface Row { + + /** + * to string a row. + * @return the row in textual format. + */ + String toString(); + + /** + * Get row structure. + * @return the row structure + */ + Structure getRowStructure(); + + /** + * Get row content. + * @return the row content + */ + Map<String, Object> getRowContent(); + + /** + * Get an element of the row. + * @param columnName the column name. + * @return the content of the "cell". + */ + Object getContent(String columnName); +} Added: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java (rev 0) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,65 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.Map; + +/** + * Class RowImpl. + * A row of a table. + * @author Dorian Langlais. + */ +public class RowImpl implements Row { + + /** + * Structure of the row. + */ + private Structure rowStructure; + /** + * Content of the row. + */ + private Map<String, Object> rowContent; + + /** + * Row constructor. + * @param struct the row structure + * @param content the row content + */ + public RowImpl(final Structure 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 Structure getRowStructure() { + return rowStructure; + } + + /** + * {@inheritDoc} + */ + public Map<String, Object> getRowContent() { + return rowContent; + } + + /** + * {@inheritDoc} + */ + public final String toString() { + String ret; + ret = rowContent.values().toString(); + return ret; + } + + /** + * {@inheritDoc} + */ + public Object getContent(String columnName) { + return rowContent.get(columnName); + } +} Added: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java (rev 0) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,51 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.Set; + +/** + * Interface to present the method on a structure. + * A structure is a description of a table. + * @author Dorian Langlais + * + */ +public interface Structure { + + /** + * Add a new column in the structure. + * @param columnName the column name + * @param columnClass the column class + */ + void createColumn(String columnName, Class<?> columnClass); + + /** + * Get the columns' names. + * @return return a set containing the name of the columns. + */ + Set<String> getColumnsNames(); + + /** + * Get the class of object of the column columnName. + * @param columnName the column name + * @return return the column class + */ + Class<?> getColumnClass(String columnName); + + /** + * Remove a column of the structure by its name. + * @param columnName the column name + */ + void deleteColumn(String columnName); + + /** + * get the hashCode of the structure. + * @return return the hashCode of the structure. + */ + int hashCode(); + + /** + * Permit to verify if this is equals to another object. + * @param another the object to compare + * @return true if this is equals to another + */ + boolean equals(Object o); +} Added: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java (rev 0) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,92 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +/** + * Class Structure. + * Represente the mapping between a row and the column of a table. + * @author Dorian Langlais + * + */ +public class StructureImpl implements Structure { + + /** + * structure. + * hashMap with key the column name, and value the column class. + */ + private Map<String, Class<? /**extends Serializable*/ + >> structure; + + /** + * Default constructor. + */ + public StructureImpl() { + this.structure = + new HashMap<String, Class<? /**extends Serializable*/ + >>(); + } + + /** + * {@inheritDoc} + */ + public final void createColumn(final String columnName, + final Class<? /**extends Serializable*/ + > columnClass) { + this.structure.put(columnName, columnClass); + } + + /** + * {@inheritDoc} + */ + public final void deleteColumn(final String columnName) { + this.structure.remove(columnName); + } + + /** + * {@inheritDoc} + */ + public final Class<? /**extends Serializable*/ + > getColumnClass( + final String columnName) { + return this.structure.get(columnName); + } + + /** + * {@inheritDoc} + */ + public final Set<String> getColumnsNames() { + return this.structure.keySet(); + } + + /** + * {@inheritDoc} + */ + public final int hashCode() { + if (structure.isEmpty()) { + return 0; + } else { + int hash = 0; + for (String key : structure.keySet() ) { + hash += key.hashCode(); + hash += structure.get(key).hashCode(); + } + return hash; + } + } + + /** + * {@inheritDoc} + */ + public final boolean equals(Object o) { + if (o instanceof StructureImpl) { + StructureImpl another = (StructureImpl) o; + + return this.structure.equals(another.structure); + + } else { + return false; + } + } +} Added: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java (rev 0) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,82 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.Set; + +/** + * Interface to present the method on a table. + * A table is like a table in SGBD, but in BigTable, the data are stored in + * columns not in rows. + * @author Dorian Langlais + */ +public interface Table { + + /** + * Create a column in the table. + * @param columnName the column name + * @param columnClass the column class + * @param <columnClass> generics to spécify the class of the stored objects. + */ + <columnClass> void createColumn(final String columnName, + final Class<?> columnClass); + + /** + * Delete a colum of the table. + * @param columnName the column name. + */ + void deleteColumn(final String columnName); + + /** + * Get the columns' name of the table. + * @return Return a set containing the columns' name of the table + */ + Set<String> getColumnsNames(); + + /** + * Get a "virtual" rom from the table. + * @param key the key of the row to get + * @return return the row which has key as key + */ + Row getRow(final String key); + + /** + * Remove a row by its key. + * @param key the key + */ + void deleteRow(final String key); + + /** + * Put an object in the table. + * Put the objct o in the column columnName at the key + * key. + * @param columnName the columnName + * @param key the key + * @param o the object + */ + void put(final String columnName, final String key, final Object o); + + /** + * Get an object from the table. + * Get an object from the column columnName with the key key. + * @param columnName the columnName + * @param key the key + * @return return the object stored + */ + Object get(final String columnName, final String key); + + /** + * Get an object from the table. + * Get an object from the column columnName with the key key + * and the versiion number version. + * @param columnName the columnName + * @param key the key + * @param version the version wanted + * @return return the object stored + */ + Object get(final String columnName, final String key, final long version); + + /** + * Get the keys of the table. + * @return return a set which contains all the keys of the table. + */ + Set<String> getKeys(); +} Added: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java (rev 0) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,113 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +/** + * Class Table. + * Implements the interface Table. + * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet. + * @licence GPL. + */ +public class TableImpl implements Table { + + /** + * Table. + * hashMap with key as column name and value, a colum of the table. + */ + private Map<String, Column<?>> tableColumns; + /** + * Structure of the table. + */ + private StructureImpl tableStructure; + + /** + * Default constructor. + */ + public TableImpl() { + this.tableColumns = new HashMap<String, Column<?>>(); + this.tableStructure = new StructureImpl(); + } + + /** + * {@inheritDoc} + */ + public final <columnClass /**extends Serializable*/ + > void createColumn( + final String columnName, final Class<?> columnClass) { + ColumnImpl<columnClass> column = new ColumnImpl<columnClass>(); + this.tableColumns.put(columnName, column); + this.tableStructure.createColumn(columnName, columnClass); + } + + /** + * {@inheritDoc} + */ + public final void deleteColumn(final String columnName) { + this.tableColumns.remove(columnName); + this.tableStructure.deleteColumn(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, + tableColumns.get(columnName).get(key)); + } + return new RowImpl(tableStructure, rowContent); + } + + /** + * {@inheritDoc} + */ + public void deleteRow(final String key) { + for (Column column : tableColumns.values()) { + column.delete(key); + } + } + + /** + * {@inheritDoc} + */ + public void put(String columnName, String key, Object o) { + this.tableColumns.get(columnName).put(key, o); + } + + /** + * {@inheritDoc} + */ + public Object get(String columnName, String key) { + return this.tableColumns.get(columnName).get(key); + } + + /** + * {@inheritDoc} + */ + public Object get(String columnName, String key, long version) { + return this.tableColumns.get(columnName).get(key, version); + } + + /** + * {@inheritDoc} + */ + public Set<String> getColumnsNames() { + return this.tableColumns.keySet(); + } + + /** + * {@inheritDoc} + */ + public Set<String> getKeys() { + Set<String> keys = new HashSet<String>(); + for(Column col : this.tableColumns.values()){ + keys.addAll(col.getKeys()); + } + return keys; + } +} Added: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/package-info.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/package-info.java (rev 0) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/package-info.java 2010-02-06 22:29:39 UTC (rev 53) @@ -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. + */ Added: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable.java (rev 0) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,135 @@ +package org.nuiton.mapstoragemanager.plugins; + +import java.util.Map; +import java.util.Set; + +/** + * 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 column in the table table + * @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 column in the table table + * @param table the table name + * @param column the column name + */ + void deleteColumn(String table, String column); + + /** + * Get the columns' name of one table. + * @param table the table name + * @return Return a set containing the columns' name of the table + * table + */ + Set<String> getColumnsNames(String table); + + /*************** + * Cell * + ***************/ + + /** + * Put a new content in the table. + * Put a new content in the column column of the table + * table with the key key. + * @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 table from the column column + * where the key is key. + * -> 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 table from the column column + * where the key is key. + * -> get the content with the version version. + * @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 key from the table table + * @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 table. + */ + Set<String> getKeys(String table); +} Added: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java (rev 0) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,5 @@ +package org.nuiton.mapstoragemanager.plugins; +/** + * The plugins interfaces. + */ + Added: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css (rev 0) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,118 @@ +/** + * *##% observe-swing + * Copyright (C) 2008 - 2009 IRD + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. ##%* +*/ + +Application { + lookAndFeel: system; + locationRelativeTo: {null}; + resizable: true; +} + +#menuFile { + text:"mapstoragemanager.action.file"; + toolTipText:"mapstoragemanager.action.file.tip"; + mnemonic:F; +} + +#menuEdit { + text:"mapstoragemanager.action.edit"; + toolTipText:"mapstoragemanager.action.edit.tip"; + mnemonic:E; +} + +#menuConnect { + text:"mapstoragemanager.action.connect"; + toolTipText:"mapstoragemanager.action.connect.tip"; + mnemonic:C; +} + +#menuDisconnect { + text:"mapstoragemanager.action.disconnect"; + toolTipText:"mapstoragemanager.action.disconnect.tip"; + mnemonic:D; +} + +#menuExit { + text:"mapstoragemanager.action.exit"; + toolTipText:"mapstoragemanager.action.exit.tip"; + mnemonic:E; +} + +#menuPreferences { + text:"mapstoragemanager.action.preferences"; + toolTipText:"mapstoragemanager.action.preferences.tip"; + mnemonic:P; +} + +#menuHelp { + text:"mapstoragemanager.action.menuHelp"; + toolTipText:"mapstoragemanager.action.menuHelp.tip"; + mnemonic:A; +} + +#menuHelpHelp { + text:"mapstoragemanager.action.help"; + toolTipText:"mapstoragemanager.action.help.tip"; + mnemonic:E; +} + +#menuHelpSite { + text:"mapstoragemanager.action.visitSite"; + toolTipText:"mapstoragemanager.action.visitSite.tip"; + mnemonic:V; +} + +#menuHelpAbout { + text:"mapstoragemanager.action.aboutUs"; + toolTipText:"mapstoragemanager.action.aboutUs.tip"; + mnemonic:A; +} + + +#menuFileLanguageFR { + text:"mapstoragemanager.action.fr"; + toolTipText:"mapstoragemanager.action.fr.tip"; + mnemonic:F; +} + +#menuFileLanguageUK { + text:"mapstoragemanager.action.uk"; + toolTipText:"mapstoragemanager.action.uk.tip"; + mnemonic:U; +} + +#menuLanguage { + text:"mapstoragemanager.action.language"; + toolTipText:"mapstoragemanager.action.language.tip"; + mnemonic:C; +} + + +#mainFrame { + title:"Map Storage Manager"; +} + +JLabel.boldUnderline { + font-weight: bold; +} + +JSplitPane { + oneTouchExpandable:true; + continuousLayout:true; + dividerSize:6; +} Added: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx (rev 0) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,101 @@ +<Application id='mainFrame' width='1024' height='800' + onWindowClosing='engine.close()'> + +  + <script> + <![CDATA[ + import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; + + ApplicationEngine engine = new ApplicationEngine(); + ]]> + </script> + +  + <style source='MainUI.css'/> + +  + + <JMenuBar> + <JMenu id='menuFile'> + <JMenuItem id='menuConnect' + onActionPerformed='engine.doSomething()'/> + <JMenuItem id='menuDisconnect' + onActionPerformed='engine.doSomething()'/> + <JSeparator/> + <JMenuItem id='menuExit' + onActionPerformed='engine.close()'/> + </JMenu> + + <JMenu id='menuEdit'> + <JMenuItem id='menuPreferences' + onActionPerformed='engine.doSomething()'/> + + <JSeparator/> + <JMenu id='menuLanguage'> + <JMenuItem id='menuFileLanguageFR' + onActionPerformed='engine.setLocale("en","GB")'/> + <JMenuItem id='menuFileLanguageUK' + onActionPerformed='engine.setLocale("fr","FR")'/> + </JMenu> + </JMenu> + + <JMenu id='menuHelp'> + <JMenuItem id='menuHelpHelp' + onActionPerformed='engine.doSomething()'/> + <JMenuItem id='menuHelpSite' + onActionPerformed='engine.doSomething()'/> + <JMenuItem id='menuHelpAbout' + onActionPerformed='engine.doSomething()'/> + </JMenu> + + </JMenuBar> + + <JPanel layout='{new BorderLayout()}' id='mainPanel'> + <JToolBar constraints='BorderLayout.NORTH' opaque='true'> + <JLabel text="name base :" styleClass='boldUnderline' /> + <JAXXComboBox id='nameBase'> + <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' > + <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> + Added: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java (rev 0) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,48 @@ +package org.nuiton.mapstoragemanager.ui.gui; + +import java.util.Locale; +import java.util.ResourceBundle; +import javax.swing.JOptionPane; + +/** + * Engine Class with methods for application user interface. + * @author E054030D + * + */ +public class ApplicationEngine { + + Locale currentLocale; + ResourceBundle messages; + + /** + * Show the developers. + * // TODO + */ + public final void showGreeting() { + JOptionPane.showMessageDialog(null, "hi"); + } + + /** + * Method to close the application. + */ + public final void close() { + System.exit(0); + } + + /** + * do nothing (for tests). + */ + public void doSomething() { } + + /** + * Change language for internationalization. + * @param language the language + * @param country the country + */ + public void setLocale(String language, String country) { + currentLocale= new Locale(language,country); + messages = ResourceBundle.getBundle("mapstoragemanager",currentLocale); + System.out.println(messages.getString("ok")); + + } +} Added: trunk/mapstoragemanagerarch/src/main/resources/i18n/mapstoragemanager-en_GB.properties =================================================================== --- trunk/mapstoragemanagerarch/src/main/resources/i18n/mapstoragemanager-en_GB.properties (rev 0) +++ trunk/mapstoragemanagerarch/src/main/resources/i18n/mapstoragemanager-en_GB.properties 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,32 @@ +Map\ Storage\ Manager=Map Storage Manager +TABLE\ NAME\ \:\ TODO= +login\ \:=Login +mapstoragemanager.action.aboutUs=About us +mapstoragemanager.action.aboutUs.tip=About Code Lutin +mapstoragemanager.action.connect=Connect +mapstoragemanager.action.connect.tip=Start a new connection +mapstoragemanager.action.disconnect=Disconnect +mapstoragemanager.action.disconnect.tip=Disconnect the current session +mapstoragemanager.action.edit=Edit +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit=Exit +mapstoragemanager.action.exit.tip= +mapstoragemanager.action.file=File +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr=French +mapstoragemanager.action.fr.tip=Change to french language +mapstoragemanager.action.help=Help +mapstoragemanager.action.help.tip= +mapstoragemanager.action.language=Choose language +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp=Help +mapstoragemanager.action.menuHelp.tip= +mapstoragemanager.action.preferences=Preferences +mapstoragemanager.action.preferences.tip= +mapstoragemanager.action.uk=English +mapstoragemanager.action.uk.tip=Change to english language +mapstoragemanager.action.visitSite=Visit our site +mapstoragemanager.action.visitSite.tip= +name\ base\ \:=Name base +ok=Validate +password\ \:=Password Added: trunk/mapstoragemanagerarch/src/main/resources/i18n/mapstoragemanager-fr_FR.properties =================================================================== --- trunk/mapstoragemanagerarch/src/main/resources/i18n/mapstoragemanager-fr_FR.properties (rev 0) +++ trunk/mapstoragemanagerarch/src/main/resources/i18n/mapstoragemanager-fr_FR.properties 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,32 @@ +Map\ Storage\ Manager=Map Storage Manager +TABLE\ NAME\ \:\ TODO= +login\ \:=Identifiant +mapstoragemanager.action.aboutUs=A propos +mapstoragemanager.action.aboutUs.tip=A propos de Code Lutin +mapstoragemanager.action.connect=Connexion +mapstoragemanager.action.connect.tip=Etablis une nouvelle connexion +mapstoragemanager.action.disconnect=D\u00E9connexion +mapstoragemanager.action.disconnect.tip=D\u00E9connecte la session courante +mapstoragemanager.action.edit=Edition +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit=Quitter +mapstoragemanager.action.exit.tip=Quitte l'application +mapstoragemanager.action.file=Fichier +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr=Fran\u00E7ais +mapstoragemanager.action.fr.tip=Changer la langue en fran\u00E7ais +mapstoragemanager.action.help=Aide +mapstoragemanager.action.help.tip= +mapstoragemanager.action.language=choisir la langue +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp=Aide +mapstoragemanager.action.menuHelp.tip=Aide contextuelle +mapstoragemanager.action.preferences=Pr\u00E9f\u00E9rences +mapstoragemanager.action.preferences.tip=Permet de configurer l'application +mapstoragemanager.action.uk=Anglais +mapstoragemanager.action.uk.tip=Changer la langue en anglais +mapstoragemanager.action.visitSite=Visiter notre site +mapstoragemanager.action.visitSite.tip= +name\ base\ \:=Nom de la base +ok=Valider +password\ \:=Mot de passe Added: trunk/mapstoragemanagerarch/src/main/resources/i18n/mapstoragemanagerarch-en_GB.properties =================================================================== --- trunk/mapstoragemanagerarch/src/main/resources/i18n/mapstoragemanagerarch-en_GB.properties (rev 0) +++ trunk/mapstoragemanagerarch/src/main/resources/i18n/mapstoragemanagerarch-en_GB.properties 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,32 @@ +Map\ Storage\ Manager= +TABLE\ NAME\ \:\ TODO= +login\ \:= +mapstoragemanager.action.aboutUs= +mapstoragemanager.action.aboutUs.tip= +mapstoragemanager.action.connect= +mapstoragemanager.action.connect.tip= +mapstoragemanager.action.disconnect= +mapstoragemanager.action.disconnect.tip= +mapstoragemanager.action.edit= +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit= +mapstoragemanager.action.exit.tip= +mapstoragemanager.action.file= +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr= +mapstoragemanager.action.fr.tip= +mapstoragemanager.action.help= +mapstoragemanager.action.help.tip= +mapstoragemanager.action.language= +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp= +mapstoragemanager.action.menuHelp.tip= +mapstoragemanager.action.preferences= +mapstoragemanager.action.preferences.tip= +mapstoragemanager.action.uk= +mapstoragemanager.action.uk.tip= +mapstoragemanager.action.visitSite= +mapstoragemanager.action.visitSite.tip= +name\ base\ \:= +ok= +password\ \:= Added: trunk/mapstoragemanagerarch/src/main/resources/i18n/mapstoragemanagerarch-fr_FR.properties =================================================================== --- trunk/mapstoragemanagerarch/src/main/resources/i18n/mapstoragemanagerarch-fr_FR.properties (rev 0) +++ trunk/mapstoragemanagerarch/src/main/resources/i18n/mapstoragemanagerarch-fr_FR.properties 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,32 @@ +Map\ Storage\ Manager= +TABLE\ NAME\ \:\ TODO= +login\ \:= +mapstoragemanager.action.aboutUs= +mapstoragemanager.action.aboutUs.tip= +mapstoragemanager.action.connect= +mapstoragemanager.action.connect.tip= +mapstoragemanager.action.disconnect= +mapstoragemanager.action.disconnect.tip= +mapstoragemanager.action.edit= +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit= +mapstoragemanager.action.exit.tip= +mapstoragemanager.action.file= +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr= +mapstoragemanager.action.fr.tip= +mapstoragemanager.action.help= +mapstoragemanager.action.help.tip= +mapstoragemanager.action.language= +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp= +mapstoragemanager.action.menuHelp.tip= +mapstoragemanager.action.preferences= +mapstoragemanager.action.preferences.tip= +mapstoragemanager.action.uk= +mapstoragemanager.action.uk.tip= +mapstoragemanager.action.visitSite= +mapstoragemanager.action.visitSite.tip= +name\ base\ \:= +ok= +password\ \:= Added: trunk/mapstoragemanagerarch/src/main/resources/log4j.properties =================================================================== --- trunk/mapstoragemanagerarch/src/main/resources/log4j.properties (rev 0) +++ trunk/mapstoragemanagerarch/src/main/resources/log4j.properties 2010-02-06 22:29:39 UTC (rev 53) @@ -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 Added: trunk/mapstoragemanagerarch/src/site/doc/bigtable/HowToHbase.rst =================================================================== --- trunk/mapstoragemanagerarch/src/site/doc/bigtable/HowToHbase.rst (rev 0) +++ trunk/mapstoragemanagerarch/src/site/doc/bigtable/HowToHbase.rst 2010-02-06 22:29:39 UTC (rev 53) @@ -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/mapstoragemanagerarch/src/site/doc/bigtable/analyseBT.rst =================================================================== --- trunk/mapstoragemanagerarch/src/site/doc/bigtable/analyseBT.rst (rev 0) +++ trunk/mapstoragemanagerarch/src/site/doc/bigtable/analyseBT.rst 2010-02-06 22:29:39 UTC (rev 53) @@ -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/mapstoragemanagerarch/src/site/doc/bigtable/bigTable.pdf =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/src/site/doc/bigtable/bigTable.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/src/site/doc/bigtable/hbase-files.png =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/src/site/doc/bigtable/hbase-files.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/src/site/doc/bigtable/projetHBase.rst =================================================================== --- trunk/mapstoragemanagerarch/src/site/doc/bigtable/projetHBase.rst (rev 0) +++ trunk/mapstoragemanagerarch/src/site/doc/bigtable/projetHBase.rst 2010-02-06 22:29:39 UTC (rev 53) @@ -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 + + + + Added: trunk/mapstoragemanagerarch/src/site/reports/week3.rst =================================================================== --- trunk/mapstoragemanagerarch/src/site/reports/week3.rst (rev 0) +++ trunk/mapstoragemanagerarch/src/site/reports/week3.rst 2010-02-06 22:29:39 UTC (rev 53) @@ -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. + + + + + + + + Added: trunk/mapstoragemanagerarch/src/site/reports/week4.rst =================================================================== --- trunk/mapstoragemanagerarch/src/site/reports/week4.rst (rev 0) +++ trunk/mapstoragemanagerarch/src/site/reports/week4.rst 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,11 @@ + + This week + ========== + - Creation of a new interface BigTable. + - Developpment of the plugin BigHashMap, an implementation of the BigTable specification with HashMap. + - Upgrade of the ui with jaxx. + - Meeting with Code Lutin about jaxx. + + + Next week + ========= Added: trunk/mapstoragemanagerarch/src/site/reports/week5.rst =================================================================== --- trunk/mapstoragemanagerarch/src/site/reports/week5.rst (rev 0) +++ trunk/mapstoragemanagerarch/src/site/reports/week5.rst 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,16 @@ + + This week + ========== + - Meeting with Benjamin Poussin. + - we note differents problems with the plugins BigHashMap : + - hashcode.. + - equals.. + + + Next week + ========= + - we must separate the project into subprojects maven modular : + - one sub-project for the MSM's architecture + - one sub-project for each plugin. + - one project which contain all subproject. + link : http://matthieu-lux.developpez.com/tutoriels/java/maven/?page=modules \ No newline at end of file Added: trunk/mapstoragemanagerarch/src/test/java/org/nuiton/mapstoragemanager/core/BigTableLoaderTest.java =================================================================== --- trunk/mapstoragemanagerarch/src/test/java/org/nuiton/mapstoragemanager/core/BigTableLoaderTest.java (rev 0) +++ trunk/mapstoragemanagerarch/src/test/java/org/nuiton/mapstoragemanager/core/BigTableLoaderTest.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,67 @@ +package org.nuiton.mapstoragemanager.core; + +import java.net.MalformedURLException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * Created: 28 janv. 2010 + * + * @author fdesbois + * @version $Revision: 36 $ + * + * Mise a jour: $Date: 2010-01-28 22:02:49 +0100 (jeu., 28 janv. 2010) $ + * par : $Author$ + */ +public class BigTableLoaderTest { + + private static final Log log = LogFactory.getLog(BigTableLoaderTest.class); + + public BigTableLoaderTest() { + } + + @BeforeClass + public static void setUpClass() throws Exception { + } + + @AfterClass + public static void tearDownClass() throws Exception { + } + + @Before + public void setUp() { + } + + @After + public void tearDown() { + } + + /** + * Test of getBigTable method, of class BigTableLoader. + * @throws MalformedURLException + */ + @Test + public void testGetBigTable() throws MalformedURLException { + log.info("getBigTable"); + //BigTableLoader p = new BigTableLoader("plugins", this.getClass().getClassLoader()); + + // FIXME-FD20100128 NPE : + // java.lang.NullPointerException at org.nuiton.mapstoragemanager.core.BigTableLoader.<init>(BigTableLoader.java:34) + + //Assert.assertNotNull(p.getBigTable()); + } + + /** + * Test of getBigTableSetLoader method, of class BigTableLoader. + */ + //@Test + public void testGetBigTableSetLoader() { + log.info("getBigTableSetLoader"); + } +} Added: trunk/mapstoragemanagerarch/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java =================================================================== --- trunk/mapstoragemanagerarch/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java (rev 0) +++ trunk/mapstoragemanagerarch/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,182 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +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 { + + private static final Log log = LogFactory.getLog(CellTest.class); + private Cell<Object> cellActual; + private Cell<Object> cell2Actual; + private Object objectExcepted; + private Object object2Excepted; + private Object object3Excepted; + + /** + * On teste le comportement de get avec une cellule vide. + */ + public void testGetVoid() { + cellActual = new CellImpl<Object>(); + try { + assertNull(cellActual.get()); + Assert.fail(); + } catch (NoSuchElementException e) { + log.info("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() { + + cellActual = new CellImpl<Object>(); + + objectExcepted = new Object(); + + try { + assertNull(cellActual.get()); + Assert.fail(); + } catch (NoSuchElementException e) { + log.info("Exception levée correctement"); + } + cellActual.put(objectExcepted); + + assertEquals(cellActual.get(), objectExcepted); + } + + /** + * 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() { + + cellActual = new CellImpl<Object>(); + + objectExcepted = new Object(); + + try { + assertNull(cellActual.get()); + Assert.fail(); + } catch (NoSuchElementException e) { + log.info("Exception levée correctement"); + } + cellActual.put(objectExcepted); + + assertEquals(cellActual.get(), objectExcepted); + + object2Excepted = new Object(); + + cellActual.put(object2Excepted); + + assertEquals(cellActual.get(), object2Excepted); + + object3Excepted = new Object(); + + cellActual.put(object3Excepted); + + assertEquals(cellActual.get(), object3Excepted); + } + + /** + * We make two cells with the same objects, and we verify that they are + * equals. + */ + public void testEquals() { + + /** + * We create two cells. + */ + cellActual = new CellImpl<Object>(); + cell2Actual = new CellImpl<Object>(); + assertEquals(cellActual, cell2Actual); + + objectExcepted = new Integer(10); + + /** + * We put one item in the first Cell, and not in the second. + */ + cellActual.put(objectExcepted); + assertNotSame(cellActual, cell2Actual); + + /** + * We put the same object in the second cell. + */ + cell2Actual.put(objectExcepted); + assertEquals(cellActual, cell2Actual); + } + + /** + * We make two cells with the same objects, and we verify that thay have + * the same hashCode. + */ + public void testHashCode() { + + /** + * We create two cells. + */ + cellActual = new CellImpl<Object>(); + cell2Actual = new CellImpl<Object>(); + assertEquals(cellActual.hashCode(), cell2Actual.hashCode()); + + objectExcepted = new Integer(10); + + /** + * We put one item in the first Cell, and not in the second. + */ + cellActual.put(objectExcepted); + assertNotSame(cellActual.hashCode(), cell2Actual.hashCode()); + + /** + * We put the same object in the second cell. + */ + cell2Actual.put(objectExcepted); + assertEquals(cellActual.hashCode(), cell2Actual.hashCode()); + } + + /** + * we test that toString do what we want. + */ + public void testToString() { + + /** + * We create one cell and werify that toString equals "" when the cell + * is empty. + */ + cellActual = new CellImpl<Object>(); + assertEquals(cellActual.toString(), ""); + + /** + * We create and put one object Integer(1337) and control that + * toString() equals "1337" + */ + objectExcepted = new Integer(1337); + cellActual.put(objectExcepted); + assertEquals(cellActual.toString(), objectExcepted.toString()); + assertEquals(cellActual.toString(), "1337"); + + /** + * We create and put another object String("String for testing") and + * control that toString() equals "String for testing". + */ + objectExcepted = new String("String for testing"); + cellActual.put(objectExcepted); + assertEquals(cellActual.toString(), objectExcepted.toString()); + assertEquals(cellActual.toString(), "String for testing"); + } +} Added: trunk/mapstoragemanagerarch/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java =================================================================== --- trunk/mapstoragemanagerarch/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java (rev 0) +++ trunk/mapstoragemanagerarch/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,269 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import junit.framework.Assert; +import junit.framework.TestCase; + +public final class ColumnTest extends TestCase { + + private static final Log log = LogFactory.getLog(ColumnTest.class); + private Column columnActual; + private Column column2Actual; + private Object expected; + private Object expected2; + + /** + * We test column when empty. + */ + public void testGetVoid() { + columnActual = new ColumnImpl<Object>(); + try { + columnActual.get("test"); + Assert.fail(); + } catch (NoSuchElementException e) { + log.info("Exception levée correctement"); + } + } + + /** + * We put one object and we try to get it. + */ + public void testPutAndGet() { + columnActual = new ColumnImpl<Object>(); + + expected = new Object(); + + try { + columnActual.get("object 1"); + Assert.fail(); + } catch (NoSuchElementException e) { + log.info("Exception levée correctement"); + } + + columnActual.put("object 1", expected); + + assertEquals(columnActual.get("object 1"), expected); + + } + + /** + * We put two object, we verify that they are in the column. + * Then, we try to remove them. + */ + public void testDelete() { + columnActual = new ColumnImpl<Integer>(); + + expected = new Integer(1); + expected2 = new Integer(2); + + columnActual.put("integer 1", expected); + columnActual.put("integer 2", expected2); + + assertEquals(columnActual.get("integer 1"), expected); + assertEquals(columnActual.get("integer 2"), expected2); + + /** + * Now we try to remove integer 1. + */ + columnActual.delete("integer 1"); + try{ + columnActual.get("integer 1"); + Assert.fail(); + } catch (NoSuchElementException e) { + log.info("Exception levée correctement."); + } + assertEquals(columnActual.get("integer 2"), expected2); + + /** + * Finally, we try to remove integer 2. + */ + columnActual.delete("integer 2"); + try{ + columnActual.get("integer 2"); + Assert.fail(); + } catch (NoSuchElementException e) { + log.info("Exception levée correctement."); + } + } + + /** + * testhashCode(). + */ + public void testHashCode() { + + int hashCodeSum = 0; + Object toStore; + + /** + * We create a new column and verify that hashCode is 0. + */ + columnActual = new ColumnImpl<Integer>(); + assertEquals(columnActual.hashCode(), 0); + + /** + * We put a Integer(10) and control that hashCode is already ok. + */ + toStore = new Integer(10); + columnActual.put("key1", toStore); + hashCodeSum += toStore.hashCode(); + assertEquals(columnActual.hashCode(), hashCodeSum); + + toStore = new String("peanuts"); + columnActual.put("key2", toStore); + hashCodeSum += toStore.hashCode(); + assertEquals(columnActual.hashCode(), hashCodeSum); + } + + /** + * testEquals(). + */ + public void testEquals() { + + /** + * We create two columns. + */ + columnActual = new ColumnImpl<Object>(); + column2Actual = new ColumnImpl<Object>(); + assertEquals(columnActual, column2Actual); + + /** + * We put one object in the first column, and not in the second. + */ + expected = new Integer(10); + columnActual.put("key1",expected); + assertNotSame(columnActual, column2Actual); + + /** + * We put the same object in the second column at the same key. + */ + column2Actual.put("key1",expected); + assertEquals(columnActual, column2Actual); + + /** + * We put the same object in the two column but at a different key. + */ + expected2 = new String("Tomatoes"); + columnActual.put("key2",expected2); + column2Actual.put("key3",expected2); + assertNotSame(columnActual, column2Actual); + } + + /** + * We test the method toString() on Column. + */ + public void testToString() { + + Object toStore, toStore2; + Map<String,Object> columnContent; + String toStringExpected; + /** + * We create one columns. + */ + columnActual = new ColumnImpl<Object>(); + columnContent = new HashMap<String, Object>(); + toStringExpected = new String(); + for (String key : columnContent.keySet()) { + toStringExpected += key + "\t" + columnContent.get(key).toString(); + } + assertEquals(columnActual.toString(), toStringExpected); + + /** + * We put one object in the column. + */ + toStore = new Integer(10); + columnActual.put("key1", toStore); + columnContent.put("key1", toStore); + toStringExpected = new String(); + for (String key : columnContent.keySet()) { + toStringExpected += key + "\t" + columnContent.get(key).toString(); + } + assertEquals(columnActual.toString(), toStringExpected); + + /** + * We put another object in the column. + */ + toStore2 = new String("yahoo !"); + columnActual.put("key2", toStore2); + columnContent.put("key2", toStore2); + toStringExpected = new String(); + for (String key : columnContent.keySet()) { + toStringExpected += key + "\t" + columnContent.get(key).toString(); + } + assertEquals(columnActual.toString(), toStringExpected); + } + + /** + * We put objects in the columns and we get the keys. + * We compare with the key set attempt. + */ + public void testGetKeys(){ + + columnActual = new ColumnImpl<Object>(); + + Set<String> expectedSet = new HashSet<String>(); + + /** + * We put object, we and verify that the keySet returned is good. + */ + columnActual.put("obj1", new Object()); + expectedSet.add("obj1"); + assertEquals(expectedSet, columnActual.getKeys()); + + columnActual.put("obj2", new Object()); + expectedSet.add("obj2"); + assertEquals(expectedSet, columnActual.getKeys()); + + columnActual.put("obj3", new Object()); + expectedSet.add("obj3"); + assertEquals(expectedSet, columnActual.getKeys()); + + columnActual.put("obj4", new Object()); + expectedSet.add("obj4"); + assertEquals(expectedSet, columnActual.getKeys()); + + columnActual.put("obj5", new Object()); + expectedSet.add("obj5"); + assertEquals(expectedSet, columnActual.getKeys()); + + /** + * We try to add already exist key. + */ + columnActual.put("obj5", new Object()); + expectedSet.add("obj5"); + assertEquals(expectedSet, columnActual.getKeys()); + + /** + * Now, we will remove object by their keys, and we verify the keySet. + */ + columnActual.delete("obj1"); + expectedSet.remove("obj1"); + assertEquals(expectedSet, columnActual.getKeys()); + + columnActual.delete("obj3"); + expectedSet.remove("obj3"); + assertEquals(expectedSet, columnActual.getKeys()); + + columnActual.delete("obj5"); + expectedSet.remove("obj5"); + assertEquals(expectedSet, columnActual.getKeys()); + + /** + * We try to remove no exist keys : + */ + columnActual.delete("obj6"); + expectedSet.remove("obj6"); + assertEquals(expectedSet, columnActual.getKeys()); + + } +} Added: trunk/mapstoragemanagerarch/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowTest.java =================================================================== --- trunk/mapstoragemanagerarch/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowTest.java (rev 0) +++ trunk/mapstoragemanagerarch/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowTest.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,153 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.Map; +import junit.framework.TestCase; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +public class RowTest extends TestCase { + + private static final Log log = LogFactory.getLog(RowTest.class); + private Structure structureExpected; + private Map<String, Object> contentExpected; + private Row rowActual; + + public void testToString() { + { + structureExpected = new StructureImpl(); + contentExpected = new HashMap<String, Object>(); + rowActual = new RowImpl(structureExpected, contentExpected); + + assertEquals(rowActual.toString(), contentExpected.values().toString()); + } + + { + structureExpected = new StructureImpl(); + structureExpected.createColumn("Test", String.class); + contentExpected = new HashMap<String, Object>(); + contentExpected.put("Test", "StringDeTest"); + rowActual = new RowImpl(structureExpected, contentExpected); + + assertEquals(rowActual.toString(), contentExpected.values().toString()); + } + + { + structureExpected = new StructureImpl(); + structureExpected.createColumn("Test1", String.class); + structureExpected.createColumn("Test2", Integer.class); + structureExpected.createColumn("Test3", Double.class); + contentExpected = new HashMap<String, Object>(); + contentExpected.put("Test1", "StringDeTest"); + contentExpected.put("Test2", new Integer(1)); + contentExpected.put("Test3", new Double(0.07)); + rowActual = new RowImpl(structureExpected, contentExpected); + + assertEquals(rowActual.toString(), contentExpected.values().toString()); + } + } + + public void testGetRowContent() { + { + structureExpected = new StructureImpl(); + contentExpected = new HashMap<String, Object>(); + rowActual = new RowImpl(structureExpected, contentExpected); + + assertEquals(rowActual.getRowContent(), contentExpected); + } + + { + structureExpected = new StructureImpl(); + structureExpected.createColumn("Test", String.class); + contentExpected = new HashMap<String, Object>(); + contentExpected.put("Test", "StringDeTest"); + rowActual = new RowImpl(structureExpected, contentExpected); + + assertEquals(rowActual.getRowContent(), contentExpected); + } + + { + structureExpected = new StructureImpl(); + structureExpected.createColumn("Test1", String.class); + structureExpected.createColumn("Test2", Integer.class); + structureExpected.createColumn("Test3", Double.class); + contentExpected = new HashMap<String, Object>(); + contentExpected.put("Test1", "StringDeTest"); + contentExpected.put("Test2", new Integer(1)); + contentExpected.put("Test3", new Double(0.07)); + rowActual = new RowImpl(structureExpected, contentExpected); + + assertEquals(rowActual.getRowContent(), contentExpected); + } + } + + public void testGetRowStructure() { + { + structureExpected = new StructureImpl(); + contentExpected = new HashMap<String, Object>(); + rowActual = new RowImpl(structureExpected, contentExpected); + + assertEquals(rowActual.getRowStructure(), structureExpected); + } + + { + structureExpected = new StructureImpl(); + structureExpected.createColumn("Test", String.class); + contentExpected = new HashMap<String, Object>(); + contentExpected.put("Test", "StringDeTest"); + rowActual = new RowImpl(structureExpected, contentExpected); + + assertEquals(rowActual.getRowStructure(), structureExpected); + } + + { + structureExpected = new StructureImpl(); + structureExpected.createColumn("Test1", String.class); + structureExpected.createColumn("Test2", Integer.class); + structureExpected.createColumn("Test3", Double.class); + contentExpected = new HashMap<String, Object>(); + contentExpected.put("Test1", "StringDeTest"); + contentExpected.put("Test2", new Integer(1)); + contentExpected.put("Test3", new Double(0.07)); + rowActual = new RowImpl(structureExpected, contentExpected); + + assertEquals(rowActual.getRowStructure(), structureExpected); + } + } + + public void testGetContent() { + { + structureExpected = new StructureImpl(); + contentExpected = new HashMap<String, Object>(); + rowActual = new RowImpl(structureExpected, contentExpected); + + assertEquals(rowActual.getContent(""), null); + } + + { + structureExpected = new StructureImpl(); + structureExpected.createColumn("Test", String.class); + contentExpected = new HashMap<String, Object>(); + contentExpected.put("Test", "StringDeTest"); + rowActual = new RowImpl(structureExpected, contentExpected); + + assertEquals(rowActual.getContent("Test"), "StringDeTest"); + } + + { + structureExpected = new StructureImpl(); + structureExpected.createColumn("Test1", String.class); + structureExpected.createColumn("Test2", Integer.class); + structureExpected.createColumn("Test3", Double.class); + contentExpected = new HashMap<String, Object>(); + contentExpected.put("Test1", "StringDeTest"); + contentExpected.put("Test2", new Integer(1)); + contentExpected.put("Test3", new Double(0.07)); + rowActual = new RowImpl(structureExpected, contentExpected); + + assertEquals(rowActual.getContent("Test1"), "StringDeTest"); + assertEquals(rowActual.getContent("Test2"), new Integer(1)); + assertEquals(rowActual.getContent("Test3"), new Double(0.07)); + } + } +} Added: trunk/mapstoragemanagerarch/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java =================================================================== --- trunk/mapstoragemanagerarch/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java (rev 0) +++ trunk/mapstoragemanagerarch/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,335 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; + +import junit.framework.TestCase; +import org.apache.commons.logging.LogFactory; +import org.apache.commons.logging.Log; + +public class StructureTest extends TestCase { + + private static final Log log = LogFactory.getLog(StructureTest.class); + private Structure structureActual; + private Map<String, Class<?>> structureContentActual; + private Map<String, Class<?>> structureContentExpected; + private Class<?> columnsClassActual; + private Class<?> columnsClassExpected; + private Set<String> columnsNamesActual; + private Set<String> columnsNamesExpected; + + public void testGetColumnsNamesVoid() { + structureActual = new StructureImpl(); + Set<String> columnNames = structureActual.getColumnsNames(); + assertEquals(0, columnNames.size()); + } + + /** + * we add a column with name and class. + * We use reflexivity to verify that the map of the structure is like we + * want. + */ + public void testAddColumn() { + + structureContentExpected = new HashMap<String, Class<?>>(); + + try { + structureActual = new StructureImpl(); + + Field fStructure = structureActual.getClass().getDeclaredField("structure"); + fStructure.setAccessible(true); + Map<String, Class<?>> structureContentActual = + (Map<String, Class<?>>) fStructure.get(structureActual); + + + structureActual.createColumn("Test1", String.class); + structureContentExpected.put("Test1", String.class); + assertEquals(structureContentExpected, structureContentActual); + + structureActual.createColumn("Test2", Object.class); + structureContentExpected.put("Test2", Object.class); + assertEquals(structureContentExpected, structureContentActual); + + structureActual.createColumn("Test3", Map.class); + structureContentExpected.put("Test3", Map.class); + assertEquals(structureContentExpected, structureContentActual); + + } catch (IllegalArgumentException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (IllegalAccessException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (NoSuchFieldException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (SecurityException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } + } + + /** + * we add a column with name and class. + * We use reflexivity to verify that the map of the structure is like we + * want. + * We remove column, and we continue to verify that the map of the structure + * is always good. + */ + public void testRemoveColumn() { + + structureContentExpected = new HashMap<String, Class<?>>(); + + try { + structureActual = new StructureImpl(); + + Field fStructure = structureActual.getClass().getDeclaredField("structure"); + fStructure.setAccessible(true); + Map<String, Class<?>> structureContentActual = + (Map<String, Class<?>>) fStructure.get(structureActual); + + + structureActual.createColumn("Test1", String.class); + structureContentExpected.put("Test1", String.class); + structureActual.createColumn("Test2", Object.class); + structureContentExpected.put("Test2", Object.class); + structureActual.createColumn("Test3", Map.class); + structureContentExpected.put("Test3", Map.class); + assertEquals(structureContentExpected, structureContentActual); + + structureActual.deleteColumn("Test1"); + structureContentExpected.remove("Test1"); + assertEquals(structureContentExpected, structureContentActual); + + /** + * the key "Test1TOTO" is not in the structure. + */ + structureActual.deleteColumn("Test1TOTO"); + structureContentExpected.remove("Test1TOTO"); + assertEquals(structureContentExpected, structureContentActual); + + structureActual.deleteColumn("Test2"); + structureContentExpected.remove("Test2"); + assertEquals(structureContentExpected, structureContentActual); + + structureActual.deleteColumn("Test3"); + structureContentExpected.remove("Test3"); + assertEquals(structureContentExpected, structureContentActual); + + /** + * We try to remove an other key, but the map is empty. + */ + structureActual.deleteColumn("Test4"); + structureContentExpected.remove("Test4"); + + assertEquals(structureContentExpected, structureContentActual); + + + } catch (IllegalArgumentException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (IllegalAccessException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (NoSuchFieldException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (SecurityException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } + } + + /** + * we add a column with name and class. + * We use reflexivity to verify that the columsNames returned are goods. + * We remove column, and we continue to verify that the columsNames is + * always good. + */ + public void testGetColumnsNames() { + + structureActual = new StructureImpl(); + + columnsNamesExpected = new HashSet<String>(); + columnsNamesActual = structureActual.getColumnsNames(); + + + structureActual.createColumn("Test1", String.class); + columnsNamesExpected.add("Test1"); + assertEquals(columnsNamesExpected, columnsNamesActual); + + structureActual.createColumn("Test2", Object.class); + columnsNamesExpected.add("Test2"); + assertEquals(columnsNamesExpected, columnsNamesActual); + + structureActual.createColumn("Test3", Map.class); + columnsNamesExpected.add("Test3"); + assertEquals(columnsNamesExpected, columnsNamesActual); + + structureActual.deleteColumn("Test1"); + columnsNamesExpected.remove("Test1"); + assertEquals(columnsNamesExpected, columnsNamesActual); + + /** + * the key "Test1TOTO" is not in the structure. + */ + structureActual.deleteColumn("Test1TOTO"); + columnsNamesExpected.remove("Test1TOTO"); + assertEquals(columnsNamesExpected, columnsNamesActual); + + structureActual.deleteColumn("Test2"); + columnsNamesExpected.remove("Test2"); + assertEquals(columnsNamesExpected, columnsNamesActual); + + structureActual.deleteColumn("Test3"); + columnsNamesExpected.remove("Test3"); + assertEquals(columnsNamesExpected, columnsNamesActual); + + /** + * We try to remove an other key, but the map is empty. + */ + structureActual.deleteColumn("Test4"); + columnsNamesExpected.remove("Test4"); + + assertEquals(columnsNamesExpected, columnsNamesActual); + + } + + /** + * we add a column with name and class. + * We use reflexivity to verify that the columsNames returned are goods. + * We remove column, and we continue to verify that the columsNames is + * always good. + */ + public void testGetColumnClass() { + + structureActual = new StructureImpl(); + +// columnsClassExpected; +// columnsClassActual; + + + /** + * We put "Test1" + */ + structureActual.createColumn("Test1", String.class); + columnsClassActual = structureActual.getColumnClass("Test1"); + columnsClassExpected = String.class; + assertEquals(columnsClassExpected, columnsClassActual); + + /** + * We put "Test2" + */ + structureActual.createColumn("Test2", Object.class); + columnsClassActual = structureActual.getColumnClass("Test1"); + columnsClassExpected = String.class; + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = structureActual.getColumnClass("Test2"); + columnsClassExpected = Object.class; + assertEquals(columnsClassExpected, columnsClassActual); + + /** + * We put "Test3" + */ + structureActual.createColumn("Test3", Map.class); + columnsClassActual = structureActual.getColumnClass("Test1"); + columnsClassExpected = String.class; + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = structureActual.getColumnClass("Test2"); + columnsClassExpected = Object.class; + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = structureActual.getColumnClass("Test3"); + columnsClassExpected = Map.class; + assertEquals(columnsClassExpected, columnsClassActual); + + /** + * we remove "Test1" + */ + structureActual.deleteColumn("Test1"); + columnsClassActual = structureActual.getColumnClass("Test1"); + columnsClassExpected = null; + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = structureActual.getColumnClass("Test2"); + columnsClassExpected = Object.class; + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = structureActual.getColumnClass("Test3"); + columnsClassExpected = Map.class; + assertEquals(columnsClassExpected, columnsClassActual); + + /** + * the key "Test1TOTO" is not in the structure. + * We try to remove it. + */ + structureActual.deleteColumn("Test1TOTO"); + columnsClassActual = structureActual.getColumnClass("Test1TOTO"); + columnsClassExpected = null; + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = structureActual.getColumnClass("Test2"); + columnsClassExpected = Object.class; + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = structureActual.getColumnClass("Test3"); + columnsClassExpected = Map.class; + assertEquals(columnsClassExpected, columnsClassActual); + + /** + * We remove "Test2" + */ + structureActual.deleteColumn("Test2"); + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = structureActual.getColumnClass("Test2"); + columnsClassExpected = null; + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = structureActual.getColumnClass("Test3"); + columnsClassExpected = Map.class; + assertEquals(columnsClassExpected, columnsClassActual); + + /** + * We remove "Test3" + */ + structureActual.deleteColumn("Test3"); + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = structureActual.getColumnClass("Test3"); + columnsClassExpected = null; + assertEquals(columnsClassExpected, columnsClassActual); + + /** + * We try to remove an other key, but the map is empty. + */ + structureActual.deleteColumn("Test4"); + columnsClassActual = structureActual.getColumnClass("Test4"); + columnsClassExpected = null; + + assertEquals(columnsClassExpected, columnsClassActual); + + } + + /** + * we create and delete columns. + * we calculate hashcode and compare to hashCode(). + */ + public void testHashCode() { + + structureActual = new StructureImpl(); + int hashCodeExpected = 0; + assertEquals(structureActual.hashCode(), hashCodeExpected); + + /** + * We create column "Test1" + */ + structureActual.createColumn("Test1", String.class); + hashCodeExpected += "Test1".hashCode() + String.class.hashCode(); + assertEquals(structureActual.hashCode(), hashCodeExpected); + + /** + * We create column "Test2" + */ + structureActual.createColumn("Test2", Integer.class); + hashCodeExpected += "Test2".hashCode() + Integer.class.hashCode(); + assertEquals(structureActual.hashCode(), hashCodeExpected); + + /** + * We delete column "Test1" + */ + structureActual.deleteColumn("Test1"); + hashCodeExpected -= "Test1".hashCode() + String.class.hashCode(); + assertEquals(structureActual.hashCode(), hashCodeExpected); + + } +} Added: trunk/mapstoragemanagerarch/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java =================================================================== --- trunk/mapstoragemanagerarch/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java (rev 0) +++ trunk/mapstoragemanagerarch/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,498 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; +import junit.framework.Assert; +import junit.framework.TestCase; +import org.apache.commons.logging.LogFactory; +import org.apache.commons.logging.Log; + +/** + * + * @author Dorian Langlais + */ +public class TableTest extends TestCase { + + private static final Log log = LogFactory.getLog(TableTest.class); + + private Table tableActual; + private Structure tableStructureActual; + private HashMap<String, Column<?>> tableColumnsActual; + private Structure tableStructureExpected; + private HashMap<String, Column<?>> tableColumnsExpected; + + /** + * We create a new table and we verify that the fields are correctly + * initialized. + */ + public void testNewTable() { + + tableActual = new TableImpl(); + + tableStructureExpected = new StructureImpl(); + tableColumnsExpected = new HashMap<String, Column<?>>(); + + try { + Field fTableStructure = + tableActual.getClass().getDeclaredField("tableStructure"); + Field fTablecolumns = + tableActual.getClass().getDeclaredField("tableColumns"); + fTableStructure.setAccessible(true); + fTablecolumns.setAccessible(true); + tableStructureActual = (Structure) fTableStructure.get(tableActual); + tableColumnsActual = (HashMap<String, Column<?>>) fTablecolumns.get(tableActual); + + assertEquals(tableStructureActual, tableStructureExpected); + assertEquals(tableColumnsActual, tableColumnsExpected); + + } catch (IllegalArgumentException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (IllegalAccessException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (NoSuchFieldException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (SecurityException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } + + } + + /** + * We create columns and we verify that they are actually in the table and + * in the structure of the table. + */ + public void testCreateColumn() { + + tableActual = new TableImpl(); + + tableStructureExpected = new StructureImpl(); + tableColumnsExpected = new HashMap<String, Column<?>>(); + + try { + Field fTableStructure = + tableActual.getClass().getDeclaredField("tableStructure"); + Field fTablecolumns = + tableActual.getClass().getDeclaredField("tableColumns"); + fTableStructure.setAccessible(true); + fTablecolumns.setAccessible(true); + tableStructureActual = (Structure) fTableStructure.get(tableActual); + tableColumnsActual = (HashMap<String, Column<?>>) fTablecolumns.get(tableActual); + + /** + * We add one column. + */ + tableActual.createColumn("Test1", String.class); + tableStructureExpected.createColumn("Test1", String.class); + tableColumnsExpected.put("Test1", new ColumnImpl<String>()); + + assertEquals(tableStructureActual, tableStructureExpected); + assertEquals(tableColumnsActual, tableColumnsExpected); + + /** + * We add another column. + */ + tableActual.createColumn("Test2", Map.class); + tableStructureExpected.createColumn("Test2", Map.class); + tableColumnsExpected.put("Test2", new ColumnImpl<Map>()); + + assertEquals(tableStructureActual, tableStructureExpected); + assertEquals(tableColumnsActual, tableColumnsExpected); + + /** + * add an already existing column has no effect. + */ + tableActual.createColumn("Test1", String.class); + + assertEquals(tableStructureActual, tableStructureExpected); + assertEquals(tableColumnsActual, tableColumnsExpected); + + } catch (IllegalArgumentException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (IllegalAccessException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (NoSuchFieldException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (SecurityException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } + + } + + /** + * We create some columns and remove them. + * After add them, we verify that the are actually in the table and in the + * structure. + * The we remove them one by one, and we verify that they are really removed + * of the table and of the structure. + */ + public void testRemoveColumn() { + + tableActual = new TableImpl(); + + tableStructureExpected = new StructureImpl(); + tableColumnsExpected = new HashMap<String, Column<?>>(); + + try { + Field fTableStructure = + tableActual.getClass().getDeclaredField("tableStructure"); + Field fTablecolumns = + tableActual.getClass().getDeclaredField("tableColumns"); + fTableStructure.setAccessible(true); + fTablecolumns.setAccessible(true); + tableStructureActual = (Structure) fTableStructure.get(tableActual); + tableColumnsActual = (HashMap<String, Column<?>>) fTablecolumns.get(tableActual); + + /** + * We add two columns. + */ + tableActual.createColumn("Test1", String.class); + tableStructureExpected.createColumn("Test1", String.class); + tableColumnsExpected.put("Test1", new ColumnImpl<String>()); + tableActual.createColumn("Test2", Map.class); + tableStructureExpected.createColumn("Test2", Map.class); + tableColumnsExpected.put("Test2", new ColumnImpl<Map>()); + + assertEquals(tableStructureActual, tableStructureExpected); + assertEquals(tableColumnsActual, tableColumnsExpected); + + /** + * We try to remove a column. + */ + tableActual.deleteColumn("Test1"); + tableStructureExpected.deleteColumn("Test1"); + tableColumnsExpected.remove("Test1"); + + assertEquals(tableStructureActual, tableStructureExpected); + assertEquals(tableColumnsActual, tableColumnsExpected); + + /** + * We try to remove another column. + */ + tableActual.deleteColumn("Test2"); + tableStructureExpected.deleteColumn("Test2"); + tableColumnsExpected.remove("Test2"); + + assertEquals(tableStructureActual, tableStructureExpected); + assertEquals(tableColumnsActual, tableColumnsExpected); + + + } catch (IllegalArgumentException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (IllegalAccessException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (NoSuchFieldException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (SecurityException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } + + } + + /** + * We create a new Table, with two columns. + * We put objects in this columns and we use reflexivity to verify that + * objects are really stored in the table. + */ + public void testPut() { + + /** + * We create object to put + */ + String expectedString1 = new String("string1"); + String expectedString2 = new String("string2"); + Integer expectedInteger1 = new Integer(1); + Integer expectedInteger2 = new Integer(2); + /** + * We create the table and columns. + */ + tableActual = new TableImpl(); + tableActual.createColumn("String", String.class); + tableActual.createColumn("Integer", Integer.class); + /** + * We put objects in the table. + */ + tableActual.put("String", "string1", expectedString1); + tableActual.put("String", "string2", expectedString2); + tableActual.put("Integer", "integer1", expectedInteger1); + tableActual.put("Integer", "integer2", expectedInteger2); + + try { + /** + * We use reflexivity to verify that objects are really stored. + */ + Field fTableColumns = tableActual.getClass().getDeclaredField("tableColumns"); + fTableColumns.setAccessible(true); + Map<String, Column<?>> tableColumns = (Map<String, Column<?>>) fTableColumns.get(tableActual); + + assertEquals(expectedString1, tableColumns.get("String").get("string1")); + assertEquals(expectedString2, tableColumns.get("String").get("string2")); + assertEquals(expectedInteger1, tableColumns.get("Integer").get("integer1")); + assertEquals(expectedInteger2, tableColumns.get("Integer").get("integer2")); + + } catch (NoSuchFieldException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (SecurityException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (IllegalArgumentException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (IllegalAccessException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } + } + + /** + * We create a new Table, with two columns. + * We put objects in this columns and we try to get them. + */ + public void testGet() { + + /** + * We create object to put (and get) + */ + String expectedString1 = new String("string1"); + String expectedString2 = new String("string2"); + Integer expectedInteger1 = new Integer(1); + Integer expectedInteger2 = new Integer(2); + + /** + * We create the table and columns. + */ + tableActual = new TableImpl(); + tableActual.createColumn("String", String.class); + tableActual.createColumn("Integer", Integer.class); + + /** + * We put objects in the table. + */ + tableActual.put("String", "string1", expectedString1); + tableActual.put("String", "string2", expectedString2); + tableActual.put("Integer", "integer1", expectedInteger1); + tableActual.put("Integer", "integer2", expectedInteger2); + + /** + * We try to get them. + */ + assertEquals(expectedString1, tableActual.get("String", "string1")); + assertEquals(expectedString2, tableActual.get("String", "string2")); + assertEquals(expectedInteger1, tableActual.get("Integer", "integer1")); + assertEquals(expectedInteger2, tableActual.get("Integer", "integer2")); + } + + /** + * We create a new Table, with two columns. + * We put objects in this columns and we try to get it. + */ + public void testPutAndGetWithVersion() { + + /** + * We create object to put (and get). + */ + String expectedString1 = new String("string1"); + String expectedString2 = new String("string2"); + Integer expectedInteger1 = new Integer(1); + Integer expectedInteger2 = new Integer(2); + + /** + * We create the table and columns. + */ + tableActual = new TableImpl(); + tableActual.createColumn("String", String.class); + tableActual.createColumn("Integer", Integer.class); + + /** + * We put objects in the table. + */ + tableActual.put("String", "string1", expectedString1); + tableActual.put("String", "string2", expectedString2); + tableActual.put("Integer", "integer1", expectedInteger1); + tableActual.put("Integer", "integer2", expectedInteger2); + + /** + * We try to get them. + */ + assertEquals(expectedString1, tableActual.get("String", "string1")); + assertEquals(expectedString2, tableActual.get("String", "string2")); + assertEquals(expectedInteger1, tableActual.get("Integer", "integer1")); + assertEquals(expectedInteger2, tableActual.get("Integer", "integer2")); + + /** + * We try to get them with their version number. + */ + assertEquals(expectedString1, tableActual.get("String", "string1",0)); + assertEquals(expectedString2, tableActual.get("String", "string2",0)); + assertEquals(expectedInteger1, tableActual.get("Integer", "integer1",0)); + assertEquals(expectedInteger2, tableActual.get("Integer", "integer2",0)); + + /** + * We create new object to store in the table. + */ + String expectedString1v2 = new String("string1v2"); + String expectedString2v2 = new String("string2v2"); + Integer expectedInteger1v2 = new Integer(12); + Integer expectedInteger2v2 = new Integer(22); + + /** + * We put them in the table. + */ + tableActual.put("String", "string1", expectedString1v2); + tableActual.put("String", "string2", expectedString2v2); + tableActual.put("Integer", "integer1", expectedInteger1v2); + tableActual.put("Integer", "integer2", expectedInteger2v2); + + /** + * We try to get them by get() : normally we get the last version. + */ + assertEquals(expectedString1v2, tableActual.get("String", "string1")); + assertEquals(expectedString2v2, tableActual.get("String", "string2")); + assertEquals(expectedInteger1v2, tableActual.get("Integer", "integer1")); + assertEquals(expectedInteger2v2, tableActual.get("Integer", "integer2")); + + /** + * We try get the the first version. + */ + assertEquals(expectedString1, tableActual.get("String", "string1",0)); + assertEquals(expectedString2, tableActual.get("String", "string2",0)); + assertEquals(expectedInteger1, tableActual.get("Integer", "integer1",0)); + assertEquals(expectedInteger2, tableActual.get("Integer", "integer2",0)); + + /** + * We try to get the actual version by its version number. + */ + assertEquals(expectedString1v2, tableActual.get("String", "string1",1)); + assertEquals(expectedString2v2, tableActual.get("String", "string2",1)); + assertEquals(expectedInteger1v2, tableActual.get("Integer", "integer1",1)); + assertEquals(expectedInteger2v2, tableActual.get("Integer", "integer2",1)); + + } + + /** + * We pu object in the table and we verify that the ketset return is good. + */ + public void testGetKeys() { + + Set<String> keySet = new HashSet<String>(); + + /** + * We create object to put. + */ + String expectedString1 = new String("string1"); + String expectedString2 = new String("string2"); + Integer expectedInteger1 = new Integer(1); + Integer expectedInteger2 = new Integer(2); + + /** + * We create the table and columns. + */ + tableActual = new TableImpl(); + tableActual.createColumn("String", String.class); + tableActual.createColumn("Integer", Integer.class); + + /** + * We put objects in the table and their keys in the keySet. + */ + tableActual.put("String", "string1", expectedString1); + keySet.add("string1"); + assertEquals(keySet, tableActual.getKeys()); + + tableActual.put("String", "string2", expectedString2); + keySet.add("string2"); + assertEquals(keySet, tableActual.getKeys()); + + tableActual.put("Integer", "integer1", expectedInteger1); + keySet.add("integer1"); + assertEquals(keySet, tableActual.getKeys()); + + tableActual.put("Integer", "integer2", expectedInteger2); + keySet.add("integer2"); + assertEquals(keySet, tableActual.getKeys()); + } + + /** + * We create a new Table, with two columns. + * We put objects in this columns and we try to remove them. + */ + public void testDelete() { + + /** + * We create object to put (and get) + */ + String expectedString1 = new String("string1"); + String expectedString2 = new String("string2"); + Integer expectedInteger1 = new Integer(1); + Integer expectedInteger2 = new Integer(2); + + /** + * We create the table and columns. + */ + tableActual = new TableImpl(); + tableActual.createColumn("String", String.class); + tableActual.createColumn("Integer", Integer.class); + + /** + * We put objects in the table. + */ + tableActual.put("String", "string1", expectedString1); + tableActual.put("String", "string2", expectedString2); + tableActual.put("Integer", "integer1", expectedInteger1); + tableActual.put("Integer", "integer2", expectedInteger2); + + /** + * We try to get them. + */ + assertEquals(expectedString1, tableActual.get("String", "string1")); + assertEquals(expectedString2, tableActual.get("String", "string2")); + assertEquals(expectedInteger1, tableActual.get("Integer", "integer1")); + assertEquals(expectedInteger2, tableActual.get("Integer", "integer2")); + + /** + * Now, we will try to delete them. + */ + tableActual.deleteRow("string1"); + try{ + tableActual.get("String", "string1"); + Assert.fail(); + } catch (NoSuchElementException e) { + log.info("Exception levée correctement."); + } + assertEquals(expectedString2, tableActual.get("String", "string2")); + assertEquals(expectedInteger1, tableActual.get("Integer", "integer1")); + assertEquals(expectedInteger2, tableActual.get("Integer", "integer2")); + + tableActual.deleteRow("string2"); + try{ + tableActual.get("String", "string2"); + Assert.fail(); + } catch (NoSuchElementException e) { + log.info("Exception levée correctement."); + } + assertEquals(expectedInteger1, tableActual.get("Integer", "integer1")); + assertEquals(expectedInteger2, tableActual.get("Integer", "integer2")); + + tableActual.deleteRow("integer1"); + try{ + tableActual.get("Integer", "integer1"); + Assert.fail(); + } catch (NoSuchElementException e) { + log.info("Exception levée correctement."); + } + assertEquals(expectedInteger2, tableActual.get("Integer", "integer2")); + + tableActual.deleteRow("integer2"); + try{ + tableActual.get("Integer", "integer2"); + Assert.fail(); + } catch (NoSuchElementException e) { + log.info("Exception levée correctement."); + } + } +} Added: trunk/mapstoragemanagerarch/src/test/resources/log4j.properties =================================================================== --- trunk/mapstoragemanagerarch/src/test/resources/log4j.properties (rev 0) +++ trunk/mapstoragemanagerarch/src/test/resources/log4j.properties 2010-02-06 22:29:39 UTC (rev 53) @@ -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 Added: trunk/mapstoragemanagerarch/target/classes/BigTable.java =================================================================== --- trunk/mapstoragemanagerarch/target/classes/BigTable.java (rev 0) +++ trunk/mapstoragemanagerarch/target/classes/BigTable.java 2010-02-06 22:29:39 UTC (rev 53) @@ -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/mapstoragemanagerarch/target/classes/META-INF/mapstoragemanagerarch-i18n-definition.properties =================================================================== --- trunk/mapstoragemanagerarch/target/classes/META-INF/mapstoragemanagerarch-i18n-definition.properties (rev 0) +++ trunk/mapstoragemanagerarch/target/classes/META-INF/mapstoragemanagerarch-i18n-definition.properties 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,4 @@ +#Sat Feb 06 23:20:56 CET 2010 +bundles.en_GB=i18n/nuiton-utils-en_GB.properties,i18n/jaxx-runtime-en_GB.properties,i18n/jaxx-widgets-en_GB.properties +bundles.fr_FR=i18n/nuiton-utils-fr_FR.properties,i18n/jaxx-runtime-fr_FR.properties,i18n/jaxx-widgets-fr_FR.properties +locales=fr_FR,en_GB Added: trunk/mapstoragemanagerarch/target/classes/META-INF/mapstoragemanagerarch-i18n-en_GB.properties =================================================================== --- trunk/mapstoragemanagerarch/target/classes/META-INF/mapstoragemanagerarch-i18n-en_GB.properties (rev 0) +++ trunk/mapstoragemanagerarch/target/classes/META-INF/mapstoragemanagerarch-i18n-en_GB.properties 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,131 @@ +#Sat Feb 06 23:20:56 CET 2010 +aboutframe.about=About +aboutframe.license=License +aboutframe.ok=OK +aboutframe.thirdparty=Third party +columnselector.action.tip=Select the columns +config.action.quit=Quit +config.action.quit.tip=Quit the configuration editor +config.action.reset=Cancel +config.action.reset.tip=Cancel the modifications for the category +config.action.save=Save +config.action.save.tip=Save the modifications for the category +config.category.needReloadApplication= +config.category.needReloadUI= +config.category.saved=The category '%1$s' was modified \: +config.choice.cancel=Cancel +config.choice.continue=Continue +config.choice.doNotSave=Do not save +config.choice.ok=Ok +config.choice.save=Save +config.defaultValue=Default value +config.defaultValue.tip=Default value of the option +config.descrition=Description +config.error.category.already.exists=category with name '%1$s' does already exist\! +config.error.category.not.found=category with name '%1$s' does not exist\! +config.key=Key +config.key.tip=Key of the option +config.message.quit.invalid.category=The category '%1$s' is not valid\! +config.message.quit.valid.and.modified.category=The category '%1$s' has some modified options \: +config.model.needReloadApplication= +config.model.needReloadUI= +config.modified=Option was modified (previous value \: %1$s) +config.no.option.selected=< No selected option > +config.option.final=This option can not be modified +config.option.label=Option '%1$s' (%2$s) +config.option.modified=Value is modified < original value \: '%1$s' - new value \: '%2$s' > +config.title=Preferences +config.title.need.confirm=A confirmation is required +config.title.will.reload.application=The application need to be restarted +config.title.will.reload.ui=The graphical interface must be relauched +config.unmodifiable=Can not be modified +config.unvalid=Option is not valid \! (previous value \: %1$s, required type \: %2$s) +config.value=Value +config.value.tip=Value of the option +entitycombobox.action.reset.tip=Reset the selected value +entitycombobox.action.sort.tip=Change the sorted property +entitycombobox.popup.label=Object '%1$s' +entitycombobox.popup.title=Change the sorted property +entitycombobox.sort.off=Click to activate the sort on this property +entitycombobox.sort.on=This is the property actually used +entitycombobox.unknown.type=Object of unkown type +errorUI.action.close=Close +errorUI.message=An error wad detected... +errorUI.title=Error... +fontsize.action.default.tip=Restore default font size +fontsize.action.down.tip=Decrease font size +fontsize.action.up.tip=Increase font size +hello\ you\ \!=hello you \! +hidor.hideTip=Hide +hidor.showTip=Show +i18neditor.empty.locales=< No locale to select > +i18neditor.popup.title=Change language +i18neditor.selected=Selected language \: %1$s +i18neditor.unselected=Select this langage \: %1$s +listSelector.hideList=Hide the list +listSelector.showList=Show the list +memorywidget.memory=%d/%dMb +nuitonutil.debug.objectutil.create=Try to create %s with %s +nuitonutil.debug.objectutil.instantiate=Can't instantiate %s with params %s +nuitonutil.debug.objectutil.invoke=Invoke %s with %s +nuitonutil.error.add.url.in.classloader=Can't add url in classloader %1$s for reason %2$s +nuitonutil.error.applicationconfig.save=Can't save config in file %s +nuitonutil.error.convert.file.to.url=Can't convert %s for reason %s +nuitonutil.error.convertor.noValue=No value specified for converter %s +nuitonutil.error.get.url.from.zip=Error while reading %s \: %s +nuitonutil.error.i18n.unformated.message=Message can't be formatted\: '%s' with arguments %s +nuitonutil.error.i18n.untranslated.message=Message can't be translated\: '%s' +nuitonutil.error.no.convertor=no convertor found for type %2$s and objet '%1$s' +nuitonutil.error.not.an.enum=The type %1$s ins not an Enum type +nuitonutil.error.null.parameter=The parameter %1$s is null\! +nuitonutil.error.resource.not.found=Can't find resource \: %s +nuitonutil.error.unfound.month=could not found month from '%s', use default month '%s' +nuitonutil.error.unknown.url.type=could not treate unknown type of url %1$s +nuitonutil.error.url.convertor=a problem occurs while converting value '%s' with url convertor %s for reason %s +nuitonutil.error.version.convertor=Could not convert version %%1$s with converter %2$s for reason \: %3$s +nuitonutil.error.version.pattern=Pattern of version not found for %1$s +nuitonutil.fileCompletion.cancel=.. to cancel or return to parent directory +nuitonutil.fileCompletion.enter=Enter to display file list, or to complete path +nuitonutil.fileCompletion.exit=Enter "\!q" to exit +nuitonutil.fileCompletion.save=Enter "\!s" in the end of the file name to save +nuitonutil.month.april=april +nuitonutil.month.august=august +nuitonutil.month.december=december +nuitonutil.month.february=february +nuitonutil.month.january=january +nuitonutil.month.july=july +nuitonutil.month.june=june +nuitonutil.month.march=march +nuitonutil.month.may=may +nuitonutil.month.november=november +nuitonutil.month.october=october +nuitonutil.month.september=september +numbereditor..=. +numbereditor.0=0 +numbereditor.1=1 +numbereditor.2=2 +numbereditor.3=3 +numbereditor.4=4 +numbereditor.5=5 +numbereditor.6=6 +numbereditor.7=7 +numbereditor.8=8 +numbereditor.9=9 +numbereditor.action.reset.tip=Reset +numbereditor.action.show.tip=Show numeric panel +numbereditor.clearAll=C +numbereditor.clearOne=CE +numbereditor.toggleSign=+/- +timeeditor.H=H +validator.field.header=Field +validator.field.header.tip=The field involved +validator.field.tip=Property '%1$s' +validator.message.header=Message +validator.message.header.tip=Message +validator.message.tip=Message \: %1$s +validator.scope.error.label=Error +validator.scope.header=... +validator.scope.header.tip=Severity of the message +validator.scope.info.label=Information +validator.scope.tip=Message scope \: '%1$s' +validator.scope.warning.label=Warning Added: trunk/mapstoragemanagerarch/target/classes/META-INF/mapstoragemanagerarch-i18n-fr_FR.properties =================================================================== --- trunk/mapstoragemanagerarch/target/classes/META-INF/mapstoragemanagerarch-i18n-fr_FR.properties (rev 0) +++ trunk/mapstoragemanagerarch/target/classes/META-INF/mapstoragemanagerarch-i18n-fr_FR.properties 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,131 @@ +#Sat Feb 06 23:20:56 CET 2010 +aboutframe.about=\u00C0 propos +aboutframe.license=Licence +aboutframe.ok=OK +aboutframe.thirdparty=Tierce partie +columnselector.action.tip=S\u00E9lectionner les colonnes +config.action.quit=Quitter +config.action.quit.tip=Quitter l'\u00E9diteur de configuration +config.action.reset=Annuler +config.action.reset.tip=Annuler les modifications de cette cat\u00E9gorie +config.action.save=Enregistrer +config.action.save.tip=Sauver les modifications de cette cat\u00E9gorie +config.category.needReloadApplication=Cat\u00E9gorie '%1$s' \: +config.category.needReloadUI=Cat\u00E9gorie '%1$s' \: +config.category.saved=La cat\u00E9gorie '%1$s' a \u00E9t\u00E9 modifi\u00E9e \: +config.choice.cancel=Annuler +config.choice.continue=Continuer +config.choice.doNotSave=Ne pas enregistrer +config.choice.ok=Ok +config.choice.save=Enregistrer +config.defaultValue=Valeur par d\u00E9faut +config.defaultValue.tip=Valeur par d\u00E9faut de l'option +config.descrition=Description +config.error.category.already.exists=La cat\u00E9gorie de nom '%1$s' existe d\u00E9j\u00E0\! +config.error.category.not.found=La cat\u00E9gorie de nom '%1$s' n'existe pas\! +config.key=Clef +config.key.tip=Clef de l'option +config.message.quit.invalid.category=La cat\u00E9gorie '%1$s' n'est pas valide\! +config.message.quit.valid.and.modified.category=La cat\u00E9gorie '%1$s' poss\u00E8dent des options modifi\u00E9es \: +config.model.needReloadApplication=Des options ont \u00E9t\u00E9 modifi\u00E9es qui n\u00E9cessitent le red\u00E9marrage de l'application.\n +config.model.needReloadUI=Des options ont \u00E9t\u00E9 modifi\u00E9es qui n\u00E9cessitent le red\u00E9marrage de l'interface graphique.\n +config.modified=Option modifi\u00E9e (valeur originale \: %1$s) +config.no.option.selected=< Pas d'option s\u00E9lectionn\u00E9e > +config.option.final=Option non modifiable +config.option.label=Option '%1$s' (%2$s) +config.option.modified=Valeur modifi\u00E9e < ancienne valeur \: '%1$s' - nouvelle valeur \: '%2$s' > +config.title=Pr\u00E9f\u00E9rences +config.title.need.confirm=Une confirmation de votre part est requise... +config.title.will.reload.application=L'application doit \u00EAtre red\u00E9marrer... +config.title.will.reload.ui=L'interface graphique doit \u00EAtre relancer... +config.unmodifiable=Ne peut pas \u00EAtre modifi\u00E9 +config.unvalid=Option non valide (valeur originale \: %1$s, type requis \: %2$s) +config.value=Valeur +config.value.tip=Valeur de l'option +entitycombobox.action.reset.tip=R\u00E9initialiser la valeur de la liste d\u00E9roulante +entitycombobox.action.sort.tip=Modifier le tri de la liste d\u00E9roulante +entitycombobox.popup.label=Objet '%1$s' +entitycombobox.popup.title=Modifier le tri +entitycombobox.sort.off=Cliquer pour activer le tri sur la propri\u00E9t\u00E9 '%1$s' +entitycombobox.sort.on=Le tri est effectu\u00E9 sur la propri\u00E9t\u00E9 '%1$s' +entitycombobox.unknown.type=Objet de type inconnu +errorUI.action.close=Fermer +errorUI.message=Une erreur est survenue \! +errorUI.title=Erreur... +fontsize.action.default.tip=Retour sur la taille par d\u00E9faut +fontsize.action.down.tip=Diminuer la taille de la police +fontsize.action.up.tip=Augmenter la taille de la police +hello\ you\ \!=Salut toi\! +hidor.hideTip=Cacher +hidor.showTip=Voir +i18neditor.empty.locales=< Aucune locale \u00E0 s\u00E9lectionner > +i18neditor.popup.title=Changer de langue +i18neditor.selected=Langue actuellement utilis\u00E9e \: %1$s +i18neditor.unselected=Pour utiliser cette langue \: %1$s +listSelector.hideList=Cacher la liste +listSelector.showList=Afficher la liste +memorywidget.memory=%d/%dMo +nuitonutil.debug.objectutil.create=Essaye de cr\u00E9er %s avec %s +nuitonutil.debug.objectutil.instantiate=Ne peut pas instancier %s avec les param\u00EAtres %s +nuitonutil.debug.objectutil.invoke=Invocation de %s avec %s +nuitonutil.error.add.url.in.classloader=Impossible d'ajouter une url dans le classloader %s pour la raison \: %s +nuitonutil.error.applicationconfig.save=Impossible de sauvegarder le fichier de configuration dans %s +nuitonutil.error.convert.file.to.url=Le fichier '%1$s' n'a pas pu \u00EAtre converti en URL pour la raison suivante \: %2$S +nuitonutil.error.convertor.noValue=Aucune valeur \u00E0 convertir pour le convertisseur %s +nuitonutil.error.get.url.from.zip=Erreur lors de la lecture du fichier compress\u00E9 %1$s \: %2$s +nuitonutil.error.i18n.unformated.message=Le message suivant n''a pas pu \u00EAtre format\u00E9 \: '%s' avec les arguments %s +nuitonutil.error.i18n.untranslated.message=Le message suivant n'a pas pu \u00EAtre traduit \: '%s' +nuitonutil.error.no.convertor=Aucun convertisseur trouv\u00E9 pour le type %2$s et l''objet '%1$s' +nuitonutil.error.not.an.enum=Le type %1$s n'est pas une enumeration java +nuitonutil.error.null.parameter=Le param\u00E8tre '%1$s' est null\! +nuitonutil.error.resource.not.found=Impossible de trouver la ressource \: %s +nuitonutil.error.unfound.month=n'a pas pu trouv\u00E9 le mois \u00E0 partir de '%s', utilise le mois par d\u00E9faut '%s' +nuitonutil.error.unknown.url.type=could not treate unknown type of url %1$s +nuitonutil.error.url.convertor=Un probl\u00E8me est apparu lors de la convertion en url de '%s' avec le convertisseur %s pour la raison suivante \: %s +nuitonutil.error.version.convertor=N'a pas pu convertir la valeur %%1$s avec le converter %2$s pour la raison suivante \: %3$s +nuitonutil.error.version.pattern=Pattern de version non connu pour %1$s +nuitonutil.fileCompletion.cancel=.. pour annuler ou pour revenir au repertoire pr\u00E9c\u00E9dent +nuitonutil.fileCompletion.enter=Entrer pour afficher la liste des fichiers, ou pour compl\u00E9ter le chemin +nuitonutil.fileCompletion.exit=Saisir "\!q" pour quitter +nuitonutil.fileCompletion.save=Saisir "\!s" a la fin du nom de fichier pour l'enregistrer +nuitonutil.month.april=avril +nuitonutil.month.august=ao\u00FBt +nuitonutil.month.december=d\u00E9cembre +nuitonutil.month.february=f\u00E9vrier +nuitonutil.month.january=janvier +nuitonutil.month.july=juillet +nuitonutil.month.june=juin +nuitonutil.month.march=mars +nuitonutil.month.may=mai +nuitonutil.month.november=novembre +nuitonutil.month.october=octobre +nuitonutil.month.september=septembre +numbereditor..=. +numbereditor.0=0 +numbereditor.1=1 +numbereditor.2=2 +numbereditor.3=3 +numbereditor.4=4 +numbereditor.5=5 +numbereditor.6=6 +numbereditor.7=7 +numbereditor.8=8 +numbereditor.9=9 +numbereditor.action.reset.tip=R\u00E9initialiser +numbereditor.action.show.tip=Afficher le pav\u00E9 num\u00E9rique +numbereditor.clearAll=C +numbereditor.clearOne=CE +numbereditor.toggleSign=+/- +timeeditor.H=H +validator.field.header=Champ +validator.field.header.tip=Le champ surquel intervient le message +validator.field.tip=Propri\u00E9t\u00E9 '%1$s' +validator.message.header=Message +validator.message.header.tip=Le texte du message +validator.message.tip=Message \: %1$s +validator.scope.error.label=Erreur +validator.scope.header=... +validator.scope.header.tip=Le de type de message +validator.scope.info.label=Information +validator.scope.tip=Type de message \: '%1$s' +validator.scope.warning.label=Avertissement Added: trunk/mapstoragemanagerarch/target/classes/OurHashMap.java =================================================================== --- trunk/mapstoragemanagerarch/target/classes/OurHashMap.java (rev 0) +++ trunk/mapstoragemanagerarch/target/classes/OurHashMap.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,33 @@ +package org.nuiton.mapstoragemanager.plugins; + +import java.util.HashMap; +import java.util.Set; + +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 + + } + +} Added: trunk/mapstoragemanagerarch/target/classes/bighashmap/BigHashMap.java =================================================================== --- trunk/mapstoragemanagerarch/target/classes/bighashmap/BigHashMap.java (rev 0) +++ trunk/mapstoragemanagerarch/target/classes/bighashmap/BigHashMap.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,130 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import org.nuiton.mapstoragemanager.plugins.nvBigTable; + +/** + * Interface listant les méthodes nécéssaires sur une base de données. + * @author Dorian Langlais + * + */ +public class BigHashMap implements nvBigTable { + + private Map<String, Table> tables; + private Table currentTable; + + /** + * Default constructor. + */ + public BigHashMap() { + this.tables = new HashMap<String, Table>(); + currentTable = null; + } + + /** + * {@inheritDoc} + * Create a new HashMap database. + */ + public boolean connect(String host, int port, String base, String username, String passwd) { + //throw new UnsupportedOperationException("Not supported yet."); + new BigHashMap(); + return true; + } + + /** + * {@inheritDoc} + */ + public void selectTable(String table) { + this.currentTable = tables.get(table); + } + + /** + * {@inheritDoc} + */ + public void createTable(String table) { + this.tables.put(table, new TableImpl()); + } + + /** + * {@inheritDoc} + */ + public void deleteTable(String table) { + this.tables.remove(table); + } + + /** + * {@inheritDoc} + */ + public Set<String> getTablesNames() { + return this.tables.keySet(); + } + + /** + * {@inheritDoc} + */ + public void createColumn(String table, String column) { + this.tables.get(table).createColumn(column, null); + } + + /** + * {@inheritDoc} + */ + public void deleteColumn(String table, String column) { + this.tables.get(table).deleteColumn(column); + } + + /** + * {@inheritDoc} + */ + public Set<String> getColumnsNames(String table) { + return this.tables.get(table).getColumnsNames(); + } + + /** + * {@inheritDoc} + */ + public void put(String table, String column, String key, String content) { + this.tables.get(table).put(column, key, content); + } + + /** + * {@inheritDoc} + */ + public String get(String table, String column, String key) { + return this.tables.get(table).get(column, key).toString(); + } + + /** + * {@inheritDoc} + */ + public String get(String table, String column, String key, int version) { + return this.tables.get(table).get(column, key, version).toString(); + } + + /** + * {@inheritDoc} + */ + public Map<String, String> getRow(String table, String key) { + + Row row = this.tables.get(table).getRow(key); + + Map<String,Object> rowContent = row.getRowContent(); + Map<String,String> rowMap = new HashMap<String,String>(); + + for(String rowKey : rowContent.keySet()) { + String rowValue = rowContent.get(rowKey).toString(); + rowMap.put(rowKey, rowValue); + } + return rowMap; + } + + /** + * {@inheritDoc} + */ + public Set<String> getKeys(String table) { + return this.tables.get(table).getKeys(); + } + +} Added: trunk/mapstoragemanagerarch/target/classes/bighashmap/Cell.java =================================================================== --- trunk/mapstoragemanagerarch/target/classes/bighashmap/Cell.java (rev 0) +++ trunk/mapstoragemanagerarch/target/classes/bighashmap/Cell.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,47 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +/** + * Interface to present the method an a Cell. + * @author Dorian Langlais + * + * @param <T> Class of the object stored in the cells. + */ +public interface Cell<T> { + + /** + * Get the most recent object put in the cell. + * @return The most recent object stored in the cell. + */ + T get(); + + /** + * Put a new object in the cell. + * @param t Objet to store in the cell. + */ + void put(T t); + + /** + * Get an object from its "version". + * The version number start at 0, and increase one by one at each new + * version. + * @param t the version wanted (it can be timestamp, number..). + * @return The object corresponding to the "version". + */ + T get(Long t); + + /** + * hashCode(). + * @return + */ + int hashCode(); + + /** + * equals(). + */ + boolean equals(Object o); + + /** + * toString(). + */ + String toString(); +} Added: trunk/mapstoragemanagerarch/target/classes/bighashmap/CellImpl.java =================================================================== --- trunk/mapstoragemanagerarch/target/classes/bighashmap/CellImpl.java (rev 0) +++ trunk/mapstoragemanagerarch/target/classes/bighashmap/CellImpl.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,114 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.Map; +import java.util.NoSuchElementException; + +/** + * Class Cell. + * A cell contain different version of a content. + * So a cell store objects and its version. + * @param <T> The type of the stored objects. + * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet. + * @licence GPL. + */ +public class CellImpl<T /**extends Serializable*/ + > implements Cell<T> { + + /** + * cell. + * hashMap with key as timestamp and value, as object of T class. + */ + private Map<Long, T> cell; + + /** + * Default constructor. + */ + public CellImpl() { + this.cell = new HashMap<Long, T>(); + } + + /** + * Constructor with object. + * @param t The object to store. + */ + public CellImpl(T t) { + this.cell = new HashMap<Long, T>(); + this.put(t); + } + + /** + * {@inheritDoc} + */ + public final void put(final T t) { + cell.put((long)cell.size(), t); + //cell.put(System.currentTimeMillis(), t); + } + + /** + * {@inheritDoc} + */ + 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 = 0L; + for (Long current : cell.keySet()) { + if (max < current) { + max = current; + } + } + return cell.get(max); + } + + /** + * {@inheritDoc} + */ + public int hashCode() { + if (this.cell.size() != 0) { + return this.get().hashCode(); + } else { + return 0; + } + } + + /** + * {@inheritDoc} + * //TODO : we consider only the last item... but it will be better to + * //TODO verify all the "versions" of the cell. + */ + public boolean equals(Object o) { + if (o instanceof CellImpl) { + CellImpl another = (CellImpl) o; + if(this.cell.size() == another.cell.size()) { + if(this.cell.size() == 0) { + return true; + } else { + return this.get().equals(another.get()); + } + } else { + return false; + } + } else { + return false; + } + } + /** + * {@inheritDoc} + */ + public String toString() { + + if (this.cell.size() != 0) { + return ((T) this.get()).toString(); + } else { + return ""; + } + } +} Added: trunk/mapstoragemanagerarch/target/classes/bighashmap/Column.java =================================================================== --- trunk/mapstoragemanagerarch/target/classes/bighashmap/Column.java (rev 0) +++ trunk/mapstoragemanagerarch/target/classes/bighashmap/Column.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,62 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.Set; + +/** + * Interface to present the method to implement for en Column. + * @author Dorian Langlais + * + * @param <T> Class of the object stored in the columns. + */ +public interface Column<T> { + + /** + * Get the object which has key key</key>. + * @param key the key. + * @return the object stored at the line identified by key + */ + T get(String key); + + /** + * Get the object which has key key</key> and version version. + * @param key + * @param version the version wanted (it can be timestamp, number..). + * @return The object corresponding to the "version". + */ + T get(String key, Long version); + + /** + * Put object t with the key key. + * @param key the key + * @param t object to store + */ + void put(String key, Object t); + + /** + * Delete an object by its key. + * @param key the key + */ + void delete(String key); + + /** + * hashCode(). + * @return + */ + int hashCode(); + + /** + * equals(). + */ + boolean equals(Object o); + + /** + * toString(). + */ + String toString(); + + /** + * Get the keys of the column. + * @return return a Set containing all the keys of the column. + */ + Set<String> getKeys(); +} Added: trunk/mapstoragemanagerarch/target/classes/bighashmap/ColumnImpl.java =================================================================== --- trunk/mapstoragemanagerarch/target/classes/bighashmap/ColumnImpl.java (rev 0) +++ trunk/mapstoragemanagerarch/target/classes/bighashmap/ColumnImpl.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,110 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Set; + +/** + * 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> { + + /** + * column. + * hashMap with key the key of the line, and value a column. + */ + private Map<String, CellImpl<T>> column; + + /** + * Default constructor. + */ + public ColumnImpl() { + column = new HashMap<String, CellImpl<T>>(); + } + + /** + * {@inheritDoc} + */ + 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 Object content) { + try { + this.column.get(key).put((T)content); + } catch (NullPointerException e) { + this.column.put(key, new CellImpl<T>((T)content)); + } + } + + /** + * {@inheritDoc} + */ + public final void delete(final String key) { + this.column.remove(key); + } + + /** + * {@inheritDoc} + */ + public final int hashCode() { + int hash = 0; + for(Cell c : column.values()) { + hash += c.hashCode(); + } + return hash; + } + + /** + * {@inheritDoc} + */ + public boolean equals(Object o) { + if (o instanceof Column) { + + ColumnImpl other = (ColumnImpl) o; + + return other.column.equals(this.column); + + } else { + return false; + } + } + + /** + * {@inheritDoc} + */ + public final String toString() { + String ret = ""; + + for (String key : column.keySet()) { + ret += key + "\t" + column.get(key); + } + + return ret; + } + + /** + * {@inheritDoc} + */ + public Set<String> getKeys() { + return this.column.keySet(); + } +} Added: trunk/mapstoragemanagerarch/target/classes/bighashmap/Row.java =================================================================== --- trunk/mapstoragemanagerarch/target/classes/bighashmap/Row.java (rev 0) +++ trunk/mapstoragemanagerarch/target/classes/bighashmap/Row.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,36 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.Map; + +/** + * Interface to present the methods on a Row + * @author Dorian Langlais + * + */ +public interface Row { + + /** + * to string a row. + * @return the row in textual format. + */ + String toString(); + + /** + * Get row structure. + * @return the row structure + */ + Structure getRowStructure(); + + /** + * Get row content. + * @return the row content + */ + Map<String, Object> getRowContent(); + + /** + * Get an element of the row. + * @param columnName the column name. + * @return the content of the "cell". + */ + Object getContent(String columnName); +} Added: trunk/mapstoragemanagerarch/target/classes/bighashmap/RowImpl.java =================================================================== --- trunk/mapstoragemanagerarch/target/classes/bighashmap/RowImpl.java (rev 0) +++ trunk/mapstoragemanagerarch/target/classes/bighashmap/RowImpl.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,65 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.Map; + +/** + * Class RowImpl. + * A row of a table. + * @author Dorian Langlais. + */ +public class RowImpl implements Row { + + /** + * Structure of the row. + */ + private Structure rowStructure; + /** + * Content of the row. + */ + private Map<String, Object> rowContent; + + /** + * Row constructor. + * @param struct the row structure + * @param content the row content + */ + public RowImpl(final Structure 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 Structure getRowStructure() { + return rowStructure; + } + + /** + * {@inheritDoc} + */ + public Map<String, Object> getRowContent() { + return rowContent; + } + + /** + * {@inheritDoc} + */ + public final String toString() { + String ret; + ret = rowContent.values().toString(); + return ret; + } + + /** + * {@inheritDoc} + */ + public Object getContent(String columnName) { + return rowContent.get(columnName); + } +} Added: trunk/mapstoragemanagerarch/target/classes/bighashmap/Structure.java =================================================================== --- trunk/mapstoragemanagerarch/target/classes/bighashmap/Structure.java (rev 0) +++ trunk/mapstoragemanagerarch/target/classes/bighashmap/Structure.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,51 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.Set; + +/** + * Interface to present the method on a structure. + * A structure is a description of a table. + * @author Dorian Langlais + * + */ +public interface Structure { + + /** + * Add a new column in the structure. + * @param columnName the column name + * @param columnClass the column class + */ + void createColumn(String columnName, Class<?> columnClass); + + /** + * Get the columns' names. + * @return return a set containing the name of the columns. + */ + Set<String> getColumnsNames(); + + /** + * Get the class of object of the column columnName. + * @param columnName the column name + * @return return the column class + */ + Class<?> getColumnClass(String columnName); + + /** + * Remove a column of the structure by its name. + * @param columnName the column name + */ + void deleteColumn(String columnName); + + /** + * get the hashCode of the structure. + * @return return the hashCode of the structure. + */ + int hashCode(); + + /** + * Permit to verify if this is equals to another object. + * @param another the object to compare + * @return true if this is equals to another + */ + boolean equals(Object o); +} Added: trunk/mapstoragemanagerarch/target/classes/bighashmap/StructureImpl.java =================================================================== --- trunk/mapstoragemanagerarch/target/classes/bighashmap/StructureImpl.java (rev 0) +++ trunk/mapstoragemanagerarch/target/classes/bighashmap/StructureImpl.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,92 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +/** + * Class Structure. + * Represente the mapping between a row and the column of a table. + * @author Dorian Langlais + * + */ +public class StructureImpl implements Structure { + + /** + * structure. + * hashMap with key the column name, and value the column class. + */ + private Map<String, Class<? /**extends Serializable*/ + >> structure; + + /** + * Default constructor. + */ + public StructureImpl() { + this.structure = + new HashMap<String, Class<? /**extends Serializable*/ + >>(); + } + + /** + * {@inheritDoc} + */ + public final void createColumn(final String columnName, + final Class<? /**extends Serializable*/ + > columnClass) { + this.structure.put(columnName, columnClass); + } + + /** + * {@inheritDoc} + */ + public final void deleteColumn(final String columnName) { + this.structure.remove(columnName); + } + + /** + * {@inheritDoc} + */ + public final Class<? /**extends Serializable*/ + > getColumnClass( + final String columnName) { + return this.structure.get(columnName); + } + + /** + * {@inheritDoc} + */ + public final Set<String> getColumnsNames() { + return this.structure.keySet(); + } + + /** + * {@inheritDoc} + */ + public final int hashCode() { + if (structure.isEmpty()) { + return 0; + } else { + int hash = 0; + for (String key : structure.keySet() ) { + hash += key.hashCode(); + hash += structure.get(key).hashCode(); + } + return hash; + } + } + + /** + * {@inheritDoc} + */ + public final boolean equals(Object o) { + if (o instanceof StructureImpl) { + StructureImpl another = (StructureImpl) o; + + return this.structure.equals(another.structure); + + } else { + return false; + } + } +} Added: trunk/mapstoragemanagerarch/target/classes/bighashmap/Table.java =================================================================== --- trunk/mapstoragemanagerarch/target/classes/bighashmap/Table.java (rev 0) +++ trunk/mapstoragemanagerarch/target/classes/bighashmap/Table.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,82 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.Set; + +/** + * Interface to present the method on a table. + * A table is like a table in SGBD, but in BigTable, the data are stored in + * columns not in rows. + * @author Dorian Langlais + */ +public interface Table { + + /** + * Create a column in the table. + * @param columnName the column name + * @param columnClass the column class + * @param <columnClass> generics to spécify the class of the stored objects. + */ + <columnClass> void createColumn(final String columnName, + final Class<?> columnClass); + + /** + * Delete a colum of the table. + * @param columnName the column name. + */ + void deleteColumn(final String columnName); + + /** + * Get the columns' name of the table. + * @return Return a set containing the columns' name of the table + */ + Set<String> getColumnsNames(); + + /** + * Get a "virtual" rom from the table. + * @param key the key of the row to get + * @return return the row which has key as key + */ + Row getRow(final String key); + + /** + * Remove a row by its key. + * @param key the key + */ + void deleteRow(final String key); + + /** + * Put an object in the table. + * Put the objct o in the column columnName at the key + * key. + * @param columnName the columnName + * @param key the key + * @param o the object + */ + void put(final String columnName, final String key, final Object o); + + /** + * Get an object from the table. + * Get an object from the column columnName with the key key. + * @param columnName the columnName + * @param key the key + * @return return the object stored + */ + Object get(final String columnName, final String key); + + /** + * Get an object from the table. + * Get an object from the column columnName with the key key + * and the versiion number version. + * @param columnName the columnName + * @param key the key + * @param version the version wanted + * @return return the object stored + */ + Object get(final String columnName, final String key, final long version); + + /** + * Get the keys of the table. + * @return return a set which contains all the keys of the table. + */ + Set<String> getKeys(); +} Added: trunk/mapstoragemanagerarch/target/classes/bighashmap/TableImpl.java =================================================================== --- trunk/mapstoragemanagerarch/target/classes/bighashmap/TableImpl.java (rev 0) +++ trunk/mapstoragemanagerarch/target/classes/bighashmap/TableImpl.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,113 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +/** + * Class Table. + * Implements the interface Table. + * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet. + * @licence GPL. + */ +public class TableImpl implements Table { + + /** + * Table. + * hashMap with key as column name and value, a colum of the table. + */ + private Map<String, Column<?>> tableColumns; + /** + * Structure of the table. + */ + private StructureImpl tableStructure; + + /** + * Default constructor. + */ + public TableImpl() { + this.tableColumns = new HashMap<String, Column<?>>(); + this.tableStructure = new StructureImpl(); + } + + /** + * {@inheritDoc} + */ + public final <columnClass /**extends Serializable*/ + > void createColumn( + final String columnName, final Class<?> columnClass) { + ColumnImpl<columnClass> column = new ColumnImpl<columnClass>(); + this.tableColumns.put(columnName, column); + this.tableStructure.createColumn(columnName, columnClass); + } + + /** + * {@inheritDoc} + */ + public final void deleteColumn(final String columnName) { + this.tableColumns.remove(columnName); + this.tableStructure.deleteColumn(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, + tableColumns.get(columnName).get(key)); + } + return new RowImpl(tableStructure, rowContent); + } + + /** + * {@inheritDoc} + */ + public void deleteRow(final String key) { + for (Column column : tableColumns.values()) { + column.delete(key); + } + } + + /** + * {@inheritDoc} + */ + public void put(String columnName, String key, Object o) { + this.tableColumns.get(columnName).put(key, o); + } + + /** + * {@inheritDoc} + */ + public Object get(String columnName, String key) { + return this.tableColumns.get(columnName).get(key); + } + + /** + * {@inheritDoc} + */ + public Object get(String columnName, String key, long version) { + return this.tableColumns.get(columnName).get(key, version); + } + + /** + * {@inheritDoc} + */ + public Set<String> getColumnsNames() { + return this.tableColumns.keySet(); + } + + /** + * {@inheritDoc} + */ + public Set<String> getKeys() { + Set<String> keys = new HashSet<String>(); + for(Column col : this.tableColumns.values()){ + keys.addAll(col.getKeys()); + } + return keys; + } +} Added: trunk/mapstoragemanagerarch/target/classes/bighashmap/package-info.java =================================================================== --- trunk/mapstoragemanagerarch/target/classes/bighashmap/package-info.java (rev 0) +++ trunk/mapstoragemanagerarch/target/classes/bighashmap/package-info.java 2010-02-06 22:29:39 UTC (rev 53) @@ -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. + */ Added: trunk/mapstoragemanagerarch/target/classes/nvBigTable.java =================================================================== --- trunk/mapstoragemanagerarch/target/classes/nvBigTable.java (rev 0) +++ trunk/mapstoragemanagerarch/target/classes/nvBigTable.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,135 @@ +package org.nuiton.mapstoragemanager.plugins; + +import java.util.Map; +import java.util.Set; + +/** + * 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 column in the table table + * @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 column in the table table + * @param table the table name + * @param column the column name + */ + void deleteColumn(String table, String column); + + /** + * Get the columns' name of one table. + * @param table the table name + * @return Return a set containing the columns' name of the table + * table + */ + Set<String> getColumnsNames(String table); + + /*************** + * Cell * + ***************/ + + /** + * Put a new content in the table. + * Put a new content in the column column of the table + * table with the key key. + * @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 table from the column column + * where the key is key. + * -> 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 table from the column column + * where the key is key. + * -> get the content with the version version. + * @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 key from the table table + * @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 table. + */ + Set<String> getKeys(String table); +} Added: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/Main$1.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/Main$1.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/Main.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/Main.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/core/BigTableLoader.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/core/BigTableLoader.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/core/Core.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/core/Core.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/core/MainTestCore.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/core/MainTestCore.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/core/Messages.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/core/Messages.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/core/PluginLoader.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/core/PluginLoader.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/core/TestServiceLoader.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/core/TestServiceLoader.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/BigTable.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/BigTable.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/OurHashMap.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/OurHashMap.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/nvBigTable.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/plugins/nvBigTable.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/ui/MainUI$1.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/ui/MainUI$1.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/ui/MainUI.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/ui/MainUI.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/classes/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/classes/package-info.java =================================================================== --- trunk/mapstoragemanagerarch/target/classes/package-info.java (rev 0) +++ trunk/mapstoragemanagerarch/target/classes/package-info.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,5 @@ +package org.nuiton.mapstoragemanager.plugins; +/** + * The plugins interfaces. + */ + Added: trunk/mapstoragemanagerarch/target/generated-sources/i18n/java.getter =================================================================== --- trunk/mapstoragemanagerarch/target/generated-sources/i18n/java.getter (rev 0) +++ trunk/mapstoragemanagerarch/target/generated-sources/i18n/java.getter 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,32 @@ +Map\ Storage\ Manager=Map Storage Manager +TABLE\ NAME\ \:\ TODO=TABLE NAME \: TODO +login\ \:=login \: +mapstoragemanager.action.aboutUs=mapstoragemanager.action.aboutUs +mapstoragemanager.action.aboutUs.tip=mapstoragemanager.action.aboutUs.tip +mapstoragemanager.action.connect=mapstoragemanager.action.connect +mapstoragemanager.action.connect.tip=mapstoragemanager.action.connect.tip +mapstoragemanager.action.disconnect=mapstoragemanager.action.disconnect +mapstoragemanager.action.disconnect.tip=mapstoragemanager.action.disconnect.tip +mapstoragemanager.action.edit=mapstoragemanager.action.edit +mapstoragemanager.action.edit.tip=mapstoragemanager.action.edit.tip +mapstoragemanager.action.exit=mapstoragemanager.action.exit +mapstoragemanager.action.exit.tip=mapstoragemanager.action.exit.tip +mapstoragemanager.action.file=mapstoragemanager.action.file +mapstoragemanager.action.file.tip=mapstoragemanager.action.file.tip +mapstoragemanager.action.fr=mapstoragemanager.action.fr +mapstoragemanager.action.fr.tip=mapstoragemanager.action.fr.tip +mapstoragemanager.action.help=mapstoragemanager.action.help +mapstoragemanager.action.help.tip=mapstoragemanager.action.help.tip +mapstoragemanager.action.language=mapstoragemanager.action.language +mapstoragemanager.action.language.tip=mapstoragemanager.action.language.tip +mapstoragemanager.action.menuHelp=mapstoragemanager.action.menuHelp +mapstoragemanager.action.menuHelp.tip=mapstoragemanager.action.menuHelp.tip +mapstoragemanager.action.preferences=mapstoragemanager.action.preferences +mapstoragemanager.action.preferences.tip=mapstoragemanager.action.preferences.tip +mapstoragemanager.action.uk=mapstoragemanager.action.uk +mapstoragemanager.action.uk.tip=mapstoragemanager.action.uk.tip +mapstoragemanager.action.visitSite=mapstoragemanager.action.visitSite +mapstoragemanager.action.visitSite.tip=mapstoragemanager.action.visitSite.tip +name\ base\ \:=name base \: +ok=ok +password\ \:=password \: Added: trunk/mapstoragemanagerarch/target/generated-sources/i18n/mapstoragemanagerarch-en_GB.properties =================================================================== --- trunk/mapstoragemanagerarch/target/generated-sources/i18n/mapstoragemanagerarch-en_GB.properties (rev 0) +++ trunk/mapstoragemanagerarch/target/generated-sources/i18n/mapstoragemanagerarch-en_GB.properties 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,32 @@ +Map\ Storage\ Manager= +TABLE\ NAME\ \:\ TODO= +login\ \:= +mapstoragemanager.action.aboutUs= +mapstoragemanager.action.aboutUs.tip= +mapstoragemanager.action.connect= +mapstoragemanager.action.connect.tip= +mapstoragemanager.action.disconnect= +mapstoragemanager.action.disconnect.tip= +mapstoragemanager.action.edit= +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit= +mapstoragemanager.action.exit.tip= +mapstoragemanager.action.file= +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr= +mapstoragemanager.action.fr.tip= +mapstoragemanager.action.help= +mapstoragemanager.action.help.tip= +mapstoragemanager.action.language= +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp= +mapstoragemanager.action.menuHelp.tip= +mapstoragemanager.action.preferences= +mapstoragemanager.action.preferences.tip= +mapstoragemanager.action.uk= +mapstoragemanager.action.uk.tip= +mapstoragemanager.action.visitSite= +mapstoragemanager.action.visitSite.tip= +name\ base\ \:= +ok= +password\ \:= Added: trunk/mapstoragemanagerarch/target/generated-sources/i18n/mapstoragemanagerarch-fr_FR.properties =================================================================== --- trunk/mapstoragemanagerarch/target/generated-sources/i18n/mapstoragemanagerarch-fr_FR.properties (rev 0) +++ trunk/mapstoragemanagerarch/target/generated-sources/i18n/mapstoragemanagerarch-fr_FR.properties 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,32 @@ +Map\ Storage\ Manager= +TABLE\ NAME\ \:\ TODO= +login\ \:= +mapstoragemanager.action.aboutUs= +mapstoragemanager.action.aboutUs.tip= +mapstoragemanager.action.connect= +mapstoragemanager.action.connect.tip= +mapstoragemanager.action.disconnect= +mapstoragemanager.action.disconnect.tip= +mapstoragemanager.action.edit= +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit= +mapstoragemanager.action.exit.tip= +mapstoragemanager.action.file= +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr= +mapstoragemanager.action.fr.tip= +mapstoragemanager.action.help= +mapstoragemanager.action.help.tip= +mapstoragemanager.action.language= +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp= +mapstoragemanager.action.menuHelp.tip= +mapstoragemanager.action.preferences= +mapstoragemanager.action.preferences.tip= +mapstoragemanager.action.uk= +mapstoragemanager.action.uk.tip= +mapstoragemanager.action.visitSite= +mapstoragemanager.action.visitSite.tip= +name\ base\ \:= +ok= +password\ \:= Added: trunk/mapstoragemanagerarch/target/generated-sources/i18n/mapstoragemanagerarch.properties =================================================================== --- trunk/mapstoragemanagerarch/target/generated-sources/i18n/mapstoragemanagerarch.properties (rev 0) +++ trunk/mapstoragemanagerarch/target/generated-sources/i18n/mapstoragemanagerarch.properties 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,32 @@ +Map\ Storage\ Manager=Map Storage Manager +TABLE\ NAME\ \:\ TODO=TABLE NAME \: TODO +login\ \:=login \: +mapstoragemanager.action.aboutUs=mapstoragemanager.action.aboutUs +mapstoragemanager.action.aboutUs.tip=mapstoragemanager.action.aboutUs.tip +mapstoragemanager.action.connect=mapstoragemanager.action.connect +mapstoragemanager.action.connect.tip=mapstoragemanager.action.connect.tip +mapstoragemanager.action.disconnect=mapstoragemanager.action.disconnect +mapstoragemanager.action.disconnect.tip=mapstoragemanager.action.disconnect.tip +mapstoragemanager.action.edit=mapstoragemanager.action.edit +mapstoragemanager.action.edit.tip=mapstoragemanager.action.edit.tip +mapstoragemanager.action.exit=mapstoragemanager.action.exit +mapstoragemanager.action.exit.tip=mapstoragemanager.action.exit.tip +mapstoragemanager.action.file=mapstoragemanager.action.file +mapstoragemanager.action.file.tip=mapstoragemanager.action.file.tip +mapstoragemanager.action.fr=mapstoragemanager.action.fr +mapstoragemanager.action.fr.tip=mapstoragemanager.action.fr.tip +mapstoragemanager.action.help=mapstoragemanager.action.help +mapstoragemanager.action.help.tip=mapstoragemanager.action.help.tip +mapstoragemanager.action.language=mapstoragemanager.action.language +mapstoragemanager.action.language.tip=mapstoragemanager.action.language.tip +mapstoragemanager.action.menuHelp=mapstoragemanager.action.menuHelp +mapstoragemanager.action.menuHelp.tip=mapstoragemanager.action.menuHelp.tip +mapstoragemanager.action.preferences=mapstoragemanager.action.preferences +mapstoragemanager.action.preferences.tip=mapstoragemanager.action.preferences.tip +mapstoragemanager.action.uk=mapstoragemanager.action.uk +mapstoragemanager.action.uk.tip=mapstoragemanager.action.uk.tip +mapstoragemanager.action.visitSite=mapstoragemanager.action.visitSite +mapstoragemanager.action.visitSite.tip=mapstoragemanager.action.visitSite.tip +name\ base\ \:=name base \: +ok=ok +password\ \:=password \: Added: trunk/mapstoragemanagerarch/target/generated-sources/java/org/nuiton/mapstoragemanager/ui/MainUI.java =================================================================== --- trunk/mapstoragemanagerarch/target/generated-sources/java/org/nuiton/mapstoragemanager/ui/MainUI.java (rev 0) +++ trunk/mapstoragemanagerarch/target/generated-sources/java/org/nuiton/mapstoragemanager/ui/MainUI.java 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,822 @@ +package org.nuiton.mapstoragemanager.ui; + +import java.awt.*; +import java.awt.event.*; +import java.io.*; +import java.lang.*; +import java.util.*; +import javax.swing.*; +import javax.swing.border.*; +import javax.swing.event.*; +import jaxx.runtime.JAXXBinding; +import jaxx.runtime.JAXXContext; +import jaxx.runtime.JAXXObject; +import jaxx.runtime.JAXXObjectDescriptor; +import jaxx.runtime.SwingUtil; +import jaxx.runtime.Util; +import jaxx.runtime.swing.HBox; +import jaxx.runtime.swing.JAXXButtonGroup; +import jaxx.runtime.swing.Table; +import jaxx.runtime.swing.VBox; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.mapstoragemanager.ui.*; +import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; +import static jaxx.runtime.SwingUtil.createImageIcon; +import static org.nuiton.i18n.I18n._; + +public class MainUI extends jaxx.runtime.swing.Application implements JAXXObject { + + /*-----------------------------------------------------------------------*/ + /*------------------------- Other static fields -------------------------*/ + /*-----------------------------------------------------------------------*/ + + private static final String $jaxxObjectDescriptor = "H4sIAAAAAAAAAK1YS28cRRDudeJNbCexsfOCJIqTbEIkxNh5ECQcQdaOl9hZE8u7a0VxkOjd6Xg76Z2ezPTYkyBe/4CfAHcuSNw4IQ6cOXBB/AWEOHBFVPe8dnZmdibYlry2u6q++rq6uqra3/2JRm0LXXiKXVezHEPQHtFWqw8fPmg/JR1xl9gdi5qCW8j7Ko2gkS00oYfrtkCXturSfM43n1viPZMbxOizXqijcVu8YMTuEiIEOhe36Nj2XCMUL7imYwWoIak01G/+/mvka/3Lb0cQck1gdxW2MptnFe3kYB2NUF2gafC0g+cYNraBhkWNbeB7VK4tMWzbH+EeeY4+R4fqqGxiC8AEulh8ywpD2bumQGM9TI2aBZACXeHWtmY4VHBD62HTBiu8TXrYgE9Lc6i2BrqtFdNU5mWBZioNhb5iUEExoy+JNQ8wascdoEAZ2HkEtIRmBDNeWV0jhrOIpfVxuU9Xs3dh21qwHuke7sFKDYAFei2hKXUmQ9UJqbrEDQMSR6ATCe0VQXpSdTq0OCYt7lK74xnJ1VNxjSOV1QaBoGOIDZA9GQMNJXEbRXnZpWl4nkz3ZMfj/CelbN0iTwiccYfYofn5VDrX5NrZAbmEqEMeOXCEoYtIPh1EM9CpbYReLmdrte6naKmt3CPMTNnKkUAWyJXtW0l5gwqSIj8ayKtt7ogUBZXG69ggDOjGDkUtSq2x/nxrcs7S8s1fl4o3op1VVuu4Tdj8ILZalUq3gGKbM71l6MRi1CChqQE3axHbkK7nY4XAR4DKBne1zRe5q3ASPtWpLgz1AUnQJK6oUcL0RE6GknT46/nwUxWIoW3vcksPXLwxEOE+adzNWGV10RFQT8BoJmbkLce1ZTabjAp5ZMnLFUjiZ3MUbDoWZ8w3OhU3CkVS/UH/9lVezMu/35EfG1F2tOG4Gp0uFD6BzmQcWtMiCrKVTkSdWjPus1zZhFP2KCYwN/0EeJSgeC2k+DhxejfC03vc50bWtQw3UmQOqCoHZHD1eurqjdTVm8GqNRAv6KNa1EejRlfaQqOWA8sCnd5Ktt4NEHlN9/RA05WASvrvyZnffvzjh1rQac+B7xOpqn2DAnRA0+ImsQSVrie9NusIyubWsLmwhcZswqDuqynibAqxhi8GcuBP9R9Nmmv3sN0FiNFDv//088lPfj2ARmponHGs17DUX0FjomtBFOB+ueYHdxSjI7uH4XMKvg9Ar2KcP6saeo3ICla2X9gQV7g/YERf4rZsdweF5cCPacY7WFBubBAGP3dIk4PBp4bD2GcuhOxsSshC3u2xX/6ZaXx/JwhbCbbxeqZ6FLrRR6hMDVkV1IjiTx+pI8mEaRNH59GUkTZ3IJg8JqomXGlvL35GefLdtABNQU8W1HC4Y9fxC2gCUUBg0Glyp9Nddk1s6LFgTeh0h0I9a8DAIVDplqtGhC/UzuVvX0ki41FtyeFRAsQnwOPtXUK3u5KCrJipoGXvhpqpVXXIPg8KKNgwkCbnL8gkiJT2RM0+h3sG6XGDdmBXNWAloG81qdlUxheGGmuCmknKfZOVmX8auSwJjDRxlsvFWUrjoSzlwFSc5Wymo04wHPYTXRokWsmzz+LaP4AWp3sp050eTqZxxncHGb9ZACKL9MAMvC/J4O4lGdy8ZHBfJRmyD9OMJu042fVBsleLYGRxHpzqi1PPjlEwHcd5Vwd5X84FGBpoqbAf6dBNMH2FdOgOYRl7ZRRnejHT2Q61qZBPkjjdzUG6V/IRcjlLpf2oaVi+kFp2TipkXwPfPotv/CVWnPCZ7J5k5bSz80NMs2imPGz3g6vzLM61VZyr86ww19b9/SgKzEfL6W7ZRSEAGJq6Aec8xjA6jQoq5OwyA5PybMNzObvm+UzDj/41VQC83PVHsunb3qA6i4WwaNsR5P0EeEl+jhehvEt10QVxaf7/g5SZP7Aeu61jgWfb1NDhMZZB62YRRG7i5w4ZwuvdAigqg4ZgvJeLIY2XhyBU94zw4Z4R1gpEYtJ/JtT9p9UQuPUCcFPw0Nu1NzgX9+BBwtTMn4X3sADeTJdb9CW8OzCrMrptwL0bdm4f7zlmbUD4D6tKCtqKFwAA"; + protected static final Log log = LogFactory.getLog(org.nuiton.mapstoragemanager.ui.MainUI.class); + private static final long serialVersionUID = 1L; + + /*-----------------------------------------------------------------------*/ + /*--------------------------- Internal states ---------------------------*/ + /*-----------------------------------------------------------------------*/ + + protected java.util.List<Object> $activeBindings = new ArrayList<Object>(); + protected Map<String, Object> $bindingSources = new HashMap<String, Object>(); + protected final Map<String, JAXXBinding> $bindings = new java.util.TreeMap<String, JAXXBinding>(); + protected Map<String, Object> $objectMap = new HashMap<String, Object>(); + protected Map<?,?> $previousValues = new java.util.HashMap<Object, Object>(); + private boolean allComponentsCreated; + private boolean contextInitialized = true; + protected final JAXXContext delegateContext = new jaxx.runtime.context.DefaultJAXXContext(); + + /*-----------------------------------------------------------------------*/ + /*------------------------ Protected components ------------------------*/ + /*-----------------------------------------------------------------------*/ + + protected jaxx.runtime.swing.JAXXTree baseSchema; + protected MainUI mainFrame = this; + protected javax.swing.JPanel mainPanel; + protected javax.swing.JMenuItem menuConnect; + protected javax.swing.JMenuItem menuDisconnect; + protected javax.swing.JMenu menuEdit; + protected javax.swing.JMenuItem menuExit; + protected javax.swing.JMenu menuFile; + protected javax.swing.JMenuItem menuFileLanguageFR; + protected javax.swing.JMenuItem menuFileLanguageUK; + protected javax.swing.JMenu menuHelp; + protected javax.swing.JMenuItem menuHelpAbout; + protected javax.swing.JMenuItem menuHelpHelp; + protected javax.swing.JMenuItem menuHelpSite; + protected javax.swing.JMenu menuLanguage; + protected javax.swing.JMenuItem menuPreferences; + protected jaxx.runtime.swing.JAXXComboBox nameBase; + + /*-----------------------------------------------------------------------*/ + /*------------------------- Private components -------------------------*/ + /*-----------------------------------------------------------------------*/ + + private javax.swing.JMenuBar $JMenuBar0; + private javax.swing.JSeparator $JSeparator0; + private javax.swing.JSeparator $JSeparator1; + private javax.swing.JToolBar $JToolBar0; + private javax.swing.JLabel $JLabel0; + private javax.swing.JLabel $JLabel1; + private javax.swing.JTextField $JTextField0; + private javax.swing.JLabel $JLabel2; + private javax.swing.JPasswordField $JPasswordField0; + private javax.swing.JButton $JButton0; + private javax.swing.JSplitPane $JSplitPane0; + private javax.swing.JScrollPane $JScrollPane0; + private javax.swing.JPanel $JPanel0; + private javax.swing.JScrollPane $JScrollPane1; + private jaxx.runtime.swing.VBox $VBox0; + private javax.swing.JPanel $JPanel1; + private javax.swing.JLabel $JLabel3; + private jaxx.runtime.swing.Item $Item0; + private jaxx.runtime.swing.Item $Item1; + private jaxx.runtime.swing.Item $Item2; + private jaxx.runtime.swing.Item $Item3; + private jaxx.runtime.swing.Item $Item4; + + /*-----------------------------------------------------------------------*/ + /*---------------------- Raw body code from script ----------------------*/ + /*-----------------------------------------------------------------------*/ + + ApplicationEngine engine; + { mainFrame.setLookAndFeel("system"); } + + /*-----------------------------------------------------------------------*/ + /*--------------------------- Statics methods ---------------------------*/ + /*-----------------------------------------------------------------------*/ + + public static JAXXObjectDescriptor $getJAXXObjectDescriptor() { + return Util.decodeCompressedJAXXObjectDescriptor($jaxxObjectDescriptor); + } + + public static void main(String[] arg) { + SwingUtilities.invokeLater(new Runnable() { public void run() { new MainUI().setVisible(true); } }); + } + + /*-----------------------------------------------------------------------*/ + /*---------------------------- Constructors ----------------------------*/ + /*-----------------------------------------------------------------------*/ + + public MainUI() { + $initialize(); + } + + public MainUI(JAXXContext parentContext) { + Util.initContext(this, parentContext); + $initialize(); + } + + /*-----------------------------------------------------------------------*/ + /*---------------------- JAXXObject implementation ----------------------*/ + /*-----------------------------------------------------------------------*/ + + @Override + public void applyDataBinding(String $binding) { + if (allComponentsCreated && $bindings.containsKey($binding)) { + $bindings.get($binding).applyDataBinding(); + } + processDataBinding($binding); + } + + @Override + public void firePropertyChange(String propertyName, Object oldValue, Object newValue) { + super.firePropertyChange(propertyName, oldValue, newValue); + } + + @Override + public Map<String, Object> get$objectMap() { + return $objectMap; + } + + @Override + public JAXXBinding[] getDataBindings() { + return $bindings.values().toArray(new JAXXBinding[$bindings.size()]); + } + + @Override + public Object getObjectById(String id) { + return $objectMap.get(id); + } + + @Override + public void processDataBinding(String $binding, boolean $force) { + if (!$force && $activeBindings.contains($binding)) { + return; + } + $activeBindings.add($binding); + try { + if (allComponentsCreated && $bindings.containsKey($binding)) { + $bindings.get($binding).processDataBinding(); + } + } finally { + $activeBindings.remove($binding); + } + } + + @Override + public void processDataBinding(String $binding) { + processDataBinding($binding, false); + } + + @Override + public void registerDataBinding(JAXXBinding binding) { + $bindings.put(binding.getId(), binding); + } + + @Override + public void removeDataBinding(String $binding) { + if (allComponentsCreated && $bindings.containsKey($binding)) { + $bindings.get($binding).removeDataBinding(); + } + } + + /*-----------------------------------------------------------------------*/ + /*--------------------- JAXXContext implementation ---------------------*/ + /*-----------------------------------------------------------------------*/ + + @Override + public <T> T getContextValue(Class<T> clazz) { + return delegateContext.getContextValue(clazz, null); + } + + @Override + public <T> T getContextValue(Class<T> clazz, String name) { + return delegateContext.getContextValue(clazz, name); + } + + @Override + public JAXXContext getDelegateContext() { + return delegateContext; + } + + @Override + public <O extends Container> O getParentContainer(Class<O> clazz) { + return SwingUtil.getParentContainer(this, clazz); + } + + @Override + public <O extends Container> O getParentContainer(Object source, Class<O> clazz) { + return SwingUtil.getParentContainer(source, clazz); + } + + @Override + public <T> void removeContextValue(Class<T> clazz) { + delegateContext.removeContextValue(clazz, null); + } + + @Override + public <T> void removeContextValue(Class<T> clazz, String name) { + delegateContext.removeContextValue(clazz, name); + } + + @Override + public <T> void setContextValue(T o) { + delegateContext.setContextValue(o, null); + } + + @Override + public <T> void setContextValue(T o, String name) { + delegateContext.setContextValue(o, name); + } + + /*-----------------------------------------------------------------------*/ + /*---------------------------- Event methods ----------------------------*/ + /*-----------------------------------------------------------------------*/ + + public void doActionPerformed__on__menuConnect(java.awt.event.ActionEvent event) { + engine.doSomething(); + } + + public void doActionPerformed__on__menuDisconnect(java.awt.event.ActionEvent event) { + engine.doSomething(); + } + + public void doActionPerformed__on__menuExit(java.awt.event.ActionEvent event) { + engine.close(); + } + + public void doActionPerformed__on__menuFileLanguageFR(java.awt.event.ActionEvent event) { + engine.setLocale("en","GB"); + } + + public void doActionPerformed__on__menuFileLanguageUK(java.awt.event.ActionEvent event) { + engine.setLocale("fr","FR"); + } + + public void doActionPerformed__on__menuHelpAbout(java.awt.event.ActionEvent event) { + engine.doSomething(); + } + + public void doActionPerformed__on__menuHelpHelp(java.awt.event.ActionEvent event) { + engine.doSomething(); + } + + public void doActionPerformed__on__menuHelpSite(java.awt.event.ActionEvent event) { + engine.doSomething(); + } + + public void doActionPerformed__on__menuPreferences(java.awt.event.ActionEvent event) { + engine.doSomething(); + } + + public void doValueChanged__on__baseSchema(javax.swing.event.TreeSelectionEvent event) { + engine.doSomething(); + } + + public void doWindowClosing__on__mainFrame(java.awt.event.WindowEvent event) { + engine.close(); + } + + /*-----------------------------------------------------------------------*/ + /*----------------------- Public acessor methods -----------------------*/ + /*-----------------------------------------------------------------------*/ + + public jaxx.runtime.swing.JAXXTree getBaseSchema() { + return baseSchema; + } + + public javax.swing.JPanel getMainPanel() { + return mainPanel; + } + + public javax.swing.JMenuItem getMenuConnect() { + return menuConnect; + } + + public javax.swing.JMenuItem getMenuDisconnect() { + return menuDisconnect; + } + + public javax.swing.JMenu getMenuEdit() { + return menuEdit; + } + + public javax.swing.JMenuItem getMenuExit() { + return menuExit; + } + + public javax.swing.JMenu getMenuFile() { + return menuFile; + } + + public javax.swing.JMenuItem getMenuFileLanguageFR() { + return menuFileLanguageFR; + } + + public javax.swing.JMenuItem getMenuFileLanguageUK() { + return menuFileLanguageUK; + } + + public javax.swing.JMenu getMenuHelp() { + return menuHelp; + } + + public javax.swing.JMenuItem getMenuHelpAbout() { + return menuHelpAbout; + } + + public javax.swing.JMenuItem getMenuHelpHelp() { + return menuHelpHelp; + } + + public javax.swing.JMenuItem getMenuHelpSite() { + return menuHelpSite; + } + + public javax.swing.JMenu getMenuLanguage() { + return menuLanguage; + } + + public javax.swing.JMenuItem getMenuPreferences() { + return menuPreferences; + } + + public jaxx.runtime.swing.JAXXComboBox getNameBase() { + return nameBase; + } + + /*-----------------------------------------------------------------------*/ + /*--------------------- Protected acessors methods ---------------------*/ + /*-----------------------------------------------------------------------*/ + + protected javax.swing.JMenuBar get$JMenuBar0() { + return $JMenuBar0; + } + + protected javax.swing.JSeparator get$JSeparator0() { + return $JSeparator0; + } + + protected javax.swing.JSeparator get$JSeparator1() { + return $JSeparator1; + } + + protected javax.swing.JToolBar get$JToolBar0() { + return $JToolBar0; + } + + protected javax.swing.JLabel get$JLabel0() { + return $JLabel0; + } + + protected javax.swing.JLabel get$JLabel1() { + return $JLabel1; + } + + protected javax.swing.JTextField get$JTextField0() { + return $JTextField0; + } + + protected javax.swing.JLabel get$JLabel2() { + return $JLabel2; + } + + protected javax.swing.JPasswordField get$JPasswordField0() { + return $JPasswordField0; + } + + protected javax.swing.JButton get$JButton0() { + return $JButton0; + } + + protected javax.swing.JSplitPane get$JSplitPane0() { + return $JSplitPane0; + } + + protected javax.swing.JScrollPane get$JScrollPane0() { + return $JScrollPane0; + } + + protected javax.swing.JPanel get$JPanel0() { + return $JPanel0; + } + + protected javax.swing.JScrollPane get$JScrollPane1() { + return $JScrollPane1; + } + + protected jaxx.runtime.swing.VBox get$VBox0() { + return $VBox0; + } + + protected javax.swing.JPanel get$JPanel1() { + return $JPanel1; + } + + protected javax.swing.JLabel get$JLabel3() { + return $JLabel3; + } + + protected jaxx.runtime.swing.Item get$Item0() { + return $Item0; + } + + protected jaxx.runtime.swing.Item get$Item1() { + return $Item1; + } + + protected jaxx.runtime.swing.Item get$Item2() { + return $Item2; + } + + protected jaxx.runtime.swing.Item get$Item3() { + return $Item3; + } + + protected jaxx.runtime.swing.Item get$Item4() { + return $Item4; + } + + /*-----------------------------------------------------------------------*/ + /*--------------------- Components creation methods ---------------------*/ + /*-----------------------------------------------------------------------*/ + + protected void addChildrenToBaseSchema() { + if (!allComponentsCreated) { + return; + } + java.util.List<jaxx.runtime.swing.Item> baseSchema$items = new java.util.ArrayList<jaxx.runtime.swing.Item>(); + baseSchema$items.add($Item4); + baseSchema.setItems(baseSchema$items); + } + + protected void addChildrenToMainFrame() { + if (!allComponentsCreated) { + return; + } + add(mainPanel); + mainFrame.setJMenuBar($JMenuBar0); + } + + protected void addChildrenToMainPanel() { + if (!allComponentsCreated) { + return; + } + mainPanel.add($JToolBar0, BorderLayout.NORTH); + mainPanel.add($JSplitPane0, BorderLayout.CENTER); + } + + protected void addChildrenToMenuEdit() { + if (!allComponentsCreated) { + return; + } + menuEdit.add(menuPreferences); + menuEdit.add($JSeparator1); + menuEdit.add(menuLanguage); + } + + protected void addChildrenToMenuFile() { + if (!allComponentsCreated) { + return; + } + menuFile.add(menuConnect); + menuFile.add(menuDisconnect); + menuFile.add($JSeparator0); + menuFile.add(menuExit); + } + + protected void addChildrenToMenuHelp() { + if (!allComponentsCreated) { + return; + } + menuHelp.add(menuHelpHelp); + menuHelp.add(menuHelpSite); + menuHelp.add(menuHelpAbout); + } + + protected void addChildrenToMenuLanguage() { + if (!allComponentsCreated) { + return; + } + menuLanguage.add(menuFileLanguageFR); + menuLanguage.add(menuFileLanguageUK); + } + + protected void addChildrenToNameBase() { + if (!allComponentsCreated) { + return; + } + java.util.List<jaxx.runtime.swing.Item> nameBase$items = new java.util.ArrayList<jaxx.runtime.swing.Item>(); + nameBase$items.add($Item0); + nameBase$items.add($Item1); + nameBase$items.add($Item2); + nameBase$items.add($Item3); + nameBase.setItems(nameBase$items); + } + + protected void createBaseSchema() { + $objectMap.put("baseSchema", baseSchema = new jaxx.runtime.swing.JAXXTree()); + baseSchema.setName("baseSchema"); + baseSchema.setShowsRootHandles(true); + baseSchema.addTreeSelectionListener(Util.getEventListener(TreeSelectionListener.class, "valueChanged", this, "doValueChanged__on__baseSchema")); + } + + protected void createMainPanel() { + $objectMap.put("mainPanel", mainPanel = new javax.swing.JPanel()); + mainPanel.setName("mainPanel"); + mainPanel.setLayout(new BorderLayout()); + } + + protected void createMenuConnect() { + $objectMap.put("menuConnect", menuConnect = new javax.swing.JMenuItem()); + menuConnect.setName("menuConnect"); + menuConnect.setText(_("mapstoragemanager.action.connect")); + menuConnect.setMnemonic(67); + menuConnect.setToolTipText(_("mapstoragemanager.action.connect.tip")); + menuConnect.addActionListener(Util.getEventListener(ActionListener.class, "actionPerformed", this, "doActionPerformed__on__menuConnect")); + } + + protected void createMenuDisconnect() { + $objectMap.put("menuDisconnect", menuDisconnect = new javax.swing.JMenuItem()); + menuDisconnect.setName("menuDisconnect"); + menuDisconnect.setText(_("mapstoragemanager.action.disconnect")); + menuDisconnect.setMnemonic(68); + menuDisconnect.setToolTipText(_("mapstoragemanager.action.disconnect.tip")); + menuDisconnect.addActionListener(Util.getEventListener(ActionListener.class, "actionPerformed", this, "doActionPerformed__on__menuDisconnect")); + } + + protected void createMenuEdit() { + $objectMap.put("menuEdit", menuEdit = new javax.swing.JMenu()); + menuEdit.setName("menuEdit"); + menuEdit.setText(_("mapstoragemanager.action.edit")); + menuEdit.setMnemonic(69); + menuEdit.setToolTipText(_("mapstoragemanager.action.edit.tip")); + } + + protected void createMenuExit() { + $objectMap.put("menuExit", menuExit = new javax.swing.JMenuItem()); + menuExit.setName("menuExit"); + menuExit.setText(_("mapstoragemanager.action.exit")); + menuExit.setMnemonic(69); + menuExit.setToolTipText(_("mapstoragemanager.action.exit.tip")); + menuExit.addActionListener(Util.getEventListener(ActionListener.class, "actionPerformed", this, "doActionPerformed__on__menuExit")); + } + + protected void createMenuFile() { + $objectMap.put("menuFile", menuFile = new javax.swing.JMenu()); + menuFile.setName("menuFile"); + menuFile.setText(_("mapstoragemanager.action.file")); + menuFile.setMnemonic(70); + menuFile.setToolTipText(_("mapstoragemanager.action.file.tip")); + } + + protected void createMenuFileLanguageFR() { + $objectMap.put("menuFileLanguageFR", menuFileLanguageFR = new javax.swing.JMenuItem()); + menuFileLanguageFR.setName("menuFileLanguageFR"); + menuFileLanguageFR.setText(_("mapstoragemanager.action.fr")); + menuFileLanguageFR.setMnemonic(70); + menuFileLanguageFR.setToolTipText(_("mapstoragemanager.action.fr.tip")); + menuFileLanguageFR.addActionListener(Util.getEventListener(ActionListener.class, "actionPerformed", this, "doActionPerformed__on__menuFileLanguageFR")); + } + + protected void createMenuFileLanguageUK() { + $objectMap.put("menuFileLanguageUK", menuFileLanguageUK = new javax.swing.JMenuItem()); + menuFileLanguageUK.setName("menuFileLanguageUK"); + menuFileLanguageUK.setText(_("mapstoragemanager.action.uk")); + menuFileLanguageUK.setMnemonic(85); + menuFileLanguageUK.setToolTipText(_("mapstoragemanager.action.uk.tip")); + menuFileLanguageUK.addActionListener(Util.getEventListener(ActionListener.class, "actionPerformed", this, "doActionPerformed__on__menuFileLanguageUK")); + } + + protected void createMenuHelp() { + $objectMap.put("menuHelp", menuHelp = new javax.swing.JMenu()); + menuHelp.setName("menuHelp"); + menuHelp.setText(_("mapstoragemanager.action.menuHelp")); + menuHelp.setMnemonic(65); + menuHelp.setToolTipText(_("mapstoragemanager.action.menuHelp.tip")); + } + + protected void createMenuHelpAbout() { + $objectMap.put("menuHelpAbout", menuHelpAbout = new javax.swing.JMenuItem()); + menuHelpAbout.setName("menuHelpAbout"); + menuHelpAbout.setText(_("mapstoragemanager.action.aboutUs")); + menuHelpAbout.setMnemonic(65); + menuHelpAbout.setToolTipText(_("mapstoragemanager.action.aboutUs.tip")); + menuHelpAbout.addActionListener(Util.getEventListener(ActionListener.class, "actionPerformed", this, "doActionPerformed__on__menuHelpAbout")); + } + + protected void createMenuHelpHelp() { + $objectMap.put("menuHelpHelp", menuHelpHelp = new javax.swing.JMenuItem()); + menuHelpHelp.setName("menuHelpHelp"); + menuHelpHelp.setText(_("mapstoragemanager.action.help")); + menuHelpHelp.setMnemonic(69); + menuHelpHelp.setToolTipText(_("mapstoragemanager.action.help.tip")); + menuHelpHelp.addActionListener(Util.getEventListener(ActionListener.class, "actionPerformed", this, "doActionPerformed__on__menuHelpHelp")); + } + + protected void createMenuHelpSite() { + $objectMap.put("menuHelpSite", menuHelpSite = new javax.swing.JMenuItem()); + menuHelpSite.setName("menuHelpSite"); + menuHelpSite.setText(_("mapstoragemanager.action.visitSite")); + menuHelpSite.setMnemonic(86); + menuHelpSite.setToolTipText(_("mapstoragemanager.action.visitSite.tip")); + menuHelpSite.addActionListener(Util.getEventListener(ActionListener.class, "actionPerformed", this, "doActionPerformed__on__menuHelpSite")); + } + + protected void createMenuLanguage() { + $objectMap.put("menuLanguage", menuLanguage = new javax.swing.JMenu()); + menuLanguage.setName("menuLanguage"); + menuLanguage.setText(_("mapstoragemanager.action.language")); + menuLanguage.setMnemonic(67); + menuLanguage.setToolTipText(_("mapstoragemanager.action.language.tip")); + } + + protected void createMenuPreferences() { + $objectMap.put("menuPreferences", menuPreferences = new javax.swing.JMenuItem()); + menuPreferences.setName("menuPreferences"); + menuPreferences.setText(_("mapstoragemanager.action.preferences")); + menuPreferences.setMnemonic(80); + menuPreferences.setToolTipText(_("mapstoragemanager.action.preferences.tip")); + menuPreferences.addActionListener(Util.getEventListener(ActionListener.class, "actionPerformed", this, "doActionPerformed__on__menuPreferences")); + } + + protected void createNameBase() { + $objectMap.put("nameBase", nameBase = new jaxx.runtime.swing.JAXXComboBox()); + nameBase.setName("nameBase"); + } + + /*-----------------------------------------------------------------------*/ + /*------------------------ Internal jaxx methods ------------------------*/ + /*-----------------------------------------------------------------------*/ + + private void $completeSetup() { + allComponentsCreated = true; + addChildrenToMainFrame(); + // inline complete setup of $JMenuBar0 + $JMenuBar0.add(menuFile); + $JMenuBar0.add(menuEdit); + $JMenuBar0.add(menuHelp); + addChildrenToMenuFile(); + addChildrenToMenuEdit(); + addChildrenToMenuLanguage(); + addChildrenToMenuHelp(); + addChildrenToMainPanel(); + // inline complete setup of $JToolBar0 + $JToolBar0.add($JLabel0); + $JToolBar0.add(nameBase); + $JToolBar0.add($JLabel1); + $JToolBar0.add($JTextField0); + $JToolBar0.add($JLabel2); + $JToolBar0.add($JPasswordField0); + $JToolBar0.add($JButton0); + addChildrenToNameBase(); + // inline complete setup of $JSplitPane0 + $JSplitPane0.add($JScrollPane0, JSplitPane.LEFT); + $JSplitPane0.add($JScrollPane1, JSplitPane.RIGHT); + // inline complete setup of $JScrollPane0 + $JScrollPane0.getViewport().add($JPanel0); + // inline complete setup of $JPanel0 + $JPanel0.add(baseSchema); + addChildrenToBaseSchema(); + // inline complete setup of $JScrollPane1 + $JScrollPane1.getViewport().add($VBox0); + // inline complete setup of $VBox0 + $VBox0.add($JPanel1); + $VBox0.add($JLabel3); + + // apply 3 property setters + $Item0.setValue(null); + setLocationRelativeTo(null); + } + + private void $initialize() { + if (allComponentsCreated || !contextInitialized) { + return; + } + $objectMap.put("mainFrame", this); + engine = new ApplicationEngine(); + // inline creation of $JMenuBar0 + $objectMap.put("$JMenuBar0", $JMenuBar0 = new javax.swing.JMenuBar()); + $JMenuBar0.setName("$JMenuBar0"); + createMenuFile(); + createMenuConnect(); + createMenuDisconnect(); + // inline creation of $JSeparator0 + $objectMap.put("$JSeparator0", $JSeparator0 = new javax.swing.JSeparator()); + $JSeparator0.setName("$JSeparator0"); + createMenuExit(); + createMenuEdit(); + createMenuPreferences(); + // inline creation of $JSeparator1 + $objectMap.put("$JSeparator1", $JSeparator1 = new javax.swing.JSeparator()); + $JSeparator1.setName("$JSeparator1"); + createMenuLanguage(); + createMenuFileLanguageFR(); + createMenuFileLanguageUK(); + createMenuHelp(); + createMenuHelpHelp(); + createMenuHelpSite(); + createMenuHelpAbout(); + createMainPanel(); + // inline creation of $JToolBar0 + $objectMap.put("$JToolBar0", $JToolBar0 = new javax.swing.JToolBar()); + $JToolBar0.setName("$JToolBar0"); + $JToolBar0.setOpaque(true); + // inline creation of $JLabel0 + $objectMap.put("$JLabel0", $JLabel0 = new javax.swing.JLabel()); + $JLabel0.setName("$JLabel0"); + $JLabel0.setText(_("name base :")); + if ($JLabel0.getFont() != null) { + $JLabel0.setFont($JLabel0.getFont().deriveFont($JLabel0.getFont().getStyle() | Font.BOLD)); + } + createNameBase(); + // inline creation of $JLabel1 + $objectMap.put("$JLabel1", $JLabel1 = new javax.swing.JLabel()); + $JLabel1.setName("$JLabel1"); + $JLabel1.setText(_("login :")); + if ($JLabel1.getFont() != null) { + $JLabel1.setFont($JLabel1.getFont().deriveFont($JLabel1.getFont().getStyle() | Font.BOLD)); + } + // inline creation of $JTextField0 + $objectMap.put("$JTextField0", $JTextField0 = new javax.swing.JTextField()); + $JTextField0.setName("$JTextField0"); + $JTextField0.setColumns(15); + // inline creation of $JLabel2 + $objectMap.put("$JLabel2", $JLabel2 = new javax.swing.JLabel()); + $JLabel2.setName("$JLabel2"); + $JLabel2.setText(_("password :")); + if ($JLabel2.getFont() != null) { + $JLabel2.setFont($JLabel2.getFont().deriveFont($JLabel2.getFont().getStyle() | Font.BOLD)); + } + // inline creation of $JPasswordField0 + $objectMap.put("$JPasswordField0", $JPasswordField0 = new javax.swing.JPasswordField()); + $JPasswordField0.setName("$JPasswordField0"); + $JPasswordField0.setColumns(15); + // inline creation of $JButton0 + $objectMap.put("$JButton0", $JButton0 = new javax.swing.JButton()); + $JButton0.setName("$JButton0"); + $JButton0.setText(_("ok")); + // inline creation of $JSplitPane0 + $objectMap.put("$JSplitPane0", $JSplitPane0 = new javax.swing.JSplitPane()); + $JSplitPane0.setName("$JSplitPane0"); + $JSplitPane0.setDividerLocation(200); + $JSplitPane0.setContinuousLayout(true); + $JSplitPane0.setOneTouchExpandable(true); + $JSplitPane0.setDividerSize(6); + // inline creation of $JScrollPane0 + $objectMap.put("$JScrollPane0", $JScrollPane0 = new javax.swing.JScrollPane()); + $JScrollPane0.setName("$JScrollPane0"); + // inline creation of $JPanel0 + $objectMap.put("$JPanel0", $JPanel0 = new javax.swing.JPanel()); + $JPanel0.setName("$JPanel0"); + createBaseSchema(); + // inline creation of $JScrollPane1 + $objectMap.put("$JScrollPane1", $JScrollPane1 = new javax.swing.JScrollPane()); + $JScrollPane1.setName("$JScrollPane1"); + // inline creation of $VBox0 + $objectMap.put("$VBox0", $VBox0 = new jaxx.runtime.swing.VBox()); + $VBox0.setName("$VBox0"); + $VBox0.setHorizontalAlignment(0); + // inline creation of $JPanel1 + $objectMap.put("$JPanel1", $JPanel1 = new javax.swing.JPanel()); + $JPanel1.setName("$JPanel1"); + // inline creation of $JLabel3 + $objectMap.put("$JLabel3", $JLabel3 = new javax.swing.JLabel()); + $JLabel3.setName("$JLabel3"); + $JLabel3.setText(_("TABLE NAME : TODO")); + // inline creation of $Item0 + $objectMap.put("$Item0", $Item0 = new jaxx.runtime.swing.Item("$Item0", "Select a base name", "<data binding has not been processed yet>", false)); + // inline creation of $Item1 + $objectMap.put("$Item1", $Item1 = new jaxx.runtime.swing.Item("$Item1", null, "HBase", false)); + // inline creation of $Item2 + $objectMap.put("$Item2", $Item2 = new jaxx.runtime.swing.Item("$Item2", null, "Cassandra", false)); + // inline creation of $Item3 + $objectMap.put("$Item3", $Item3 = new jaxx.runtime.swing.Item("$Item3", null, "Other", false)); + // inline creation of $Item4 + $objectMap.put("$Item4", $Item4 = new jaxx.runtime.swing.Item("$Item4", null, "No base schema", false)); + // inline creation of mainFrame + setName("mainFrame"); + setDefaultCloseOperation(3); + SwingUtil.setComponentHeight(mainFrame,800); + SwingUtil.setComponentWidth(mainFrame,1024); + setTitle(_("Map Storage Manager")); + setResizable(true); + mainFrame.addWindowListener(Util.getEventListener(WindowListener.class, "windowClosing", this, "doWindowClosing__on__mainFrame")); + + $completeSetup(); + } + +} \ No newline at end of file Added: trunk/mapstoragemanagerarch/target/generated-sources/resources/META-INF/mapstoragemanagerarch-i18n-definition.properties =================================================================== --- trunk/mapstoragemanagerarch/target/generated-sources/resources/META-INF/mapstoragemanagerarch-i18n-definition.properties (rev 0) +++ trunk/mapstoragemanagerarch/target/generated-sources/resources/META-INF/mapstoragemanagerarch-i18n-definition.properties 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,4 @@ +#Sat Feb 06 23:20:56 CET 2010 +bundles.en_GB=i18n/nuiton-utils-en_GB.properties,i18n/jaxx-runtime-en_GB.properties,i18n/jaxx-widgets-en_GB.properties +bundles.fr_FR=i18n/nuiton-utils-fr_FR.properties,i18n/jaxx-runtime-fr_FR.properties,i18n/jaxx-widgets-fr_FR.properties +locales=fr_FR,en_GB Added: trunk/mapstoragemanagerarch/target/generated-sources/resources/META-INF/mapstoragemanagerarch-i18n-en_GB.properties =================================================================== --- trunk/mapstoragemanagerarch/target/generated-sources/resources/META-INF/mapstoragemanagerarch-i18n-en_GB.properties (rev 0) +++ trunk/mapstoragemanagerarch/target/generated-sources/resources/META-INF/mapstoragemanagerarch-i18n-en_GB.properties 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,131 @@ +#Sat Feb 06 23:20:56 CET 2010 +aboutframe.about=About +aboutframe.license=License +aboutframe.ok=OK +aboutframe.thirdparty=Third party +columnselector.action.tip=Select the columns +config.action.quit=Quit +config.action.quit.tip=Quit the configuration editor +config.action.reset=Cancel +config.action.reset.tip=Cancel the modifications for the category +config.action.save=Save +config.action.save.tip=Save the modifications for the category +config.category.needReloadApplication= +config.category.needReloadUI= +config.category.saved=The category '%1$s' was modified \: +config.choice.cancel=Cancel +config.choice.continue=Continue +config.choice.doNotSave=Do not save +config.choice.ok=Ok +config.choice.save=Save +config.defaultValue=Default value +config.defaultValue.tip=Default value of the option +config.descrition=Description +config.error.category.already.exists=category with name '%1$s' does already exist\! +config.error.category.not.found=category with name '%1$s' does not exist\! +config.key=Key +config.key.tip=Key of the option +config.message.quit.invalid.category=The category '%1$s' is not valid\! +config.message.quit.valid.and.modified.category=The category '%1$s' has some modified options \: +config.model.needReloadApplication= +config.model.needReloadUI= +config.modified=Option was modified (previous value \: %1$s) +config.no.option.selected=< No selected option > +config.option.final=This option can not be modified +config.option.label=Option '%1$s' (%2$s) +config.option.modified=Value is modified < original value \: '%1$s' - new value \: '%2$s' > +config.title=Preferences +config.title.need.confirm=A confirmation is required +config.title.will.reload.application=The application need to be restarted +config.title.will.reload.ui=The graphical interface must be relauched +config.unmodifiable=Can not be modified +config.unvalid=Option is not valid \! (previous value \: %1$s, required type \: %2$s) +config.value=Value +config.value.tip=Value of the option +entitycombobox.action.reset.tip=Reset the selected value +entitycombobox.action.sort.tip=Change the sorted property +entitycombobox.popup.label=Object '%1$s' +entitycombobox.popup.title=Change the sorted property +entitycombobox.sort.off=Click to activate the sort on this property +entitycombobox.sort.on=This is the property actually used +entitycombobox.unknown.type=Object of unkown type +errorUI.action.close=Close +errorUI.message=An error wad detected... +errorUI.title=Error... +fontsize.action.default.tip=Restore default font size +fontsize.action.down.tip=Decrease font size +fontsize.action.up.tip=Increase font size +hello\ you\ \!=hello you \! +hidor.hideTip=Hide +hidor.showTip=Show +i18neditor.empty.locales=< No locale to select > +i18neditor.popup.title=Change language +i18neditor.selected=Selected language \: %1$s +i18neditor.unselected=Select this langage \: %1$s +listSelector.hideList=Hide the list +listSelector.showList=Show the list +memorywidget.memory=%d/%dMb +nuitonutil.debug.objectutil.create=Try to create %s with %s +nuitonutil.debug.objectutil.instantiate=Can't instantiate %s with params %s +nuitonutil.debug.objectutil.invoke=Invoke %s with %s +nuitonutil.error.add.url.in.classloader=Can't add url in classloader %1$s for reason %2$s +nuitonutil.error.applicationconfig.save=Can't save config in file %s +nuitonutil.error.convert.file.to.url=Can't convert %s for reason %s +nuitonutil.error.convertor.noValue=No value specified for converter %s +nuitonutil.error.get.url.from.zip=Error while reading %s \: %s +nuitonutil.error.i18n.unformated.message=Message can't be formatted\: '%s' with arguments %s +nuitonutil.error.i18n.untranslated.message=Message can't be translated\: '%s' +nuitonutil.error.no.convertor=no convertor found for type %2$s and objet '%1$s' +nuitonutil.error.not.an.enum=The type %1$s ins not an Enum type +nuitonutil.error.null.parameter=The parameter %1$s is null\! +nuitonutil.error.resource.not.found=Can't find resource \: %s +nuitonutil.error.unfound.month=could not found month from '%s', use default month '%s' +nuitonutil.error.unknown.url.type=could not treate unknown type of url %1$s +nuitonutil.error.url.convertor=a problem occurs while converting value '%s' with url convertor %s for reason %s +nuitonutil.error.version.convertor=Could not convert version %%1$s with converter %2$s for reason \: %3$s +nuitonutil.error.version.pattern=Pattern of version not found for %1$s +nuitonutil.fileCompletion.cancel=.. to cancel or return to parent directory +nuitonutil.fileCompletion.enter=Enter to display file list, or to complete path +nuitonutil.fileCompletion.exit=Enter "\!q" to exit +nuitonutil.fileCompletion.save=Enter "\!s" in the end of the file name to save +nuitonutil.month.april=april +nuitonutil.month.august=august +nuitonutil.month.december=december +nuitonutil.month.february=february +nuitonutil.month.january=january +nuitonutil.month.july=july +nuitonutil.month.june=june +nuitonutil.month.march=march +nuitonutil.month.may=may +nuitonutil.month.november=november +nuitonutil.month.october=october +nuitonutil.month.september=september +numbereditor..=. +numbereditor.0=0 +numbereditor.1=1 +numbereditor.2=2 +numbereditor.3=3 +numbereditor.4=4 +numbereditor.5=5 +numbereditor.6=6 +numbereditor.7=7 +numbereditor.8=8 +numbereditor.9=9 +numbereditor.action.reset.tip=Reset +numbereditor.action.show.tip=Show numeric panel +numbereditor.clearAll=C +numbereditor.clearOne=CE +numbereditor.toggleSign=+/- +timeeditor.H=H +validator.field.header=Field +validator.field.header.tip=The field involved +validator.field.tip=Property '%1$s' +validator.message.header=Message +validator.message.header.tip=Message +validator.message.tip=Message \: %1$s +validator.scope.error.label=Error +validator.scope.header=... +validator.scope.header.tip=Severity of the message +validator.scope.info.label=Information +validator.scope.tip=Message scope \: '%1$s' +validator.scope.warning.label=Warning Added: trunk/mapstoragemanagerarch/target/generated-sources/resources/META-INF/mapstoragemanagerarch-i18n-fr_FR.properties =================================================================== --- trunk/mapstoragemanagerarch/target/generated-sources/resources/META-INF/mapstoragemanagerarch-i18n-fr_FR.properties (rev 0) +++ trunk/mapstoragemanagerarch/target/generated-sources/resources/META-INF/mapstoragemanagerarch-i18n-fr_FR.properties 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,131 @@ +#Sat Feb 06 23:20:56 CET 2010 +aboutframe.about=\u00C0 propos +aboutframe.license=Licence +aboutframe.ok=OK +aboutframe.thirdparty=Tierce partie +columnselector.action.tip=S\u00E9lectionner les colonnes +config.action.quit=Quitter +config.action.quit.tip=Quitter l'\u00E9diteur de configuration +config.action.reset=Annuler +config.action.reset.tip=Annuler les modifications de cette cat\u00E9gorie +config.action.save=Enregistrer +config.action.save.tip=Sauver les modifications de cette cat\u00E9gorie +config.category.needReloadApplication=Cat\u00E9gorie '%1$s' \: +config.category.needReloadUI=Cat\u00E9gorie '%1$s' \: +config.category.saved=La cat\u00E9gorie '%1$s' a \u00E9t\u00E9 modifi\u00E9e \: +config.choice.cancel=Annuler +config.choice.continue=Continuer +config.choice.doNotSave=Ne pas enregistrer +config.choice.ok=Ok +config.choice.save=Enregistrer +config.defaultValue=Valeur par d\u00E9faut +config.defaultValue.tip=Valeur par d\u00E9faut de l'option +config.descrition=Description +config.error.category.already.exists=La cat\u00E9gorie de nom '%1$s' existe d\u00E9j\u00E0\! +config.error.category.not.found=La cat\u00E9gorie de nom '%1$s' n'existe pas\! +config.key=Clef +config.key.tip=Clef de l'option +config.message.quit.invalid.category=La cat\u00E9gorie '%1$s' n'est pas valide\! +config.message.quit.valid.and.modified.category=La cat\u00E9gorie '%1$s' poss\u00E8dent des options modifi\u00E9es \: +config.model.needReloadApplication=Des options ont \u00E9t\u00E9 modifi\u00E9es qui n\u00E9cessitent le red\u00E9marrage de l'application.\n +config.model.needReloadUI=Des options ont \u00E9t\u00E9 modifi\u00E9es qui n\u00E9cessitent le red\u00E9marrage de l'interface graphique.\n +config.modified=Option modifi\u00E9e (valeur originale \: %1$s) +config.no.option.selected=< Pas d'option s\u00E9lectionn\u00E9e > +config.option.final=Option non modifiable +config.option.label=Option '%1$s' (%2$s) +config.option.modified=Valeur modifi\u00E9e < ancienne valeur \: '%1$s' - nouvelle valeur \: '%2$s' > +config.title=Pr\u00E9f\u00E9rences +config.title.need.confirm=Une confirmation de votre part est requise... +config.title.will.reload.application=L'application doit \u00EAtre red\u00E9marrer... +config.title.will.reload.ui=L'interface graphique doit \u00EAtre relancer... +config.unmodifiable=Ne peut pas \u00EAtre modifi\u00E9 +config.unvalid=Option non valide (valeur originale \: %1$s, type requis \: %2$s) +config.value=Valeur +config.value.tip=Valeur de l'option +entitycombobox.action.reset.tip=R\u00E9initialiser la valeur de la liste d\u00E9roulante +entitycombobox.action.sort.tip=Modifier le tri de la liste d\u00E9roulante +entitycombobox.popup.label=Objet '%1$s' +entitycombobox.popup.title=Modifier le tri +entitycombobox.sort.off=Cliquer pour activer le tri sur la propri\u00E9t\u00E9 '%1$s' +entitycombobox.sort.on=Le tri est effectu\u00E9 sur la propri\u00E9t\u00E9 '%1$s' +entitycombobox.unknown.type=Objet de type inconnu +errorUI.action.close=Fermer +errorUI.message=Une erreur est survenue \! +errorUI.title=Erreur... +fontsize.action.default.tip=Retour sur la taille par d\u00E9faut +fontsize.action.down.tip=Diminuer la taille de la police +fontsize.action.up.tip=Augmenter la taille de la police +hello\ you\ \!=Salut toi\! +hidor.hideTip=Cacher +hidor.showTip=Voir +i18neditor.empty.locales=< Aucune locale \u00E0 s\u00E9lectionner > +i18neditor.popup.title=Changer de langue +i18neditor.selected=Langue actuellement utilis\u00E9e \: %1$s +i18neditor.unselected=Pour utiliser cette langue \: %1$s +listSelector.hideList=Cacher la liste +listSelector.showList=Afficher la liste +memorywidget.memory=%d/%dMo +nuitonutil.debug.objectutil.create=Essaye de cr\u00E9er %s avec %s +nuitonutil.debug.objectutil.instantiate=Ne peut pas instancier %s avec les param\u00EAtres %s +nuitonutil.debug.objectutil.invoke=Invocation de %s avec %s +nuitonutil.error.add.url.in.classloader=Impossible d'ajouter une url dans le classloader %s pour la raison \: %s +nuitonutil.error.applicationconfig.save=Impossible de sauvegarder le fichier de configuration dans %s +nuitonutil.error.convert.file.to.url=Le fichier '%1$s' n'a pas pu \u00EAtre converti en URL pour la raison suivante \: %2$S +nuitonutil.error.convertor.noValue=Aucune valeur \u00E0 convertir pour le convertisseur %s +nuitonutil.error.get.url.from.zip=Erreur lors de la lecture du fichier compress\u00E9 %1$s \: %2$s +nuitonutil.error.i18n.unformated.message=Le message suivant n''a pas pu \u00EAtre format\u00E9 \: '%s' avec les arguments %s +nuitonutil.error.i18n.untranslated.message=Le message suivant n'a pas pu \u00EAtre traduit \: '%s' +nuitonutil.error.no.convertor=Aucun convertisseur trouv\u00E9 pour le type %2$s et l''objet '%1$s' +nuitonutil.error.not.an.enum=Le type %1$s n'est pas une enumeration java +nuitonutil.error.null.parameter=Le param\u00E8tre '%1$s' est null\! +nuitonutil.error.resource.not.found=Impossible de trouver la ressource \: %s +nuitonutil.error.unfound.month=n'a pas pu trouv\u00E9 le mois \u00E0 partir de '%s', utilise le mois par d\u00E9faut '%s' +nuitonutil.error.unknown.url.type=could not treate unknown type of url %1$s +nuitonutil.error.url.convertor=Un probl\u00E8me est apparu lors de la convertion en url de '%s' avec le convertisseur %s pour la raison suivante \: %s +nuitonutil.error.version.convertor=N'a pas pu convertir la valeur %%1$s avec le converter %2$s pour la raison suivante \: %3$s +nuitonutil.error.version.pattern=Pattern de version non connu pour %1$s +nuitonutil.fileCompletion.cancel=.. pour annuler ou pour revenir au repertoire pr\u00E9c\u00E9dent +nuitonutil.fileCompletion.enter=Entrer pour afficher la liste des fichiers, ou pour compl\u00E9ter le chemin +nuitonutil.fileCompletion.exit=Saisir "\!q" pour quitter +nuitonutil.fileCompletion.save=Saisir "\!s" a la fin du nom de fichier pour l'enregistrer +nuitonutil.month.april=avril +nuitonutil.month.august=ao\u00FBt +nuitonutil.month.december=d\u00E9cembre +nuitonutil.month.february=f\u00E9vrier +nuitonutil.month.january=janvier +nuitonutil.month.july=juillet +nuitonutil.month.june=juin +nuitonutil.month.march=mars +nuitonutil.month.may=mai +nuitonutil.month.november=novembre +nuitonutil.month.october=octobre +nuitonutil.month.september=septembre +numbereditor..=. +numbereditor.0=0 +numbereditor.1=1 +numbereditor.2=2 +numbereditor.3=3 +numbereditor.4=4 +numbereditor.5=5 +numbereditor.6=6 +numbereditor.7=7 +numbereditor.8=8 +numbereditor.9=9 +numbereditor.action.reset.tip=R\u00E9initialiser +numbereditor.action.show.tip=Afficher le pav\u00E9 num\u00E9rique +numbereditor.clearAll=C +numbereditor.clearOne=CE +numbereditor.toggleSign=+/- +timeeditor.H=H +validator.field.header=Champ +validator.field.header.tip=Le champ surquel intervient le message +validator.field.tip=Propri\u00E9t\u00E9 '%1$s' +validator.message.header=Message +validator.message.header.tip=Le texte du message +validator.message.tip=Message \: %1$s +validator.scope.error.label=Erreur +validator.scope.header=... +validator.scope.header.tip=Le de type de message +validator.scope.info.label=Information +validator.scope.tip=Type de message \: '%1$s' +validator.scope.warning.label=Avertissement Added: trunk/mapstoragemanagerarch/target/lib/commons-beanutils-1.8.2.jar =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/lib/commons-beanutils-1.8.2.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/lib/commons-collections-3.2.1.jar =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/lib/commons-collections-3.2.1.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/lib/commons-io-1.4.jar =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/lib/commons-io-1.4.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/lib/commons-jxpath-1.3.jar =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/lib/commons-jxpath-1.3.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/lib/commons-lang-2.4.jar =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/lib/commons-lang-2.4.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/lib/commons-logging-1.1.1.jar =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/lib/commons-logging-1.1.1.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/lib/commons-primitives-1.0.jar =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/lib/commons-primitives-1.0.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/lib/filters-2.0.235.jar =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/lib/filters-2.0.235.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/lib/javahelp-2.0.02.jar =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/lib/javahelp-2.0.02.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/lib/jaxx-runtime-2.0.0-beta-3.jar =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/lib/jaxx-runtime-2.0.0-beta-3.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/lib/jaxx-widgets-2.0.0-beta-3.jar =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/lib/jaxx-widgets-2.0.0-beta-3.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/lib/junit-4.7.jar =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/lib/junit-4.7.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/lib/jxlayer-3.0.3.jar =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/lib/jxlayer-3.0.3.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/lib/log4j-1.2.14.jar =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/lib/log4j-1.2.14.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/lib/nuiton-i18n-api-1.0.1.jar =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/lib/nuiton-i18n-api-1.0.1.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/lib/nuiton-utils-1.1.2.jar =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/lib/nuiton-utils-1.1.2.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/lib/ognl-2.6.11.jar =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/lib/ognl-2.6.11.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/lib/swing-worker-1.1.jar =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/lib/swing-worker-1.1.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/lib/swingx-1.0.jar =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/lib/swingx-1.0.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/lib/xwork-2.1.3.jar =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/lib/xwork-2.1.3.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/mapstoragemanagerarch-0.1-SNAPSHOT.jar =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/mapstoragemanagerarch-0.1-SNAPSHOT.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/maven-archiver/pom.properties =================================================================== --- trunk/mapstoragemanagerarch/target/maven-archiver/pom.properties (rev 0) +++ trunk/mapstoragemanagerarch/target/maven-archiver/pom.properties 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,5 @@ +#Generated by Maven +#Sat Feb 06 23:21:20 CET 2010 +version=0.1-SNAPSHOT +groupId=org.nuiton +artifactId=mapstoragemanagerarch Added: trunk/mapstoragemanagerarch/target/surefire-reports/TEST-org.nuiton.mapstoragemanager.core.BigTableLoaderTest.xml =================================================================== --- trunk/mapstoragemanagerarch/target/surefire-reports/TEST-org.nuiton.mapstoragemanager.core.BigTableLoaderTest.xml (rev 0) +++ trunk/mapstoragemanagerarch/target/surefire-reports/TEST-org.nuiton.mapstoragemanager.core.BigTableLoaderTest.xml 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<testsuite failures="0" time="0.25" errors="0" skipped="0" tests="1" name="org.nuiton.mapstoragemanager.core.BigTableLoaderTest"> + <properties> + <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/> + <property name="sun.boot.library.path" value="C:\Program Files\Java\jdk1.6.0_14\jre\bin"/> + <property name="java.vm.version" value="14.0-b16"/> + <property name="java.vm.vendor" value="Sun Microsystems Inc."/> + <property name="java.vendor.url" value="http://java.sun.com/"/> + <property name="path.separator" value=";"/> + <property name="java.vm.name" value="Java HotSpot(TM) Client VM"/> + <property name="file.encoding.pkg" value="sun.io"/> + <property name="user.country" value="FR"/> + <property name="sun.java.launcher" value="SUN_STANDARD"/> + <property name="sun.os.patch.level" value="Service Pack 3"/> + <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/> + <property name="user.dir" value="E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch"/> + <property name="java.runtime.version" value="1.6.0_14-b08"/> + <property name="java.awt.graphicsenv" value="sun.awt.Win32GraphicsEnvironment"/> + <property name="basedir" value="E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch"/> + <property name="java.endorsed.dirs" value="C:\Program Files\Java\jdk1.6.0_14\jre\lib\endorsed"/> + <property name="os.arch" value="x86"/> + <property name="surefire.real.class.path" value="C:\DOCUME~1\Langlais\LOCALS~1\Temp\surefirebooter1727111557242088275.jar"/> + <property name="java.io.tmpdir" value="C:\DOCUME~1\Langlais\LOCALS~1\Temp\"/> + <property name="line.separator" value=" +"/> + <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/> + <property name="user.variant" value=""/> + <property name="os.name" value="Windows XP"/> + <property name="sun.jnu.encoding" value="Cp1252"/> + <property name="java.library.path" value="C:\Program Files\Java\jdk1.6.0_14\jre\bin;.;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\DivX\QuickTime Alternative\QTSystem\;C:\Program Files\TortoiseSVN\bin;C:\lcc\bin"/> + <property name="surefire.test.class.path" value="E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch\target\test-classes;E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch\target\classes;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\nuiton-utils\1.1.2\nuiton-utils-1.1.2.jar;C:\Documents and Settings\Langlais\.m2\repository\log4j\log4j\1.2.14\log4j-1.2.14.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-logging\commons-logging\1.1.1\commons-logging-1.1.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-primitives\commons-primitives\1.0\commons-primitives-1.0.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-collections\commons-collections\3.2.1\commons-collections-3.2.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-beanutils\commons-beanutils\1.8.2\commons-beanutils-1.8.2.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\i18n\nuiton-i18n-api\1.0.1\nuiton-i18n-api-1.0.1.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\jaxx\jaxx-runtime\2.0.0-beta-3\jaxx-runtime-2.0.0-beta-3.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-lang\commons-lang\2.4\commons-lang-2.4.jar;C:\Documents and Settings\Langlais\.m2\repository\javax\help\javahelp\2.0.02\javahelp-2.0.02.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\jxlayer\3.0.3\jxlayer-3.0.3.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-jxpath\commons-jxpath\1.3\commons-jxpath-1.3.jar;C:\Documents and Settings\Langlais\.m2\repository\com\opensymphony\xwork\2.1.3\xwork-2.1.3.jar;C:\Documents and Settings\Langlais\.m2\repository\opensymphony\ognl\2.6.11\ognl-2.6.11.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\jaxx\jaxx-widgets\2.0.0-beta-3\jaxx-widgets-2.0.0-beta-3.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\swingx\1.0\swingx-1.0.jar;C:\Documents and Settings\Langlais\.m2\repository\com\jhlabs\filters\2.0.235\filters-2.0.235.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\swing-worker\1.1\swing-worker-1.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-io\commons-io\1.4\commons-io-1.4.jar;C:\Documents and Settings\Langlais\.m2\repository\junit\junit\4.7\junit-4.7.jar;"/> + <property name="java.specification.name" value="Java Platform API Specification"/> + <property name="java.class.version" value="50.0"/> + <property name="sun.management.compiler" value="HotSpot Client Compiler"/> + <property name="os.version" value="5.1"/> + <property name="user.home" value="C:\Documents and Settings\Langlais"/> + <property name="user.timezone" value=""/> + <property name="java.awt.printerjob" value="sun.awt.windows.WPrinterJob"/> + <property name="java.specification.version" value="1.6"/> + <property name="file.encoding" value="Cp1252"/> + <property name="user.name" value="Langlais"/> + <property name="java.class.path" value="E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch\target\test-classes;E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch\target\classes;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\nuiton-utils\1.1.2\nuiton-utils-1.1.2.jar;C:\Documents and Settings\Langlais\.m2\repository\log4j\log4j\1.2.14\log4j-1.2.14.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-logging\commons-logging\1.1.1\commons-logging-1.1.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-primitives\commons-primitives\1.0\commons-primitives-1.0.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-collections\commons-collections\3.2.1\commons-collections-3.2.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-beanutils\commons-beanutils\1.8.2\commons-beanutils-1.8.2.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\i18n\nuiton-i18n-api\1.0.1\nuiton-i18n-api-1.0.1.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\jaxx\jaxx-runtime\2.0.0-beta-3\jaxx-runtime-2.0.0-beta-3.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-lang\commons-lang\2.4\commons-lang-2.4.jar;C:\Documents and Settings\Langlais\.m2\repository\javax\help\javahelp\2.0.02\javahelp-2.0.02.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\jxlayer\3.0.3\jxlayer-3.0.3.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-jxpath\commons-jxpath\1.3\commons-jxpath-1.3.jar;C:\Documents and Settings\Langlais\.m2\repository\com\opensymphony\xwork\2.1.3\xwork-2.1.3.jar;C:\Documents and Settings\Langlais\.m2\repository\opensymphony\ognl\2.6.11\ognl-2.6.11.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\jaxx\jaxx-widgets\2.0.0-beta-3\jaxx-widgets-2.0.0-beta-3.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\swingx\1.0\swingx-1.0.jar;C:\Documents and Settings\Langlais\.m2\repository\com\jhlabs\filters\2.0.235\filters-2.0.235.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\swing-worker\1.1\swing-worker-1.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-io\commons-io\1.4\commons-io-1.4.jar;C:\Documents and Settings\Langlais\.m2\repository\junit\junit\4.7\junit-4.7.jar;"/> + <property name="java.vm.specification.version" value="1.0"/> + <property name="sun.arch.data.model" value="32"/> + <property name="java.home" value="C:\Program Files\Java\jdk1.6.0_14\jre"/> + <property name="java.specification.vendor" value="Sun Microsystems Inc."/> + <property name="user.language" value="fr"/> + <property name="awt.toolkit" value="sun.awt.windows.WToolkit"/> + <property name="java.vm.info" value="mixed mode, sharing"/> + <property name="java.version" value="1.6.0_14"/> + <property name="java.ext.dirs" value="C:\Program Files\Java\jdk1.6.0_14\jre\lib\ext;C:\WINDOWS\Sun\Java\lib\ext"/> + <property name="sun.boot.class.path" value="C:\Program Files\Java\jdk1.6.0_14\jre\lib\resources.jar;C:\Program Files\Java\jdk1.6.0_14\jre\lib\rt.jar;C:\Program Files\Java\jdk1.6.0_14\jre\lib\sunrsasign.jar;C:\Program Files\Java\jdk1.6.0_14\jre\lib\jsse.jar;C:\Program Files\Java\jdk1.6.0_14\jre\lib\jce.jar;C:\Program Files\Java\jdk1.6.0_14\jre\lib\charsets.jar;C:\Program Files\Java\jdk1.6.0_14\jre\classes"/> + <property name="java.vendor" value="Sun Microsystems Inc."/> + <property name="localRepository" value="C:\Documents and Settings\Langlais\.m2\repository"/> + <property name="file.separator" value="\"/> + <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/> + <property name="sun.cpu.endian" value="little"/> + <property name="sun.io.unicode.encoding" value="UnicodeLittle"/> + <property name="sun.desktop" value="windows"/> + <property name="sun.cpu.isalist" value="pentium_pro+mmx pentium_pro pentium+mmx pentium i486 i386 i86"/> + </properties> + <testcase time="0" classname="org.nuiton.mapstoragemanager.core.BigTableLoaderTest" name="testGetBigTable"/> +</testsuite> \ No newline at end of file Added: trunk/mapstoragemanagerarch/target/surefire-reports/TEST-org.nuiton.mapstoragemanager.plugins.bighashmap.CellTest.xml =================================================================== --- trunk/mapstoragemanagerarch/target/surefire-reports/TEST-org.nuiton.mapstoragemanager.plugins.bighashmap.CellTest.xml (rev 0) +++ trunk/mapstoragemanagerarch/target/surefire-reports/TEST-org.nuiton.mapstoragemanager.plugins.bighashmap.CellTest.xml 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<testsuite failures="0" time="1.172" errors="0" skipped="0" tests="6" name="org.nuiton.mapstoragemanager.plugins.bighashmap.CellTest"> + <properties> + <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/> + <property name="sun.boot.library.path" value="C:\Program Files\Java\jdk1.6.0_14\jre\bin"/> + <property name="java.vm.version" value="14.0-b16"/> + <property name="java.vm.vendor" value="Sun Microsystems Inc."/> + <property name="java.vendor.url" value="http://java.sun.com/"/> + <property name="path.separator" value=";"/> + <property name="java.vm.name" value="Java HotSpot(TM) Client VM"/> + <property name="file.encoding.pkg" value="sun.io"/> + <property name="user.country" value="FR"/> + <property name="sun.java.launcher" value="SUN_STANDARD"/> + <property name="sun.os.patch.level" value="Service Pack 3"/> + <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/> + <property name="user.dir" value="E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch"/> + <property name="java.runtime.version" value="1.6.0_14-b08"/> + <property name="java.awt.graphicsenv" value="sun.awt.Win32GraphicsEnvironment"/> + <property name="basedir" value="E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch"/> + <property name="java.endorsed.dirs" value="C:\Program Files\Java\jdk1.6.0_14\jre\lib\endorsed"/> + <property name="os.arch" value="x86"/> + <property name="surefire.real.class.path" value="C:\DOCUME~1\Langlais\LOCALS~1\Temp\surefirebooter1727111557242088275.jar"/> + <property name="java.io.tmpdir" value="C:\DOCUME~1\Langlais\LOCALS~1\Temp\"/> + <property name="line.separator" value=" +"/> + <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/> + <property name="user.variant" value=""/> + <property name="os.name" value="Windows XP"/> + <property name="sun.jnu.encoding" value="Cp1252"/> + <property name="java.library.path" value="C:\Program Files\Java\jdk1.6.0_14\jre\bin;.;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\DivX\QuickTime Alternative\QTSystem\;C:\Program Files\TortoiseSVN\bin;C:\lcc\bin"/> + <property name="surefire.test.class.path" value="E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch\target\test-classes;E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch\target\classes;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\nuiton-utils\1.1.2\nuiton-utils-1.1.2.jar;C:\Documents and Settings\Langlais\.m2\repository\log4j\log4j\1.2.14\log4j-1.2.14.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-logging\commons-logging\1.1.1\commons-logging-1.1.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-primitives\commons-primitives\1.0\commons-primitives-1.0.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-collections\commons-collections\3.2.1\commons-collections-3.2.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-beanutils\commons-beanutils\1.8.2\commons-beanutils-1.8.2.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\i18n\nuiton-i18n-api\1.0.1\nuiton-i18n-api-1.0.1.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\jaxx\jaxx-runtime\2.0.0-beta-3\jaxx-runtime-2.0.0-beta-3.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-lang\commons-lang\2.4\commons-lang-2.4.jar;C:\Documents and Settings\Langlais\.m2\repository\javax\help\javahelp\2.0.02\javahelp-2.0.02.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\jxlayer\3.0.3\jxlayer-3.0.3.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-jxpath\commons-jxpath\1.3\commons-jxpath-1.3.jar;C:\Documents and Settings\Langlais\.m2\repository\com\opensymphony\xwork\2.1.3\xwork-2.1.3.jar;C:\Documents and Settings\Langlais\.m2\repository\opensymphony\ognl\2.6.11\ognl-2.6.11.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\jaxx\jaxx-widgets\2.0.0-beta-3\jaxx-widgets-2.0.0-beta-3.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\swingx\1.0\swingx-1.0.jar;C:\Documents and Settings\Langlais\.m2\repository\com\jhlabs\filters\2.0.235\filters-2.0.235.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\swing-worker\1.1\swing-worker-1.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-io\commons-io\1.4\commons-io-1.4.jar;C:\Documents and Settings\Langlais\.m2\repository\junit\junit\4.7\junit-4.7.jar;"/> + <property name="java.specification.name" value="Java Platform API Specification"/> + <property name="java.class.version" value="50.0"/> + <property name="sun.management.compiler" value="HotSpot Client Compiler"/> + <property name="os.version" value="5.1"/> + <property name="user.home" value="C:\Documents and Settings\Langlais"/> + <property name="user.timezone" value=""/> + <property name="java.awt.printerjob" value="sun.awt.windows.WPrinterJob"/> + <property name="java.specification.version" value="1.6"/> + <property name="file.encoding" value="Cp1252"/> + <property name="user.name" value="Langlais"/> + <property name="java.class.path" value="E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch\target\test-classes;E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch\target\classes;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\nuiton-utils\1.1.2\nuiton-utils-1.1.2.jar;C:\Documents and Settings\Langlais\.m2\repository\log4j\log4j\1.2.14\log4j-1.2.14.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-logging\commons-logging\1.1.1\commons-logging-1.1.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-primitives\commons-primitives\1.0\commons-primitives-1.0.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-collections\commons-collections\3.2.1\commons-collections-3.2.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-beanutils\commons-beanutils\1.8.2\commons-beanutils-1.8.2.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\i18n\nuiton-i18n-api\1.0.1\nuiton-i18n-api-1.0.1.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\jaxx\jaxx-runtime\2.0.0-beta-3\jaxx-runtime-2.0.0-beta-3.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-lang\commons-lang\2.4\commons-lang-2.4.jar;C:\Documents and Settings\Langlais\.m2\repository\javax\help\javahelp\2.0.02\javahelp-2.0.02.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\jxlayer\3.0.3\jxlayer-3.0.3.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-jxpath\commons-jxpath\1.3\commons-jxpath-1.3.jar;C:\Documents and Settings\Langlais\.m2\repository\com\opensymphony\xwork\2.1.3\xwork-2.1.3.jar;C:\Documents and Settings\Langlais\.m2\repository\opensymphony\ognl\2.6.11\ognl-2.6.11.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\jaxx\jaxx-widgets\2.0.0-beta-3\jaxx-widgets-2.0.0-beta-3.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\swingx\1.0\swingx-1.0.jar;C:\Documents and Settings\Langlais\.m2\repository\com\jhlabs\filters\2.0.235\filters-2.0.235.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\swing-worker\1.1\swing-worker-1.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-io\commons-io\1.4\commons-io-1.4.jar;C:\Documents and Settings\Langlais\.m2\repository\junit\junit\4.7\junit-4.7.jar;"/> + <property name="java.vm.specification.version" value="1.0"/> + <property name="sun.arch.data.model" value="32"/> + <property name="java.home" value="C:\Program Files\Java\jdk1.6.0_14\jre"/> + <property name="java.specification.vendor" value="Sun Microsystems Inc."/> + <property name="user.language" value="fr"/> + <property name="awt.toolkit" value="sun.awt.windows.WToolkit"/> + <property name="java.vm.info" value="mixed mode, sharing"/> + <property name="java.version" value="1.6.0_14"/> + <property name="java.ext.dirs" value="C:\Program Files\Java\jdk1.6.0_14\jre\lib\ext;C:\WINDOWS\Sun\Java\lib\ext"/> + <property name="sun.boot.class.path" value="C:\Program Files\Java\jdk1.6.0_14\jre\lib\resources.jar;C:\Program Files\Java\jdk1.6.0_14\jre\lib\rt.jar;C:\Program Files\Java\jdk1.6.0_14\jre\lib\sunrsasign.jar;C:\Program Files\Java\jdk1.6.0_14\jre\lib\jsse.jar;C:\Program Files\Java\jdk1.6.0_14\jre\lib\jce.jar;C:\Program Files\Java\jdk1.6.0_14\jre\lib\charsets.jar;C:\Program Files\Java\jdk1.6.0_14\jre\classes"/> + <property name="java.vendor" value="Sun Microsystems Inc."/> + <property name="localRepository" value="C:\Documents and Settings\Langlais\.m2\repository"/> + <property name="file.separator" value="\"/> + <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/> + <property name="sun.cpu.endian" value="little"/> + <property name="sun.io.unicode.encoding" value="UnicodeLittle"/> + <property name="sun.desktop" value="windows"/> + <property name="sun.cpu.isalist" value="pentium_pro+mmx pentium_pro pentium+mmx pentium i486 i386 i86"/> + </properties> + <testcase time="0.063" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.CellTest" name="testGetVoid"/> + <testcase time="0" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.CellTest" name="testHashCode"/> + <testcase time="0" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.CellTest" name="testEquals"/> + <testcase time="0" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.CellTest" name="testToString"/> + <testcase time="0" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.CellTest" name="testPut"/> + <testcase time="0" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.CellTest" name="testPutReput"/> +</testsuite> \ No newline at end of file Added: trunk/mapstoragemanagerarch/target/surefire-reports/TEST-org.nuiton.mapstoragemanager.plugins.bighashmap.ColumnTest.xml =================================================================== --- trunk/mapstoragemanagerarch/target/surefire-reports/TEST-org.nuiton.mapstoragemanager.plugins.bighashmap.ColumnTest.xml (rev 0) +++ trunk/mapstoragemanagerarch/target/surefire-reports/TEST-org.nuiton.mapstoragemanager.plugins.bighashmap.ColumnTest.xml 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<testsuite failures="0" time="0.141" errors="0" skipped="0" tests="7" name="org.nuiton.mapstoragemanager.plugins.bighashmap.ColumnTest"> + <properties> + <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/> + <property name="sun.boot.library.path" value="C:\Program Files\Java\jdk1.6.0_14\jre\bin"/> + <property name="java.vm.version" value="14.0-b16"/> + <property name="java.vm.vendor" value="Sun Microsystems Inc."/> + <property name="java.vendor.url" value="http://java.sun.com/"/> + <property name="path.separator" value=";"/> + <property name="java.vm.name" value="Java HotSpot(TM) Client VM"/> + <property name="file.encoding.pkg" value="sun.io"/> + <property name="user.country" value="FR"/> + <property name="sun.java.launcher" value="SUN_STANDARD"/> + <property name="sun.os.patch.level" value="Service Pack 3"/> + <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/> + <property name="user.dir" value="E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch"/> + <property name="java.runtime.version" value="1.6.0_14-b08"/> + <property name="java.awt.graphicsenv" value="sun.awt.Win32GraphicsEnvironment"/> + <property name="basedir" value="E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch"/> + <property name="java.endorsed.dirs" value="C:\Program Files\Java\jdk1.6.0_14\jre\lib\endorsed"/> + <property name="os.arch" value="x86"/> + <property name="surefire.real.class.path" value="C:\DOCUME~1\Langlais\LOCALS~1\Temp\surefirebooter1727111557242088275.jar"/> + <property name="java.io.tmpdir" value="C:\DOCUME~1\Langlais\LOCALS~1\Temp\"/> + <property name="line.separator" value=" +"/> + <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/> + <property name="user.variant" value=""/> + <property name="os.name" value="Windows XP"/> + <property name="sun.jnu.encoding" value="Cp1252"/> + <property name="java.library.path" value="C:\Program Files\Java\jdk1.6.0_14\jre\bin;.;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\DivX\QuickTime Alternative\QTSystem\;C:\Program Files\TortoiseSVN\bin;C:\lcc\bin"/> + <property name="surefire.test.class.path" value="E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch\target\test-classes;E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch\target\classes;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\nuiton-utils\1.1.2\nuiton-utils-1.1.2.jar;C:\Documents and Settings\Langlais\.m2\repository\log4j\log4j\1.2.14\log4j-1.2.14.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-logging\commons-logging\1.1.1\commons-logging-1.1.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-primitives\commons-primitives\1.0\commons-primitives-1.0.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-collections\commons-collections\3.2.1\commons-collections-3.2.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-beanutils\commons-beanutils\1.8.2\commons-beanutils-1.8.2.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\i18n\nuiton-i18n-api\1.0.1\nuiton-i18n-api-1.0.1.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\jaxx\jaxx-runtime\2.0.0-beta-3\jaxx-runtime-2.0.0-beta-3.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-lang\commons-lang\2.4\commons-lang-2.4.jar;C:\Documents and Settings\Langlais\.m2\repository\javax\help\javahelp\2.0.02\javahelp-2.0.02.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\jxlayer\3.0.3\jxlayer-3.0.3.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-jxpath\commons-jxpath\1.3\commons-jxpath-1.3.jar;C:\Documents and Settings\Langlais\.m2\repository\com\opensymphony\xwork\2.1.3\xwork-2.1.3.jar;C:\Documents and Settings\Langlais\.m2\repository\opensymphony\ognl\2.6.11\ognl-2.6.11.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\jaxx\jaxx-widgets\2.0.0-beta-3\jaxx-widgets-2.0.0-beta-3.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\swingx\1.0\swingx-1.0.jar;C:\Documents and Settings\Langlais\.m2\repository\com\jhlabs\filters\2.0.235\filters-2.0.235.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\swing-worker\1.1\swing-worker-1.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-io\commons-io\1.4\commons-io-1.4.jar;C:\Documents and Settings\Langlais\.m2\repository\junit\junit\4.7\junit-4.7.jar;"/> + <property name="java.specification.name" value="Java Platform API Specification"/> + <property name="java.class.version" value="50.0"/> + <property name="sun.management.compiler" value="HotSpot Client Compiler"/> + <property name="os.version" value="5.1"/> + <property name="user.home" value="C:\Documents and Settings\Langlais"/> + <property name="user.timezone" value=""/> + <property name="java.awt.printerjob" value="sun.awt.windows.WPrinterJob"/> + <property name="java.specification.version" value="1.6"/> + <property name="file.encoding" value="Cp1252"/> + <property name="user.name" value="Langlais"/> + <property name="java.class.path" value="E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch\target\test-classes;E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch\target\classes;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\nuiton-utils\1.1.2\nuiton-utils-1.1.2.jar;C:\Documents and Settings\Langlais\.m2\repository\log4j\log4j\1.2.14\log4j-1.2.14.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-logging\commons-logging\1.1.1\commons-logging-1.1.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-primitives\commons-primitives\1.0\commons-primitives-1.0.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-collections\commons-collections\3.2.1\commons-collections-3.2.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-beanutils\commons-beanutils\1.8.2\commons-beanutils-1.8.2.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\i18n\nuiton-i18n-api\1.0.1\nuiton-i18n-api-1.0.1.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\jaxx\jaxx-runtime\2.0.0-beta-3\jaxx-runtime-2.0.0-beta-3.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-lang\commons-lang\2.4\commons-lang-2.4.jar;C:\Documents and Settings\Langlais\.m2\repository\javax\help\javahelp\2.0.02\javahelp-2.0.02.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\jxlayer\3.0.3\jxlayer-3.0.3.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-jxpath\commons-jxpath\1.3\commons-jxpath-1.3.jar;C:\Documents and Settings\Langlais\.m2\repository\com\opensymphony\xwork\2.1.3\xwork-2.1.3.jar;C:\Documents and Settings\Langlais\.m2\repository\opensymphony\ognl\2.6.11\ognl-2.6.11.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\jaxx\jaxx-widgets\2.0.0-beta-3\jaxx-widgets-2.0.0-beta-3.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\swingx\1.0\swingx-1.0.jar;C:\Documents and Settings\Langlais\.m2\repository\com\jhlabs\filters\2.0.235\filters-2.0.235.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\swing-worker\1.1\swing-worker-1.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-io\commons-io\1.4\commons-io-1.4.jar;C:\Documents and Settings\Langlais\.m2\repository\junit\junit\4.7\junit-4.7.jar;"/> + <property name="java.vm.specification.version" value="1.0"/> + <property name="sun.arch.data.model" value="32"/> + <property name="java.home" value="C:\Program Files\Java\jdk1.6.0_14\jre"/> + <property name="java.specification.vendor" value="Sun Microsystems Inc."/> + <property name="user.language" value="fr"/> + <property name="awt.toolkit" value="sun.awt.windows.WToolkit"/> + <property name="java.vm.info" value="mixed mode, sharing"/> + <property name="java.version" value="1.6.0_14"/> + <property name="java.ext.dirs" value="C:\Program Files\Java\jdk1.6.0_14\jre\lib\ext;C:\WINDOWS\Sun\Java\lib\ext"/> + <property name="sun.boot.class.path" value="C:\Program Files\Java\jdk1.6.0_14\jre\lib\resources.jar;C:\Program Files\Java\jdk1.6.0_14\jre\lib\rt.jar;C:\Program Files\Java\jdk1.6.0_14\jre\lib\sunrsasign.jar;C:\Program Files\Java\jdk1.6.0_14\jre\lib\jsse.jar;C:\Program Files\Java\jdk1.6.0_14\jre\lib\jce.jar;C:\Program Files\Java\jdk1.6.0_14\jre\lib\charsets.jar;C:\Program Files\Java\jdk1.6.0_14\jre\classes"/> + <property name="java.vendor" value="Sun Microsystems Inc."/> + <property name="localRepository" value="C:\Documents and Settings\Langlais\.m2\repository"/> + <property name="file.separator" value="\"/> + <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/> + <property name="sun.cpu.endian" value="little"/> + <property name="sun.io.unicode.encoding" value="UnicodeLittle"/> + <property name="sun.desktop" value="windows"/> + <property name="sun.cpu.isalist" value="pentium_pro+mmx pentium_pro pentium+mmx pentium i486 i386 i86"/> + </properties> + <testcase time="0.047" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.ColumnTest" name="testGetVoid"/> + <testcase time="0" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.ColumnTest" name="testPutAndGet"/> + <testcase time="0" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.ColumnTest" name="testDelete"/> + <testcase time="0" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.ColumnTest" name="testHashCode"/> + <testcase time="0.016" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.ColumnTest" name="testEquals"/> + <testcase time="0" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.ColumnTest" name="testToString"/> + <testcase time="0" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.ColumnTest" name="testGetKeys"/> +</testsuite> \ No newline at end of file Added: trunk/mapstoragemanagerarch/target/surefire-reports/TEST-org.nuiton.mapstoragemanager.plugins.bighashmap.RowTest.xml =================================================================== --- trunk/mapstoragemanagerarch/target/surefire-reports/TEST-org.nuiton.mapstoragemanager.plugins.bighashmap.RowTest.xml (rev 0) +++ trunk/mapstoragemanagerarch/target/surefire-reports/TEST-org.nuiton.mapstoragemanager.plugins.bighashmap.RowTest.xml 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<testsuite failures="0" time="0.188" errors="0" skipped="0" tests="4" name="org.nuiton.mapstoragemanager.plugins.bighashmap.RowTest"> + <properties> + <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/> + <property name="sun.boot.library.path" value="C:\Program Files\Java\jdk1.6.0_14\jre\bin"/> + <property name="java.vm.version" value="14.0-b16"/> + <property name="java.vm.vendor" value="Sun Microsystems Inc."/> + <property name="java.vendor.url" value="http://java.sun.com/"/> + <property name="path.separator" value=";"/> + <property name="java.vm.name" value="Java HotSpot(TM) Client VM"/> + <property name="file.encoding.pkg" value="sun.io"/> + <property name="user.country" value="FR"/> + <property name="sun.java.launcher" value="SUN_STANDARD"/> + <property name="sun.os.patch.level" value="Service Pack 3"/> + <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/> + <property name="user.dir" value="E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch"/> + <property name="java.runtime.version" value="1.6.0_14-b08"/> + <property name="java.awt.graphicsenv" value="sun.awt.Win32GraphicsEnvironment"/> + <property name="basedir" value="E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch"/> + <property name="java.endorsed.dirs" value="C:\Program Files\Java\jdk1.6.0_14\jre\lib\endorsed"/> + <property name="os.arch" value="x86"/> + <property name="surefire.real.class.path" value="C:\DOCUME~1\Langlais\LOCALS~1\Temp\surefirebooter1727111557242088275.jar"/> + <property name="java.io.tmpdir" value="C:\DOCUME~1\Langlais\LOCALS~1\Temp\"/> + <property name="line.separator" value=" +"/> + <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/> + <property name="user.variant" value=""/> + <property name="os.name" value="Windows XP"/> + <property name="sun.jnu.encoding" value="Cp1252"/> + <property name="java.library.path" value="C:\Program Files\Java\jdk1.6.0_14\jre\bin;.;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\DivX\QuickTime Alternative\QTSystem\;C:\Program Files\TortoiseSVN\bin;C:\lcc\bin"/> + <property name="surefire.test.class.path" value="E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch\target\test-classes;E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch\target\classes;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\nuiton-utils\1.1.2\nuiton-utils-1.1.2.jar;C:\Documents and Settings\Langlais\.m2\repository\log4j\log4j\1.2.14\log4j-1.2.14.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-logging\commons-logging\1.1.1\commons-logging-1.1.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-primitives\commons-primitives\1.0\commons-primitives-1.0.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-collections\commons-collections\3.2.1\commons-collections-3.2.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-beanutils\commons-beanutils\1.8.2\commons-beanutils-1.8.2.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\i18n\nuiton-i18n-api\1.0.1\nuiton-i18n-api-1.0.1.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\jaxx\jaxx-runtime\2.0.0-beta-3\jaxx-runtime-2.0.0-beta-3.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-lang\commons-lang\2.4\commons-lang-2.4.jar;C:\Documents and Settings\Langlais\.m2\repository\javax\help\javahelp\2.0.02\javahelp-2.0.02.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\jxlayer\3.0.3\jxlayer-3.0.3.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-jxpath\commons-jxpath\1.3\commons-jxpath-1.3.jar;C:\Documents and Settings\Langlais\.m2\repository\com\opensymphony\xwork\2.1.3\xwork-2.1.3.jar;C:\Documents and Settings\Langlais\.m2\repository\opensymphony\ognl\2.6.11\ognl-2.6.11.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\jaxx\jaxx-widgets\2.0.0-beta-3\jaxx-widgets-2.0.0-beta-3.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\swingx\1.0\swingx-1.0.jar;C:\Documents and Settings\Langlais\.m2\repository\com\jhlabs\filters\2.0.235\filters-2.0.235.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\swing-worker\1.1\swing-worker-1.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-io\commons-io\1.4\commons-io-1.4.jar;C:\Documents and Settings\Langlais\.m2\repository\junit\junit\4.7\junit-4.7.jar;"/> + <property name="java.specification.name" value="Java Platform API Specification"/> + <property name="java.class.version" value="50.0"/> + <property name="sun.management.compiler" value="HotSpot Client Compiler"/> + <property name="os.version" value="5.1"/> + <property name="user.home" value="C:\Documents and Settings\Langlais"/> + <property name="user.timezone" value=""/> + <property name="java.awt.printerjob" value="sun.awt.windows.WPrinterJob"/> + <property name="java.specification.version" value="1.6"/> + <property name="file.encoding" value="Cp1252"/> + <property name="user.name" value="Langlais"/> + <property name="java.class.path" value="E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch\target\test-classes;E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch\target\classes;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\nuiton-utils\1.1.2\nuiton-utils-1.1.2.jar;C:\Documents and Settings\Langlais\.m2\repository\log4j\log4j\1.2.14\log4j-1.2.14.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-logging\commons-logging\1.1.1\commons-logging-1.1.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-primitives\commons-primitives\1.0\commons-primitives-1.0.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-collections\commons-collections\3.2.1\commons-collections-3.2.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-beanutils\commons-beanutils\1.8.2\commons-beanutils-1.8.2.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\i18n\nuiton-i18n-api\1.0.1\nuiton-i18n-api-1.0.1.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\jaxx\jaxx-runtime\2.0.0-beta-3\jaxx-runtime-2.0.0-beta-3.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-lang\commons-lang\2.4\commons-lang-2.4.jar;C:\Documents and Settings\Langlais\.m2\repository\javax\help\javahelp\2.0.02\javahelp-2.0.02.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\jxlayer\3.0.3\jxlayer-3.0.3.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-jxpath\commons-jxpath\1.3\commons-jxpath-1.3.jar;C:\Documents and Settings\Langlais\.m2\repository\com\opensymphony\xwork\2.1.3\xwork-2.1.3.jar;C:\Documents and Settings\Langlais\.m2\repository\opensymphony\ognl\2.6.11\ognl-2.6.11.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\jaxx\jaxx-widgets\2.0.0-beta-3\jaxx-widgets-2.0.0-beta-3.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\swingx\1.0\swingx-1.0.jar;C:\Documents and Settings\Langlais\.m2\repository\com\jhlabs\filters\2.0.235\filters-2.0.235.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\swing-worker\1.1\swing-worker-1.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-io\commons-io\1.4\commons-io-1.4.jar;C:\Documents and Settings\Langlais\.m2\repository\junit\junit\4.7\junit-4.7.jar;"/> + <property name="java.vm.specification.version" value="1.0"/> + <property name="sun.arch.data.model" value="32"/> + <property name="java.home" value="C:\Program Files\Java\jdk1.6.0_14\jre"/> + <property name="java.specification.vendor" value="Sun Microsystems Inc."/> + <property name="user.language" value="fr"/> + <property name="awt.toolkit" value="sun.awt.windows.WToolkit"/> + <property name="java.vm.info" value="mixed mode, sharing"/> + <property name="java.version" value="1.6.0_14"/> + <property name="java.ext.dirs" value="C:\Program Files\Java\jdk1.6.0_14\jre\lib\ext;C:\WINDOWS\Sun\Java\lib\ext"/> + <property name="sun.boot.class.path" value="C:\Program Files\Java\jdk1.6.0_14\jre\lib\resources.jar;C:\Program Files\Java\jdk1.6.0_14\jre\lib\rt.jar;C:\Program Files\Java\jdk1.6.0_14\jre\lib\sunrsasign.jar;C:\Program Files\Java\jdk1.6.0_14\jre\lib\jsse.jar;C:\Program Files\Java\jdk1.6.0_14\jre\lib\jce.jar;C:\Program Files\Java\jdk1.6.0_14\jre\lib\charsets.jar;C:\Program Files\Java\jdk1.6.0_14\jre\classes"/> + <property name="java.vendor" value="Sun Microsystems Inc."/> + <property name="localRepository" value="C:\Documents and Settings\Langlais\.m2\repository"/> + <property name="file.separator" value="\"/> + <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/> + <property name="sun.cpu.endian" value="little"/> + <property name="sun.io.unicode.encoding" value="UnicodeLittle"/> + <property name="sun.desktop" value="windows"/> + <property name="sun.cpu.isalist" value="pentium_pro+mmx pentium_pro pentium+mmx pentium i486 i386 i86"/> + </properties> + <testcase time="0.078" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.RowTest" name="testToString"/> + <testcase time="0" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.RowTest" name="testGetRowContent"/> + <testcase time="0" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.RowTest" name="testGetRowStructure"/> + <testcase time="0" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.RowTest" name="testGetContent"/> +</testsuite> \ No newline at end of file Added: trunk/mapstoragemanagerarch/target/surefire-reports/TEST-org.nuiton.mapstoragemanager.plugins.bighashmap.StructureTest.xml =================================================================== --- trunk/mapstoragemanagerarch/target/surefire-reports/TEST-org.nuiton.mapstoragemanager.plugins.bighashmap.StructureTest.xml (rev 0) +++ trunk/mapstoragemanagerarch/target/surefire-reports/TEST-org.nuiton.mapstoragemanager.plugins.bighashmap.StructureTest.xml 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<testsuite failures="0" time="0.016" errors="0" skipped="0" tests="6" name="org.nuiton.mapstoragemanager.plugins.bighashmap.StructureTest"> + <properties> + <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/> + <property name="sun.boot.library.path" value="C:\Program Files\Java\jdk1.6.0_14\jre\bin"/> + <property name="java.vm.version" value="14.0-b16"/> + <property name="java.vm.vendor" value="Sun Microsystems Inc."/> + <property name="java.vendor.url" value="http://java.sun.com/"/> + <property name="path.separator" value=";"/> + <property name="java.vm.name" value="Java HotSpot(TM) Client VM"/> + <property name="file.encoding.pkg" value="sun.io"/> + <property name="user.country" value="FR"/> + <property name="sun.java.launcher" value="SUN_STANDARD"/> + <property name="sun.os.patch.level" value="Service Pack 3"/> + <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/> + <property name="user.dir" value="E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch"/> + <property name="java.runtime.version" value="1.6.0_14-b08"/> + <property name="java.awt.graphicsenv" value="sun.awt.Win32GraphicsEnvironment"/> + <property name="basedir" value="E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch"/> + <property name="java.endorsed.dirs" value="C:\Program Files\Java\jdk1.6.0_14\jre\lib\endorsed"/> + <property name="os.arch" value="x86"/> + <property name="surefire.real.class.path" value="C:\DOCUME~1\Langlais\LOCALS~1\Temp\surefirebooter1727111557242088275.jar"/> + <property name="java.io.tmpdir" value="C:\DOCUME~1\Langlais\LOCALS~1\Temp\"/> + <property name="line.separator" value=" +"/> + <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/> + <property name="user.variant" value=""/> + <property name="os.name" value="Windows XP"/> + <property name="sun.jnu.encoding" value="Cp1252"/> + <property name="java.library.path" value="C:\Program Files\Java\jdk1.6.0_14\jre\bin;.;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\DivX\QuickTime Alternative\QTSystem\;C:\Program Files\TortoiseSVN\bin;C:\lcc\bin"/> + <property name="surefire.test.class.path" value="E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch\target\test-classes;E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch\target\classes;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\nuiton-utils\1.1.2\nuiton-utils-1.1.2.jar;C:\Documents and Settings\Langlais\.m2\repository\log4j\log4j\1.2.14\log4j-1.2.14.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-logging\commons-logging\1.1.1\commons-logging-1.1.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-primitives\commons-primitives\1.0\commons-primitives-1.0.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-collections\commons-collections\3.2.1\commons-collections-3.2.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-beanutils\commons-beanutils\1.8.2\commons-beanutils-1.8.2.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\i18n\nuiton-i18n-api\1.0.1\nuiton-i18n-api-1.0.1.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\jaxx\jaxx-runtime\2.0.0-beta-3\jaxx-runtime-2.0.0-beta-3.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-lang\commons-lang\2.4\commons-lang-2.4.jar;C:\Documents and Settings\Langlais\.m2\repository\javax\help\javahelp\2.0.02\javahelp-2.0.02.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\jxlayer\3.0.3\jxlayer-3.0.3.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-jxpath\commons-jxpath\1.3\commons-jxpath-1.3.jar;C:\Documents and Settings\Langlais\.m2\repository\com\opensymphony\xwork\2.1.3\xwork-2.1.3.jar;C:\Documents and Settings\Langlais\.m2\repository\opensymphony\ognl\2.6.11\ognl-2.6.11.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\jaxx\jaxx-widgets\2.0.0-beta-3\jaxx-widgets-2.0.0-beta-3.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\swingx\1.0\swingx-1.0.jar;C:\Documents and Settings\Langlais\.m2\repository\com\jhlabs\filters\2.0.235\filters-2.0.235.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\swing-worker\1.1\swing-worker-1.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-io\commons-io\1.4\commons-io-1.4.jar;C:\Documents and Settings\Langlais\.m2\repository\junit\junit\4.7\junit-4.7.jar;"/> + <property name="java.specification.name" value="Java Platform API Specification"/> + <property name="java.class.version" value="50.0"/> + <property name="sun.management.compiler" value="HotSpot Client Compiler"/> + <property name="os.version" value="5.1"/> + <property name="user.home" value="C:\Documents and Settings\Langlais"/> + <property name="user.timezone" value=""/> + <property name="java.awt.printerjob" value="sun.awt.windows.WPrinterJob"/> + <property name="java.specification.version" value="1.6"/> + <property name="file.encoding" value="Cp1252"/> + <property name="user.name" value="Langlais"/> + <property name="java.class.path" value="E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch\target\test-classes;E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch\target\classes;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\nuiton-utils\1.1.2\nuiton-utils-1.1.2.jar;C:\Documents and Settings\Langlais\.m2\repository\log4j\log4j\1.2.14\log4j-1.2.14.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-logging\commons-logging\1.1.1\commons-logging-1.1.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-primitives\commons-primitives\1.0\commons-primitives-1.0.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-collections\commons-collections\3.2.1\commons-collections-3.2.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-beanutils\commons-beanutils\1.8.2\commons-beanutils-1.8.2.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\i18n\nuiton-i18n-api\1.0.1\nuiton-i18n-api-1.0.1.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\jaxx\jaxx-runtime\2.0.0-beta-3\jaxx-runtime-2.0.0-beta-3.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-lang\commons-lang\2.4\commons-lang-2.4.jar;C:\Documents and Settings\Langlais\.m2\repository\javax\help\javahelp\2.0.02\javahelp-2.0.02.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\jxlayer\3.0.3\jxlayer-3.0.3.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-jxpath\commons-jxpath\1.3\commons-jxpath-1.3.jar;C:\Documents and Settings\Langlais\.m2\repository\com\opensymphony\xwork\2.1.3\xwork-2.1.3.jar;C:\Documents and Settings\Langlais\.m2\repository\opensymphony\ognl\2.6.11\ognl-2.6.11.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\jaxx\jaxx-widgets\2.0.0-beta-3\jaxx-widgets-2.0.0-beta-3.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\swingx\1.0\swingx-1.0.jar;C:\Documents and Settings\Langlais\.m2\repository\com\jhlabs\filters\2.0.235\filters-2.0.235.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\swing-worker\1.1\swing-worker-1.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-io\commons-io\1.4\commons-io-1.4.jar;C:\Documents and Settings\Langlais\.m2\repository\junit\junit\4.7\junit-4.7.jar;"/> + <property name="java.vm.specification.version" value="1.0"/> + <property name="sun.arch.data.model" value="32"/> + <property name="java.home" value="C:\Program Files\Java\jdk1.6.0_14\jre"/> + <property name="java.specification.vendor" value="Sun Microsystems Inc."/> + <property name="user.language" value="fr"/> + <property name="awt.toolkit" value="sun.awt.windows.WToolkit"/> + <property name="java.vm.info" value="mixed mode, sharing"/> + <property name="java.version" value="1.6.0_14"/> + <property name="java.ext.dirs" value="C:\Program Files\Java\jdk1.6.0_14\jre\lib\ext;C:\WINDOWS\Sun\Java\lib\ext"/> + <property name="sun.boot.class.path" value="C:\Program Files\Java\jdk1.6.0_14\jre\lib\resources.jar;C:\Program Files\Java\jdk1.6.0_14\jre\lib\rt.jar;C:\Program Files\Java\jdk1.6.0_14\jre\lib\sunrsasign.jar;C:\Program Files\Java\jdk1.6.0_14\jre\lib\jsse.jar;C:\Program Files\Java\jdk1.6.0_14\jre\lib\jce.jar;C:\Program Files\Java\jdk1.6.0_14\jre\lib\charsets.jar;C:\Program Files\Java\jdk1.6.0_14\jre\classes"/> + <property name="java.vendor" value="Sun Microsystems Inc."/> + <property name="localRepository" value="C:\Documents and Settings\Langlais\.m2\repository"/> + <property name="file.separator" value="\"/> + <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/> + <property name="sun.cpu.endian" value="little"/> + <property name="sun.io.unicode.encoding" value="UnicodeLittle"/> + <property name="sun.desktop" value="windows"/> + <property name="sun.cpu.isalist" value="pentium_pro+mmx pentium_pro pentium+mmx pentium i486 i386 i86"/> + </properties> + <testcase time="0" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.StructureTest" name="testHashCode"/> + <testcase time="0" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.StructureTest" name="testGetColumnsNamesVoid"/> + <testcase time="0" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.StructureTest" name="testAddColumn"/> + <testcase time="0" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.StructureTest" name="testRemoveColumn"/> + <testcase time="0" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.StructureTest" name="testGetColumnsNames"/> + <testcase time="0" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.StructureTest" name="testGetColumnClass"/> +</testsuite> \ No newline at end of file Added: trunk/mapstoragemanagerarch/target/surefire-reports/TEST-org.nuiton.mapstoragemanager.plugins.bighashmap.TableTest.xml =================================================================== --- trunk/mapstoragemanagerarch/target/surefire-reports/TEST-org.nuiton.mapstoragemanager.plugins.bighashmap.TableTest.xml (rev 0) +++ trunk/mapstoragemanagerarch/target/surefire-reports/TEST-org.nuiton.mapstoragemanager.plugins.bighashmap.TableTest.xml 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<testsuite failures="0" time="0.125" errors="0" skipped="0" tests="8" name="org.nuiton.mapstoragemanager.plugins.bighashmap.TableTest"> + <properties> + <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/> + <property name="sun.boot.library.path" value="C:\Program Files\Java\jdk1.6.0_14\jre\bin"/> + <property name="java.vm.version" value="14.0-b16"/> + <property name="java.vm.vendor" value="Sun Microsystems Inc."/> + <property name="java.vendor.url" value="http://java.sun.com/"/> + <property name="path.separator" value=";"/> + <property name="java.vm.name" value="Java HotSpot(TM) Client VM"/> + <property name="file.encoding.pkg" value="sun.io"/> + <property name="user.country" value="FR"/> + <property name="sun.java.launcher" value="SUN_STANDARD"/> + <property name="sun.os.patch.level" value="Service Pack 3"/> + <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/> + <property name="user.dir" value="E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch"/> + <property name="java.runtime.version" value="1.6.0_14-b08"/> + <property name="java.awt.graphicsenv" value="sun.awt.Win32GraphicsEnvironment"/> + <property name="basedir" value="E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch"/> + <property name="java.endorsed.dirs" value="C:\Program Files\Java\jdk1.6.0_14\jre\lib\endorsed"/> + <property name="os.arch" value="x86"/> + <property name="surefire.real.class.path" value="C:\DOCUME~1\Langlais\LOCALS~1\Temp\surefirebooter1727111557242088275.jar"/> + <property name="java.io.tmpdir" value="C:\DOCUME~1\Langlais\LOCALS~1\Temp\"/> + <property name="line.separator" value=" +"/> + <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/> + <property name="user.variant" value=""/> + <property name="os.name" value="Windows XP"/> + <property name="sun.jnu.encoding" value="Cp1252"/> + <property name="java.library.path" value="C:\Program Files\Java\jdk1.6.0_14\jre\bin;.;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\DivX\QuickTime Alternative\QTSystem\;C:\Program Files\TortoiseSVN\bin;C:\lcc\bin"/> + <property name="surefire.test.class.path" value="E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch\target\test-classes;E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch\target\classes;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\nuiton-utils\1.1.2\nuiton-utils-1.1.2.jar;C:\Documents and Settings\Langlais\.m2\repository\log4j\log4j\1.2.14\log4j-1.2.14.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-logging\commons-logging\1.1.1\commons-logging-1.1.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-primitives\commons-primitives\1.0\commons-primitives-1.0.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-collections\commons-collections\3.2.1\commons-collections-3.2.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-beanutils\commons-beanutils\1.8.2\commons-beanutils-1.8.2.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\i18n\nuiton-i18n-api\1.0.1\nuiton-i18n-api-1.0.1.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\jaxx\jaxx-runtime\2.0.0-beta-3\jaxx-runtime-2.0.0-beta-3.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-lang\commons-lang\2.4\commons-lang-2.4.jar;C:\Documents and Settings\Langlais\.m2\repository\javax\help\javahelp\2.0.02\javahelp-2.0.02.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\jxlayer\3.0.3\jxlayer-3.0.3.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-jxpath\commons-jxpath\1.3\commons-jxpath-1.3.jar;C:\Documents and Settings\Langlais\.m2\repository\com\opensymphony\xwork\2.1.3\xwork-2.1.3.jar;C:\Documents and Settings\Langlais\.m2\repository\opensymphony\ognl\2.6.11\ognl-2.6.11.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\jaxx\jaxx-widgets\2.0.0-beta-3\jaxx-widgets-2.0.0-beta-3.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\swingx\1.0\swingx-1.0.jar;C:\Documents and Settings\Langlais\.m2\repository\com\jhlabs\filters\2.0.235\filters-2.0.235.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\swing-worker\1.1\swing-worker-1.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-io\commons-io\1.4\commons-io-1.4.jar;C:\Documents and Settings\Langlais\.m2\repository\junit\junit\4.7\junit-4.7.jar;"/> + <property name="java.specification.name" value="Java Platform API Specification"/> + <property name="java.class.version" value="50.0"/> + <property name="sun.management.compiler" value="HotSpot Client Compiler"/> + <property name="os.version" value="5.1"/> + <property name="user.home" value="C:\Documents and Settings\Langlais"/> + <property name="user.timezone" value=""/> + <property name="java.awt.printerjob" value="sun.awt.windows.WPrinterJob"/> + <property name="java.specification.version" value="1.6"/> + <property name="file.encoding" value="Cp1252"/> + <property name="user.name" value="Langlais"/> + <property name="java.class.path" value="E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch\target\test-classes;E:\Devel\workspace\workspacePFE\mapstoragemanager\mapstoragemanagerarch\target\classes;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\nuiton-utils\1.1.2\nuiton-utils-1.1.2.jar;C:\Documents and Settings\Langlais\.m2\repository\log4j\log4j\1.2.14\log4j-1.2.14.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-logging\commons-logging\1.1.1\commons-logging-1.1.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-primitives\commons-primitives\1.0\commons-primitives-1.0.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-collections\commons-collections\3.2.1\commons-collections-3.2.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-beanutils\commons-beanutils\1.8.2\commons-beanutils-1.8.2.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\i18n\nuiton-i18n-api\1.0.1\nuiton-i18n-api-1.0.1.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\jaxx\jaxx-runtime\2.0.0-beta-3\jaxx-runtime-2.0.0-beta-3.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-lang\commons-lang\2.4\commons-lang-2.4.jar;C:\Documents and Settings\Langlais\.m2\repository\javax\help\javahelp\2.0.02\javahelp-2.0.02.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\jxlayer\3.0.3\jxlayer-3.0.3.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-jxpath\commons-jxpath\1.3\commons-jxpath-1.3.jar;C:\Documents and Settings\Langlais\.m2\repository\com\opensymphony\xwork\2.1.3\xwork-2.1.3.jar;C:\Documents and Settings\Langlais\.m2\repository\opensymphony\ognl\2.6.11\ognl-2.6.11.jar;C:\Documents and Settings\Langlais\.m2\repository\org\nuiton\jaxx\jaxx-widgets\2.0.0-beta-3\jaxx-widgets-2.0.0-beta-3.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\swingx\1.0\swingx-1.0.jar;C:\Documents and Settings\Langlais\.m2\repository\com\jhlabs\filters\2.0.235\filters-2.0.235.jar;C:\Documents and Settings\Langlais\.m2\repository\org\swinglabs\swing-worker\1.1\swing-worker-1.1.jar;C:\Documents and Settings\Langlais\.m2\repository\commons-io\commons-io\1.4\commons-io-1.4.jar;C:\Documents and Settings\Langlais\.m2\repository\junit\junit\4.7\junit-4.7.jar;"/> + <property name="java.vm.specification.version" value="1.0"/> + <property name="sun.arch.data.model" value="32"/> + <property name="java.home" value="C:\Program Files\Java\jdk1.6.0_14\jre"/> + <property name="java.specification.vendor" value="Sun Microsystems Inc."/> + <property name="user.language" value="fr"/> + <property name="awt.toolkit" value="sun.awt.windows.WToolkit"/> + <property name="java.vm.info" value="mixed mode, sharing"/> + <property name="java.version" value="1.6.0_14"/> + <property name="java.ext.dirs" value="C:\Program Files\Java\jdk1.6.0_14\jre\lib\ext;C:\WINDOWS\Sun\Java\lib\ext"/> + <property name="sun.boot.class.path" value="C:\Program Files\Java\jdk1.6.0_14\jre\lib\resources.jar;C:\Program Files\Java\jdk1.6.0_14\jre\lib\rt.jar;C:\Program Files\Java\jdk1.6.0_14\jre\lib\sunrsasign.jar;C:\Program Files\Java\jdk1.6.0_14\jre\lib\jsse.jar;C:\Program Files\Java\jdk1.6.0_14\jre\lib\jce.jar;C:\Program Files\Java\jdk1.6.0_14\jre\lib\charsets.jar;C:\Program Files\Java\jdk1.6.0_14\jre\classes"/> + <property name="java.vendor" value="Sun Microsystems Inc."/> + <property name="localRepository" value="C:\Documents and Settings\Langlais\.m2\repository"/> + <property name="file.separator" value="\"/> + <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/> + <property name="sun.cpu.endian" value="little"/> + <property name="sun.io.unicode.encoding" value="UnicodeLittle"/> + <property name="sun.desktop" value="windows"/> + <property name="sun.cpu.isalist" value="pentium_pro+mmx pentium_pro pentium+mmx pentium i486 i386 i86"/> + </properties> + <testcase time="0.047" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.TableTest" name="testDelete"/> + <testcase time="0" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.TableTest" name="testGetKeys"/> + <testcase time="0" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.TableTest" name="testRemoveColumn"/> + <testcase time="0.015" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.TableTest" name="testPut"/> + <testcase time="0" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.TableTest" name="testNewTable"/> + <testcase time="0" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.TableTest" name="testCreateColumn"/> + <testcase time="0" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.TableTest" name="testGet"/> + <testcase time="0" classname="org.nuiton.mapstoragemanager.plugins.bighashmap.TableTest" name="testPutAndGetWithVersion"/> +</testsuite> \ No newline at end of file Added: trunk/mapstoragemanagerarch/target/surefire-reports/org.nuiton.mapstoragemanager.core.BigTableLoaderTest.txt =================================================================== --- trunk/mapstoragemanagerarch/target/surefire-reports/org.nuiton.mapstoragemanager.core.BigTableLoaderTest.txt (rev 0) +++ trunk/mapstoragemanagerarch/target/surefire-reports/org.nuiton.mapstoragemanager.core.BigTableLoaderTest.txt 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: org.nuiton.mapstoragemanager.core.BigTableLoaderTest +------------------------------------------------------------------------------- +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.328 sec Added: trunk/mapstoragemanagerarch/target/surefire-reports/org.nuiton.mapstoragemanager.plugins.bighashmap.CellTest.txt =================================================================== --- trunk/mapstoragemanagerarch/target/surefire-reports/org.nuiton.mapstoragemanager.plugins.bighashmap.CellTest.txt (rev 0) +++ trunk/mapstoragemanagerarch/target/surefire-reports/org.nuiton.mapstoragemanager.plugins.bighashmap.CellTest.txt 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: org.nuiton.mapstoragemanager.plugins.bighashmap.CellTest +------------------------------------------------------------------------------- +Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.25 sec Added: trunk/mapstoragemanagerarch/target/surefire-reports/org.nuiton.mapstoragemanager.plugins.bighashmap.ColumnTest.txt =================================================================== --- trunk/mapstoragemanagerarch/target/surefire-reports/org.nuiton.mapstoragemanager.plugins.bighashmap.ColumnTest.txt (rev 0) +++ trunk/mapstoragemanagerarch/target/surefire-reports/org.nuiton.mapstoragemanager.plugins.bighashmap.ColumnTest.txt 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: org.nuiton.mapstoragemanager.plugins.bighashmap.ColumnTest +------------------------------------------------------------------------------- +Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.219 sec Added: trunk/mapstoragemanagerarch/target/surefire-reports/org.nuiton.mapstoragemanager.plugins.bighashmap.RowTest.txt =================================================================== --- trunk/mapstoragemanagerarch/target/surefire-reports/org.nuiton.mapstoragemanager.plugins.bighashmap.RowTest.txt (rev 0) +++ trunk/mapstoragemanagerarch/target/surefire-reports/org.nuiton.mapstoragemanager.plugins.bighashmap.RowTest.txt 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: org.nuiton.mapstoragemanager.plugins.bighashmap.RowTest +------------------------------------------------------------------------------- +Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.25 sec Added: trunk/mapstoragemanagerarch/target/surefire-reports/org.nuiton.mapstoragemanager.plugins.bighashmap.StructureTest.txt =================================================================== --- trunk/mapstoragemanagerarch/target/surefire-reports/org.nuiton.mapstoragemanager.plugins.bighashmap.StructureTest.txt (rev 0) +++ trunk/mapstoragemanagerarch/target/surefire-reports/org.nuiton.mapstoragemanager.plugins.bighashmap.StructureTest.txt 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: org.nuiton.mapstoragemanager.plugins.bighashmap.StructureTest +------------------------------------------------------------------------------- +Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.094 sec Added: trunk/mapstoragemanagerarch/target/surefire-reports/org.nuiton.mapstoragemanager.plugins.bighashmap.TableTest.txt =================================================================== --- trunk/mapstoragemanagerarch/target/surefire-reports/org.nuiton.mapstoragemanager.plugins.bighashmap.TableTest.txt (rev 0) +++ trunk/mapstoragemanagerarch/target/surefire-reports/org.nuiton.mapstoragemanager.plugins.bighashmap.TableTest.txt 2010-02-06 22:29:39 UTC (rev 53) @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: org.nuiton.mapstoragemanager.plugins.bighashmap.TableTest +------------------------------------------------------------------------------- +Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.188 sec Added: trunk/mapstoragemanagerarch/target/test-classes/log4j.properties =================================================================== --- trunk/mapstoragemanagerarch/target/test-classes/log4j.properties (rev 0) +++ trunk/mapstoragemanagerarch/target/test-classes/log4j.properties 2010-02-06 22:29:39 UTC (rev 53) @@ -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 Added: trunk/mapstoragemanagerarch/target/test-classes/org/nuiton/mapstoragemanager/core/BigTableLoaderTest.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/test-classes/org/nuiton/mapstoragemanager/core/BigTableLoaderTest.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/test-classes/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/test-classes/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/test-classes/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/test-classes/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/test-classes/org/nuiton/mapstoragemanager/plugins/bighashmap/RowTest.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/test-classes/org/nuiton/mapstoragemanager/plugins/bighashmap/RowTest.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/test-classes/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/test-classes/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/mapstoragemanagerarch/target/test-classes/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.class =================================================================== (Binary files differ) Property changes on: trunk/mapstoragemanagerarch/target/test-classes/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r52 - /
by dlanglais＠users.nuiton.org 06 Feb '10

06 Feb '10

Author: dlanglais Date: 2010-02-06 22:59:37 +0100 (Sat, 06 Feb 2010) New Revision: 52 Added: tag/ Log: Tag avant de transformer le projet MSM en projet maven modulaire.

1 0

r51 - trunk/src/site/reports
by dlanglais＠users.nuiton.org 06 Feb '10

06 Feb '10

Author: dlanglais Date: 2010-02-06 13:24:31 +0100 (Sat, 06 Feb 2010) New Revision: 51 Added: trunk/src/site/reports/week4.rst trunk/src/site/reports/week5.rst Log: week4 et 5 -> done and todo. Added: trunk/src/site/reports/week4.rst =================================================================== --- trunk/src/site/reports/week4.rst (rev 0) +++ trunk/src/site/reports/week4.rst 2010-02-06 12:24:31 UTC (rev 51) @@ -0,0 +1,11 @@ + + This week + ========== + - Creation of a new interface BigTable. + - Developpment of the plugin BigHashMap, an implementation of the BigTable specification with HashMap. + - Upgrade of the ui with jaxx. + - Meeting with Code Lutin about jaxx. + + + Next week + ========= Added: trunk/src/site/reports/week5.rst =================================================================== --- trunk/src/site/reports/week5.rst (rev 0) +++ trunk/src/site/reports/week5.rst 2010-02-06 12:24:31 UTC (rev 51) @@ -0,0 +1,16 @@ + + This week + ========== + - Meeting with Benjamin Poussin. + - we note differents problems with the plugins BigHashMap : + - hashcode.. + - equals.. + + + Next week + ========= + - we must separate the project into subprojects maven modular : + - one sub-project for the MSM's architecture + - one sub-project for each plugin. + - one project which contain all subproject. + link : http://matthieu-lux.developpez.com/tutoriels/java/maven/?page=modules \ No newline at end of file

1 0

r50 - in trunk: . src/main/java/org/nuiton/mapstoragemanager/ui src/main/java/org/nuiton/mapstoragemanager/ui/gui src/main/resources/i18n
by fgilet＠users.nuiton.org 02 Feb '10

02 Feb '10

Author: fgilet Date: 2010-02-02 15:46:08 +0100 (Tue, 02 Feb 2010) New Revision: 50 Removed: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationConstants.java Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css 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: Transformation du pom : ajout des developpeurs et de la description du projet Jaxx : transformation du menu, tentative d'internationalisation (a r?\195?\169gler) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-31 22:12:16 UTC (rev 49) +++ trunk/pom.xml 2010-02-02 14:46:08 UTC (rev 50) @@ -65,7 +65,7 @@ <name>MapStorageManager</name> - <description>TODO</description> + <description>Creation of a graphic user interface for Hbase </description> <inceptionYear>2010</inceptionYear> <developers> @@ -89,6 +89,46 @@ <role>Développeur</role> </roles> </developer> + <developer> + <id>fgilet</id> + <name>Florent Gilet</name> + <email>florent.gilet(a)etu.univ-nantes.fr</email> + <organization>Université de nantes</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>gcrieloue</id> + <name>Gilles Crieloue</name> + <email>gilles.crieloue(a)etu.univ-nantes.fr</email> + <organization>Université de nantes</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>afages</id> + <name>Amaury Fages</name> + <email>amaury.fages(a)etu.univ-nantes.fr</email> + <organization>Université de nantes</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>dlanglais</id> + <name>Dorian langlais</name> + <email>dorain.langlais(a)etu.univ-nantes.fr</email> + <organization>Université de nantes</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> </developers>  Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css 2010-01-31 22:12:16 UTC (rev 49) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css 2010-02-02 14:46:08 UTC (rev 50) @@ -23,6 +23,86 @@ resizable: true; } +#menuFile { + text:"mapstoragemanager.action.file"; + toolTipText:"mapstoragemanager.action.file.tip"; + mnemonic:F; +} + +#menuEdit { + text:"mapstoragemanager.action.edit"; + toolTipText:"mapstoragemanager.action.edit.tip"; + mnemonic:E; +} + +#menuConnect { + text:"mapstoragemanager.action.connect"; + toolTipText:"mapstoragemanager.action.connect.tip"; + mnemonic:C; +} + +#menuDisconnect { + text:"mapstoragemanager.action.disconnect"; + toolTipText:"mapstoragemanager.action.disconnect.tip"; + mnemonic:D; +} + +#menuExit { + text:"mapstoragemanager.action.exit"; + toolTipText:"mapstoragemanager.action.exit.tip"; + mnemonic:E; +} + +#menuPreferences { + text:"mapstoragemanager.action.preferences"; + toolTipText:"mapstoragemanager.action.preferences.tip"; + mnemonic:P; +} + +#menuHelp { + text:"mapstoragemanager.action.menuHelp"; + toolTipText:"mapstoragemanager.action.menuHelp.tip"; + mnemonic:A; +} + +#menuHelpHelp { + text:"mapstoragemanager.action.help"; + toolTipText:"mapstoragemanager.action.help.tip"; + mnemonic:E; +} + +#menuHelpSite { + text:"mapstoragemanager.action.visitSite"; + toolTipText:"mapstoragemanager.action.visitSite.tip"; + mnemonic:V; +} + +#menuHelpAbout { + text:"mapstoragemanager.action.aboutUs"; + toolTipText:"mapstoragemanager.action.aboutUs.tip"; + mnemonic:A; +} + + +#menuFileLanguageFR { + text:"mapstoragemanager.action.fr"; + toolTipText:"mapstoragemanager.action.fr.tip"; + mnemonic:F; +} + +#menuFileLanguageUK { + text:"mapstoragemanager.action.uk"; + toolTipText:"mapstoragemanager.action.uk.tip"; + mnemonic:U; +} + +#menuLanguage { + text:"mapstoragemanager.action.language"; + toolTipText:"mapstoragemanager.action.language.tip"; + mnemonic:C; +} + + #mainFrame { title:"Map Storage Manager"; } @@ -35,4 +115,4 @@ oneTouchExpandable:true; continuousLayout:true; dividerSize:6; -} \ 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-31 22:12:16 UTC (rev 49) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-02-02 14:46:08 UTC (rev 50) @@ -1,70 +1,101 @@ -<Application id='mainFrame' width='800' height='600' - onWindowClosing='engine.close()'> +<Application id='mainFrame' width='1024' height='800' + onWindowClosing='engine.close()'> -  - <script> +  + <script> <![CDATA[ - import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; + import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; - ApplicationEngine engine = new ApplicationEngine(); + ApplicationEngine engine = new ApplicationEngine(); ]]> - </script> + </script> -  - <style source='MainUI.css'/> +  + <style source='MainUI.css'/> -  +  - <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> + <JMenuBar> + <JMenu id='menuFile'> + <JMenuItem id='menuConnect' + onActionPerformed='engine.doSomething()'/> + <JMenuItem id='menuDisconnect' + onActionPerformed='engine.doSomething()'/> + <JSeparator/> + <JMenuItem id='menuExit' + onActionPerformed='engine.close()'/> + </JMenu> - <JPanel layout='{new BorderLayout()}' id='demoPanel'> - <JToolBar constraints='BorderLayout.NORTH' opaque='true'> - <JLabel text='name base : ' styleClass='boldUnderline' /> - <JAXXComboBox id='nameBase'> - <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' > - <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> + <JMenu id='menuEdit'> + <JMenuItem id='menuPreferences' + onActionPerformed='engine.doSomething()'/> + + <JSeparator/> + <JMenu id='menuLanguage'> + <JMenuItem id='menuFileLanguageFR' + onActionPerformed='engine.setLocale("en","GB")'/> + <JMenuItem id='menuFileLanguageUK' + onActionPerformed='engine.setLocale("fr","FR")'/> + </JMenu> + </JMenu> + + <JMenu id='menuHelp'> + <JMenuItem id='menuHelpHelp' + onActionPerformed='engine.doSomething()'/> + <JMenuItem id='menuHelpSite' + onActionPerformed='engine.doSomething()'/> + <JMenuItem id='menuHelpAbout' + onActionPerformed='engine.doSomething()'/> + </JMenu> + + </JMenuBar> + + <JPanel layout='{new BorderLayout()}' id='mainPanel'> + <JToolBar constraints='BorderLayout.NORTH' opaque='true'> + <JLabel text="name base :" styleClass='boldUnderline' /> + <JAXXComboBox id='nameBase'> + <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' > + <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/gui/ApplicationConstants.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationConstants.java 2010-01-31 22:12:16 UTC (rev 49) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationConstants.java 2010-02-02 14:46:08 UTC (rev 50) @@ -1,37 +0,0 @@ -package org.nuiton.mapstoragemanager.ui.gui; - -/** - * Application's constants. - * To configure the swing view. - * @author E054030D - * - */ -public class ApplicationConstants { - - /** - * 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-31 22:12:16 UTC (rev 49) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-02-02 14:46:08 UTC (rev 50) @@ -1,5 +1,7 @@ package org.nuiton.mapstoragemanager.ui.gui; +import java.util.Locale; +import java.util.ResourceBundle; import javax.swing.JOptionPane; /** @@ -9,20 +11,15 @@ */ public class ApplicationEngine { + Locale currentLocale; + ResourceBundle messages; + /** * Show the developers. * // TODO */ public final void showGreeting() { - JOptionPane.showMessageDialog(null, this, - "Developers:\n" - + "===========\n" - + "Crieloue Gilles\n" - + "Fages Amaury\n" - + "Langlais Dorian\n" - + "Gilet Forent\n" - + "===========\n" - + "Master ALMA", 0); + JOptionPane.showMessageDialog(null, "hi"); } /** @@ -33,7 +30,19 @@ } /** - * do nothing (for instance). + * do nothing (for tests). */ public void doSomething() { } + + /** + * Change language for internationalization. + * @param language the language + * @param country the country + */ + public void setLocale(String language, String country) { + currentLocale= new Locale(language,country); + messages = ResourceBundle.getBundle("mapstoragemanager",currentLocale); + System.out.println(messages.getString("ok")); + + } } Modified: trunk/src/main/resources/i18n/mapstoragemanager-en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/mapstoragemanager-en_GB.properties 2010-01-31 22:12:16 UTC (rev 49) +++ trunk/src/main/resources/i18n/mapstoragemanager-en_GB.properties 2010-02-02 14:46:08 UTC (rev 50) @@ -1,15 +1,32 @@ -About\ Us= -Connect= -Disconnect= -Edit= -File= -Hello= -Help= -OK= -Preferences= -Quit= -TABLE\ NAME\ \:\ TODO= -login\ \:= -mapstoragemanager.hello=hello -name\ base\ \:= -password\ \:= +Map\ Storage\ Manager=Map Storage Manager +TABLE\ NAME\ \:\ TODO= +login\ \:=Login +mapstoragemanager.action.aboutUs=About us +mapstoragemanager.action.aboutUs.tip=About Code Lutin +mapstoragemanager.action.connect=Connect +mapstoragemanager.action.connect.tip=Start a new connection +mapstoragemanager.action.disconnect=Disconnect +mapstoragemanager.action.disconnect.tip=Disconnect the current session +mapstoragemanager.action.edit=Edit +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit=Exit +mapstoragemanager.action.exit.tip= +mapstoragemanager.action.file=File +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr=French +mapstoragemanager.action.fr.tip=Change to french language +mapstoragemanager.action.help=Help +mapstoragemanager.action.help.tip= +mapstoragemanager.action.language=Choose language +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp=Help +mapstoragemanager.action.menuHelp.tip= +mapstoragemanager.action.preferences=Preferences +mapstoragemanager.action.preferences.tip= +mapstoragemanager.action.uk=English +mapstoragemanager.action.uk.tip=Change to english language +mapstoragemanager.action.visitSite=Visit our site +mapstoragemanager.action.visitSite.tip= +name\ base\ \:=Name base +ok=Validate +password\ \:=Password Modified: trunk/src/main/resources/i18n/mapstoragemanager-fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/mapstoragemanager-fr_FR.properties 2010-01-31 22:12:16 UTC (rev 49) +++ trunk/src/main/resources/i18n/mapstoragemanager-fr_FR.properties 2010-02-02 14:46:08 UTC (rev 50) @@ -1,15 +1,32 @@ -About\ Us= -Connect= -Disconnect= -Edit= -File= -Hello= -Help= -OK= -Preferences= -Quit= -TABLE\ NAME\ \:\ TODO= -login\ \:= -mapstoragemanager.hello=bonjour -name\ base\ \:= -password\ \:= +Map\ Storage\ Manager=Map Storage Manager +TABLE\ NAME\ \:\ TODO= +login\ \:=Identifiant +mapstoragemanager.action.aboutUs=A propos +mapstoragemanager.action.aboutUs.tip=A propos de Code Lutin +mapstoragemanager.action.connect=Connexion +mapstoragemanager.action.connect.tip=Etablis une nouvelle connexion +mapstoragemanager.action.disconnect=D\u00E9connexion +mapstoragemanager.action.disconnect.tip=D\u00E9connecte la session courante +mapstoragemanager.action.edit=Edition +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit=Quitter +mapstoragemanager.action.exit.tip=Quitte l'application +mapstoragemanager.action.file=Fichier +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr=Fran\u00E7ais +mapstoragemanager.action.fr.tip=Changer la langue en fran\u00E7ais +mapstoragemanager.action.help=Aide +mapstoragemanager.action.help.tip= +mapstoragemanager.action.language=choisir la langue +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp=Aide +mapstoragemanager.action.menuHelp.tip=Aide contextuelle +mapstoragemanager.action.preferences=Pr\u00E9f\u00E9rences +mapstoragemanager.action.preferences.tip=Permet de configurer l'application +mapstoragemanager.action.uk=Anglais +mapstoragemanager.action.uk.tip=Changer la langue en anglais +mapstoragemanager.action.visitSite=Visiter notre site +mapstoragemanager.action.visitSite.tip= +name\ base\ \:=Nom de la base +ok=Valider +password\ \:=Mot de passe

1 0