Author: dlanglais Date: 2010-03-14 18:57:25 +0100 (Sun, 14 Mar 2010) New Revision: 240 Log: Suppression des anciennes classes du plugin HBase (inutiles). Suppression de l'interface de plugin 'Monitoring' -> il s'agit d'un plugin tout simplement. Le plugin Monitoring impl?\195?\169mente l'interface Plugin au lieu de Monitoring ( modifi?\195?\169 aussi dans META-INF ). Suppression des imports inutilis?\195?\169s dans le main() de PluginManager. A faire : Il me faudrait modifier le PluginManager afin qu'il ne r?\195?\169g?\195?\169n?\195?\168re par un nouveau JPanel 'PluginView' ?\195?\160 chaque fois que l'on clique sur un autre Plugin. De m?\195?\170me, il faudrait faire en sorte que la description du plugin ne prenne pas plus de place que la taille du JPanel pr?\195?\169vu... Added: trunk/msm-monitoring-plugins/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.Plugin Removed: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/MyLittleHBaseClient.java trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/NoSuchTableException.java trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/OLDHBase.java trunk/msm-monitoring-plugins/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.Monitoring trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Monitoring.java Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/Main.java trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/Main.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java 2010-03-14 16:20:17 UTC (rev 239) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java 2010-03-14 17:57:25 UTC (rev 240) @@ -17,7 +17,7 @@ import org.nuiton.mapstoragemanager.plugins.BigTable; import org.nuiton.mapstoragemanager.plugins.Exporter; import org.nuiton.mapstoragemanager.plugins.Importer; -import org.nuiton.mapstoragemanager.plugins.Monitoring; +//import org.nuiton.mapstoragemanager.plugins.Monitoring; import org.nuiton.mapstoragemanager.plugins.Plugin; /** @@ -86,8 +86,8 @@ ServiceLoader.load(Importer.class, this); ServiceLoader<Exporter> exporterSetLoader = ServiceLoader.load(Exporter.class, this); - ServiceLoader<Monitoring> monitoringSetLoader = - ServiceLoader.load(Monitoring.class, this); +// ServiceLoader<Monitoring> monitoringSetLoader = +// ServiceLoader.load(Monitoring.class, this); ServiceLoader<Plugin> pluginSetLoader = ServiceLoader.load(Plugin.class, this); @@ -106,10 +106,10 @@ exporter.load(); plugins.put(exporter.getPluginName(), exporter); } - for (Monitoring monitor : monitoringSetLoader) { - monitor.load(); - plugins.put(monitor.getPluginName(), monitor); - } +// for (Monitoring monitor : monitoringSetLoader) { +// monitor.load(); +// plugins.put(monitor.getPluginName(), monitor); +// } for (Plugin plugin : pluginSetLoader) { plugin.load(); plugins.put(plugin.getPluginName(), plugin); Deleted: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Monitoring.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Monitoring.java 2010-03-14 16:20:17 UTC (rev 239) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Monitoring.java 2010-03-14 17:57:25 UTC (rev 240) @@ -1,13 +0,0 @@ -package org.nuiton.mapstoragemanager.plugins; - -/** - * @author E045231P - */ -public interface Monitoring extends Plugin { - - /** - * display. - */ - void display(); - -} Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/Main.java =================================================================== --- trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/Main.java 2010-03-14 16:20:17 UTC (rev 239) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/Main.java 2010-03-14 17:57:25 UTC (rev 240) @@ -14,7 +14,7 @@ */ private static final Log LOG = LogFactory.getLog(HBase.class); - public static void main(String[] args){ + private Main() { String tableName = "myTable"; String columnName = "myColumn"; String contentValue = "val"; @@ -29,4 +29,8 @@ LOG.fatal(ex, ex); } } + + public static void main(String[] args){ + new Main(); + } } \ No newline at end of file Deleted: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/MyLittleHBaseClient.java =================================================================== --- trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/MyLittleHBaseClient.java 2010-03-14 16:20:17 UTC (rev 239) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/MyLittleHBaseClient.java 2010-03-14 17:57:25 UTC (rev 240) @@ -1,108 +0,0 @@ -package org.nuiton.mapstoragemanager.plugins.hbase; - -import java.io.IOException; - -import org.apache.hadoop.hbase.HBaseConfiguration; -import org.apache.hadoop.hbase.HColumnDescriptor; -import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.client.Get; -import org.apache.hadoop.hbase.client.HBaseAdmin; -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; - - -// Class that has nothing but a main. -// Does a Put, Get and a Scan against an hbase table. -public class MyLittleHBaseClient { - public static void main(String[] args) throws IOException { - // 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 - HBaseConfiguration config = new HBaseConfiguration(); - -// HBaseAdmin hBaseAdmin = new HBaseAdmin(config); -// { -// HTableDescriptor hTableDescriptor = new HTableDescriptor("myLittleHBaseTable2"); -// HColumnDescriptor hColumnDescriptor = new HColumnDescriptor("myLittleRow2"); -// hTableDescriptor.addFamily(hColumnDescriptor); -// hBaseAdmin.createTable(hTableDescriptor); -// } -// for (HTableDescriptor hTableDescriptor : hBaseAdmin.listTables()) { -// System.out.println(hTableDescriptor.getNameAsString()); -// for (HColumnDescriptor hColumnDescriptor : hTableDescriptor.getColumnFamilies()) { -// System.out.println("\t" + hColumnDescriptor.getNameAsString()); -// } -// } - - // This instantiates an HTable object that connects you to - // the "myLittleHBaseTable" table. - HTable table = new HTable(config, "myLittleHBaseTable"); - - // 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("myLittleRow")); - - // To set the value you'd like to update in the row 'myLittleRow', 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("myLittleFamily"), Bytes.toBytes("someQualifier"), - Bytes.toBytes("Some 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) - table.put(p); - - // 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("myLittleRow")); - Result r = table.get(g); - byte [] value = r.getValue(Bytes.toBytes("myLittleFamily"), - Bytes.toBytes("someQualifier")); - // If we convert the value bytes, we should get back 'Some Value', the - // value we inserted at this location. - String valueStr = Bytes.toString(value); - System.out.println("GET: " + valueStr); - - // 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("myLittleFamily"), Bytes.toBytes("someQualifier")); - ResultScanner scanner = table.getScanner(s); - try { - // Scanners return Result instances. - // Now, for the actual iteration. One way is to use a while loop like so: - 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); - } - - // 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(); - } - } -} Deleted: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/NoSuchTableException.java =================================================================== --- trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/NoSuchTableException.java 2010-03-14 16:20:17 UTC (rev 239) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/NoSuchTableException.java 2010-03-14 17:57:25 UTC (rev 240) @@ -1,16 +0,0 @@ -package org.nuiton.mapstoragemanager.plugins.hbase; - -/** - * Exception thrown when the plugin try to access to an inexistant table. - * @author Dorian Langlais - */ -public class NoSuchTableException extends Exception { - - /** - * Exception constructor. - * @param table the name of the inexistant table. - */ - public NoSuchTableException(String table) { - super("Table " + table + "doesn't exist !"); - } -} Deleted: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/OLDHBase.java =================================================================== --- trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/OLDHBase.java 2010-03-14 16:20:17 UTC (rev 239) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/OLDHBase.java 2010-03-14 17:57:25 UTC (rev 240) @@ -1,176 +0,0 @@ -package org.nuiton.mapstoragemanager.plugins.hbase; - -import java.io.IOException; -import java.util.HashSet; -import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -//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 OLDHBase /*implements "old"BigTable*/ { - - /** - * Logger. - */ - private static final Log LOG = LogFactory.getLog(OLDHBase.class); - - private HBaseConfiguration config; - private HTable table; - private String familyName = "mylittlecolumnfamily"; - private String rowName = "myLittleRow"; - private String tableName = "mylittletable"; - - public OLDHBase() { - // 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)); - - // 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(); - LOG.error(e.toString(), e); - } - 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); - LOG.info("Found row: " + rr); - keySet.add(rr.toString()); - } - - } catch (IOException e) { - // TODO Auto-generated catch block - //e.printStackTrace(); - LOG.error(e.toString(), e); - } - - // 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(); - LOG.error(e.toString(), e); - } - } - -// @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 OLDHBase(); - } -} Modified: trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java =================================================================== --- trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java 2010-03-14 16:20:17 UTC (rev 239) +++ trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java 2010-03-14 17:57:25 UTC (rev 240) @@ -10,7 +10,7 @@ import javax.swing.JMenu; import javax.swing.JMenuItem; import javax.swing.JPanel; -import org.nuiton.mapstoragemanager.plugins.Monitoring; +import org.nuiton.mapstoragemanager.plugins.Plugin; import org.nuiton.mapstoragemanager.ui.MainUI; import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; @@ -18,7 +18,7 @@ * * @author E045231P */ -public class ShowDiskSpace extends JFrame implements Monitoring { +public class ShowDiskSpace extends JFrame implements Plugin { /** * Number for division byte -> Mb -> Gb. @@ -42,7 +42,7 @@ /** * Display. */ - @Override +// @Override public void display() { //creation of content Deleted: trunk/msm-monitoring-plugins/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.Monitoring =================================================================== --- trunk/msm-monitoring-plugins/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.Monitoring 2010-03-14 16:20:17 UTC (rev 239) +++ trunk/msm-monitoring-plugins/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.Monitoring 2010-03-14 17:57:25 UTC (rev 240) @@ -1 +0,0 @@ -org.nuiton.monitoring.ShowDiskSpace \ No newline at end of file Added: trunk/msm-monitoring-plugins/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.Plugin =================================================================== --- trunk/msm-monitoring-plugins/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.Plugin (rev 0) +++ trunk/msm-monitoring-plugins/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.Plugin 2010-03-14 17:57:25 UTC (rev 240) @@ -0,0 +1 @@ +org.nuiton.monitoring.ShowDiskSpace \ No newline at end of file Modified: trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/Main.java =================================================================== --- trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/Main.java 2010-03-14 16:20:17 UTC (rev 239) +++ trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/Main.java 2010-03-14 17:57:25 UTC (rev 240) @@ -5,22 +5,13 @@ package org.nuiton.mapstoragemanager.plugins.pluginmanager; -import java.awt.BorderLayout; -import java.awt.GridLayout; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.util.Locale; -import javax.swing.JButton; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JTextArea; import javax.swing.SwingUtilities; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.DefaultI18nInitializer; -import org.nuiton.mapstoragemanager.ui.MainUI; /** * * @author Dorian Langlais