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

r263 - trunk
by dlanglais＠users.nuiton.org 18 Mar '10

18 Mar '10

Author: dlanglais Date: 2010-03-18 17:58:47 +0100 (Thu, 18 Mar 2010) New Revision: 263 Log: Utilisation de jaxx-2.0 en version release. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-18 15:56:06 UTC (rev 262) +++ trunk/pom.xml 2010-03-18 16:58:47 UTC (rev 263) @@ -107,7 +107,7 @@ <properties> <projectId>mapstoragemanager</projectId> - <jaxx.version>2.0.0-beta-5</jaxx.version> + <jaxx.version>2.0</jaxx.version> <nuitonutils.version>1.2</nuitonutils.version> <i18n.version>1.1</i18n.version>

1 0

r262 - trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase
by gcrieloue＠users.nuiton.org 18 Mar '10

18 Mar '10

Author: gcrieloue Date: 2010-03-18 16:56:06 +0100 (Thu, 18 Mar 2010) New Revision: 262 Log: Ajout d'un client simple pour HBase. Added: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/MyLittleHBaseClient.java Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/Main.java Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/Main.java =================================================================== --- trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/Main.java 2010-03-18 14:35:50 UTC (rev 261) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/Main.java 2010-03-18 15:56:06 UTC (rev 262) @@ -0,0 +1,11 @@ +package org.nuiton.mapstoragemanager.plugins.hbase; + +import org.apache.hadoop.hbase.MasterNotRunningException; + +public class Main{ + + public static void main(String[] args) throws MasterNotRunningException { + HBase hb = new HBase(); + } + +} \ No newline at end of file Added: 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 (rev 0) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/MyLittleHBaseClient.java 2010-03-18 15:56:06 UTC (rev 262) @@ -0,0 +1,108 @@ +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(); + String tableName = "myLittleHBaseTable"; + /* + HTableDescriptor hTableDescriptor = new HTableDescriptor(tableName); + //hTableDescriptor.addFamily(new HColumnDescriptor("myColumnFamily")); + HBaseAdmin hBaseAdmin = new HBaseAdmin(config); + + try{ + hBaseAdmin.createTable(hTableDescriptor); + hBaseAdmin.enableTable(tableName); + } + catch(org.apache.hadoop.hbase.TableExistsException e){ + System.out.println("Table "+tableName+" already created."); + } +*/ + // This instantiates an HTable object that connects you to + // the "myLittleHBaseTable" table. + HTable table = new HTable(config, tableName); + System.out.println("HTable table = new HTable(config, tableName);"); + + // 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(); + } + } +}

1 0

r261 - in trunk: msm/src/main/java/org/nuiton/mapstoragemanager msm/src/main/java/org/nuiton/mapstoragemanager/ui msm/src/main/resources msm-monitoring-plugins/src/main/java/org/nuiton/monitoring
by fgilet＠users.nuiton.org 18 Mar '10

18 Mar '10

Author: fgilet Date: 2010-03-18 15:35:50 +0100 (Thu, 18 Mar 2010) New Revision: 261 Log: Petits changements sur plugin Monitoring Panel de message mieux g?\195?\169rer Modified: trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx trunk/msm/src/main/resources/msm.properties Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-03-18 14:09:27 UTC (rev 260) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-03-18 14:35:50 UTC (rev 261) @@ -95,7 +95,7 @@ } n_("messageEntry"); String message = _("messageEntry"); - ui.displayMessage(message, 1); + ui.displayMessage(message, 0); } /** Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-18 14:09:27 UTC (rev 260) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-18 14:35:50 UTC (rev 261) @@ -89,16 +89,17 @@ this.getMessagesPanel().removeAll(); //display message - if (code==0){ - String icon ="ok_16"; + String icon = "ok_16"; + if (code==0){ + icon ="ok_16"; }else if (code==1){ - String icon ="warning_16.png"; + icon ="warning_16"; }else if (code==2){ - String icon ="cancel_16.png"; + icon ="cancel_16"; } JLabel label = new JLabel(message); - label.setIcon(jaxx.runtime.SwingUtil.getUIManagerActionIcon("ok_16")); + label.setIcon(jaxx.runtime.SwingUtil.getUIManagerActionIcon(icon)); this.getMessagesPanel().add(label); this.getMessagesPanel().repaint(); this.getMessagesPanel().revalidate(); Modified: trunk/msm/src/main/resources/msm.properties =================================================================== --- trunk/msm/src/main/resources/msm.properties 2010-03-18 14:09:27 UTC (rev 260) +++ trunk/msm/src/main/resources/msm.properties 2010-03-18 14:35:50 UTC (rev 261) @@ -1,5 +1,9 @@ icon.action.ok_16=ok_16.png icon.action.ok_32=ok_32.png +icon.action.warning_16=warning_16.png +icon.action.warning_32=warning_32.png +icon.action.cancel_16=cancel_16.png +icon.action.cancel_32=cancel_32.png icon.action.database_16=database_16.png icon.action.database_32=database_32.png icon.action.login_16=login_16.png 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-18 14:09:27 UTC (rev 260) +++ trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java 2010-03-18 14:35:50 UTC (rev 261) @@ -10,6 +10,7 @@ import javax.swing.JMenu; import javax.swing.JMenuItem; import javax.swing.JPanel; +import javax.swing.JSeparator; import org.nuiton.mapstoragemanager.plugins.Plugin; import org.nuiton.mapstoragemanager.ui.MainUI; @@ -42,6 +43,16 @@ private static JMenuItem menuItemPlugin; /** + * Active Panel. + */ + private JPanel nbFreePluginPanel; + + /** + * Lock to avoid multi plugin. + */ + private boolean instance = false; + + /** * Constructor. */ public ShowDiskSpace() { @@ -52,6 +63,7 @@ */ // @Override public void display() { + instance=true; //creation of content JPanel content = new JPanel(); @@ -116,15 +128,14 @@ + new DecimalFormat("0.00").format(maxMemoryGb) + " Gb)")); //position of plugin - JPanel nbFreePluginPanel = MainUI.getInstance().getFreePluginPanel(); + nbFreePluginPanel = MainUI.getInstance().getFreePluginPanel(); if (nbFreePluginPanel==null){ this.setContentPane(content); this.pack(); this.setVisible(true); }else{ nbFreePluginPanel.add(content); - nbFreePluginPanel.repaint(); - nbFreePluginPanel.revalidate(); + refresh(); } } @@ -161,6 +172,9 @@ final JMenuItem menuItemDisplay = new JMenuItem("Display"); menuItemPlugin.add(menuItemDisplay); + final JMenuItem menuItemHide = new JMenuItem("Hide"); + menuItemPlugin.add(menuItemHide); + menuItemPlugin.add(new JSeparator()); final JMenuItem menuItemDelete = new JMenuItem("Delete"); menuItemPlugin.add(menuItemDelete); @@ -169,9 +183,20 @@ menuItemDisplay.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - display(); + if(!instance){ + display(); + }else{ + MainUI.getInstance().displayMessage("Le plugin est déjà activé", 1); + } } }); + + menuItemHide.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + hideContent(); + } + }); menuItemDelete.addActionListener(new ActionListener() { @Override @@ -191,5 +216,25 @@ menuPlugin.remove(menuItemPlugin); menuItemPlugin = null; } + nbFreePluginPanel.removeAll(); + instance=false; + refresh(); } + + /** + * Hide content + */ + public void hideContent() { + nbFreePluginPanel.removeAll(); + instance=false; + refresh(); + } + + /** + * Refresh content. + */ + private void refresh(){ + nbFreePluginPanel.repaint(); + nbFreePluginPanel.revalidate(); + } }

1 0

r260 - in trunk/msm/src/main: java/org/nuiton/mapstoragemanager/ui java/org/nuiton/mapstoragemanager/ui/engine resources/i18n
by dlanglais＠users.nuiton.org 18 Mar '10

18 Mar '10

Author: dlanglais Date: 2010-03-18 15:09:27 +0100 (Thu, 18 Mar 2010) New Revision: 260 Log: Am?\195?\169lioration BootLoaderManager. Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java trunk/msm/src/main/resources/i18n/msm-en_GB.properties trunk/msm/src/main/resources/i18n/msm-fr_FR.properties Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx 2010-03-18 13:57:07 UTC (rev 259) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx 2010-03-18 14:09:27 UTC (rev 260) @@ -66,6 +66,8 @@ LOG.error(ex, ex); } + this.getBootLoaderPanel().removeAll(); + /** * For each Jar file */ @@ -74,7 +76,7 @@ final String propertyValue = properties.getProperty(propertyName); LOG.info(propertyName + " : " + propertyValue); - final JCheckBox checkBox = new JCheckBox(); + final JCheckBox checkBox = new JCheckBox(propertyName); /** If propertyValue equals true, checkBox selected, * else not selected. */ @@ -101,13 +103,7 @@ } }); - final JLabel label = new JLabel(propertyName); - - final JPanel panel = new JPanel(new FlowLayout(FlowLayout.LEFT)); - panel.add(checkBox); - panel.add(label); - - this.getBootLoaderPanel().add(panel); + this.getBootLoaderPanel().add(checkBox); } } @@ -122,13 +118,11 @@  <JMenuBar> <JMenu id='menuPlugin'> - <JMenuItem id='menuPluginLoad' - onActionPerformed='this.loadAPlugin()' /> <JMenuItem id='refreshJarList' onActionPerformed='this.refreshJarList()' /> </JMenu> </JMenuBar> - <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'> + <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.NORTH'> <VBox layout='{new GridLayout(0,1)}' id='bootLoaderPanel' /> </JPanel> </Application> \ No newline at end of file Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css 2010-03-18 13:57:07 UTC (rev 259) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css 2010-03-18 14:09:27 UTC (rev 260) @@ -95,6 +95,17 @@ mnemonic:O; } +#menuPluginBootLoaderManager { + text:"mapstoragemanager.action.pluginbootloadermanager"; + toolTipText:"mapstoragemanager.action.pluginbootloadermanager.tip"; +} + +#refreshJarList { + text:"bootloadermanager.refreshJarList"; +} + + + #menuHelp { text:"mapstoragemanager.action.menuHelp"; toolTipText:"mapstoragemanager.action.menuHelp.tip"; Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-18 13:57:07 UTC (rev 259) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-18 14:09:27 UTC (rev 260) @@ -154,9 +154,9 @@ onActionPerformed='engine.loadAPlugin()'/> <JMenuItem id='menuPluginSave' onActionPerformed='engine.savePlugin()'/> - <JSeparator/> <JMenuItem id='menuPluginBootLoaderManager' onActionPerformed='BootLoaderManager.getInstance().setVisible(true)'/> + <JSeparator/> </JMenu> <JMenu id='menuHelp'> Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java 2010-03-18 13:57:07 UTC (rev 259) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java 2010-03-18 14:09:27 UTC (rev 260) @@ -14,15 +14,12 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; -import java.util.Enumeration; import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Properties; import java.util.Set; -import javax.swing.AbstractButton; -import javax.swing.ButtonGroup; import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JFileChooser; @@ -43,7 +40,6 @@ import org.nuiton.mapstoragemanager.plugins.BigTable; import org.nuiton.mapstoragemanager.plugins.Exporter; import org.nuiton.mapstoragemanager.plugins.Importer; -import org.nuiton.mapstoragemanager.plugins.Plugin; import org.nuiton.mapstoragemanager.ui.MainUI; import static org.nuiton.i18n.I18n._; Modified: trunk/msm/src/main/resources/i18n/msm-en_GB.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-18 13:57:07 UTC (rev 259) +++ trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-18 14:09:27 UTC (rev 260) @@ -38,6 +38,9 @@ mapstoragemanager.action.pluginload.tip=Load plugins mapstoragemanager.action.pluginsave=Handle plugin save mapstoragemanager.action.pluginsave.tip=Handle plugin save +mapstoragemanager.action.pluginbootloadermanager=Manage plugins jar loaded at startup +mapstoragemanager.action.pluginbootloadermanager.tip=Manage plugins jar loaded at startup +bootLoaderManager.refreshJarList=Refresh plugin list mapstoragemanager.action.preferences=Preferences mapstoragemanager.action.preferences.tip= mapstoragemanager.action.uk=English Modified: trunk/msm/src/main/resources/i18n/msm-fr_FR.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-18 13:57:07 UTC (rev 259) +++ trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-18 14:09:27 UTC (rev 260) @@ -38,6 +38,9 @@ mapstoragemanager.action.pluginload.tip=R\u00E9cup\u00E9ration des plugins \u00E0 partir d'un dossier mapstoragemanager.action.pluginsave=G\u00E9rer sauvegarde mapstoragemanager.action.pluginsave.tip=G\u00E8re la sauvegarde des plugins au relancement de l'application +mapstoragemanager.action.pluginbootloadermanager=G\u00E9rer les plugins lanc\u00E9s au d\u00E9marrage +mapstoragemanager.action.pluginbootloadermanager.tip=G\u00E9rer les plugins lanc\u00E9s au d\u00E9marrage +bootLoaderManager.refreshJarList=Rafraichir la liste des plugins mapstoragemanager.action.preferences=Pr\u00E9f\u00E9rences mapstoragemanager.action.preferences.tip=Configurer l'application mapstoragemanager.action.uk=Anglais

1 0

r259 - trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring
by fgilet＠users.nuiton.org 18 Mar '10

18 Mar '10

Author: fgilet Date: 2010-03-18 14:57:07 +0100 (Thu, 18 Mar 2010) New Revision: 259 Log: Correction de rafraichissement du plugin de monitoring Modified: trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java Modified: trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java =================================================================== --- trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java 2010-03-18 13:50:10 UTC (rev 258) +++ trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java 2010-03-18 13:57:07 UTC (rev 259) @@ -123,7 +123,8 @@ this.setVisible(true); }else{ nbFreePluginPanel.add(content); - MainUI.getInstance().repaint(); + nbFreePluginPanel.repaint(); + nbFreePluginPanel.revalidate(); } }

1 0

r258 - trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine
by fgilet＠users.nuiton.org 18 Mar '10

18 Mar '10

Author: fgilet Date: 2010-03-18 14:50:10 +0100 (Thu, 18 Mar 2010) New Revision: 258 Log: Gestion de rechargement des plugins fonctionnelle Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java 2010-03-18 13:38:26 UTC (rev 257) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java 2010-03-18 13:50:10 UTC (rev 258) @@ -7,10 +7,18 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; +import java.util.ArrayList; import java.util.Enumeration; +import java.util.HashMap; +import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.Properties; import java.util.Set; import javax.swing.AbstractButton; @@ -157,17 +165,38 @@ */ public void savePlugin() { PluginLoader pluginLoaderTemp = getPluginLoader(); - final JPanel buttonDisplay = new JPanel(new GridLayout(3,20)); + final JPanel buttonDisplay = new JPanel(new GridLayout(20,3)); final JPanel content = new JPanel(new BorderLayout()); - JFrame frameTemp = new JFrame(); + final JFrame frameTemp = new JFrame(); + List<String> nomPlugins = new ArrayList<String>(); + final Map<String,String> mapPlugins = new HashMap<String,String>(); //check all plugins in .properties - for(final Plugin plugin : pluginLoaderTemp.getAllPlugin(null)) { + final Properties properties = new Properties(); + final File propertiesFile = new File(MSM_PLUGINS_DIR, ".properties"); + try { + FileInputStream fis = new FileInputStream(propertiesFile); + properties.load(fis); + Set<Object> props = properties.keySet(); + for (Object property : props) { + String nomPlugin = property.toString(); + nomPlugin = nomPlugin.substring(nomPlugin.lastIndexOf("/")+1); + nomPlugins.add(nomPlugin); + mapPlugins.put(nomPlugin, property.toString()); + } - String pluginName = plugin.getPluginName(); + } catch(FileNotFoundException e){ + LOG.fatal(e, e); + } catch (IOException ioe){ + LOG.fatal(ioe, ioe); + } - JCheckBox pluginButton = new JCheckBox(pluginName); + + + for(final String nomPlugin : nomPlugins) { + + JCheckBox pluginButton = new JCheckBox(nomPlugin); pluginButton.setSize(100, 20); buttonDisplay.add(pluginButton); @@ -179,13 +208,21 @@ @Override public void actionPerformed(ActionEvent e) { - Component[] component = buttonDisplay.getComponents(); - for(final Component comp : component){ - JButton buttonTemp = (JButton) comp; + Component[] components = buttonDisplay.getComponents(); + for(final Component comp : components){ + JCheckBox buttonTemp = (JCheckBox) comp; //if disable, write false into .properties - if(!buttonTemp.isEnabled()){ + if(!buttonTemp.isSelected()){ + properties.put(mapPlugins.get(buttonTemp.getText()), "false"); + try { + properties.store(new FileOutputStream(propertiesFile), null); + + } catch (IOException ex) { + LOG.error(ex, ex); + } } } + frameTemp.dispose(); } });

1 0

r257 - trunk/msm/src/test/java/org/nuiton/mapstoragemanager
by dlanglais＠users.nuiton.org 18 Mar '10

18 Mar '10

Author: dlanglais Date: 2010-03-18 14:38:26 +0100 (Thu, 18 Mar 2010) New Revision: 257 Log: Forc?\195?\169ment si le dossier core n'est pas supprim?\195?\169 sur le svn... (mais pourquoi ne l'a-t-il pas vir?\195?\169 ?). Removed: trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/

1 0

r256 - in trunk/msm/src/test/java/org/nuiton/mapstoragemanager: . pluginloader
by dlanglais＠users.nuiton.org 18 Mar '10

18 Mar '10

Author: dlanglais Date: 2010-03-18 14:33:07 +0100 (Thu, 18 Mar 2010) New Revision: 256 Log: et maintenant ? Added: trunk/msm/src/test/java/org/nuiton/mapstoragemanager/pluginloader/ trunk/msm/src/test/java/org/nuiton/mapstoragemanager/pluginloader/PluginLoaderTest.java Added: trunk/msm/src/test/java/org/nuiton/mapstoragemanager/pluginloader/PluginLoaderTest.java =================================================================== --- trunk/msm/src/test/java/org/nuiton/mapstoragemanager/pluginloader/PluginLoaderTest.java (rev 0) +++ trunk/msm/src/test/java/org/nuiton/mapstoragemanager/pluginloader/PluginLoaderTest.java 2010-03-18 13:33:07 UTC (rev 256) @@ -0,0 +1,248 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package org.nuiton.mapstoragemanager.pluginloader; + +import com.opensymphony.xwork2.interceptor.annotations.After; +import java.io.File; +import java.lang.reflect.Field; +import java.net.MalformedURLException; +import java.util.Collection; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import javax.swing.filechooser.FileFilter; +import junit.framework.Assert; +import junit.framework.TestCase; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.mapstoragemanager.plugins.BigTable; +import org.nuiton.mapstoragemanager.plugins.Exporter; +import org.nuiton.mapstoragemanager.plugins.Importer; +import org.nuiton.mapstoragemanager.plugins.Plugin; + +/** + * + * @author Dorian Langlais + */ +public class PluginLoaderTest extends TestCase { + + /** + * Logger. + */ + private static final Log LOG = LogFactory.getLog(PluginLoaderTest.class); + + /** + * pluginsMapActual. + */ + Map<String, Plugin> pluginsMapActual; + /** + * pluginLoader. + */ + PluginLoader pl; + + /** + * initialisation to prepare test. + */ + @Override + public void setUp() { + /** + * Initialisation. + */ + try { + String basedir = new File("").getAbsolutePath(); + File pluginFolder = new File(basedir, "/src/test/resources"); + pl = new PluginLoader(pluginFolder.getAbsolutePath(), + this.getClass().getClassLoader()); + Field fPlugins = pl.getClass().getDeclaredField("plugins"); + fPlugins.setAccessible(true); + pluginsMapActual = (Map<String, Plugin>) fPlugins.get(pl); + + /** Remise à zéro de la Map */ + pluginsMapActual.clear(); + } catch (IllegalArgumentException ex) { + LOG.fatal(ex, ex); + Assert.fail(); + } catch (IllegalAccessException ex) { + LOG.fatal(ex, ex); + Assert.fail(); + } catch (NoSuchFieldException ex) { + LOG.fatal(ex, ex); + Assert.fail(); + } catch (SecurityException ex) { + LOG.fatal(ex, ex); + Assert.fail(); + } catch (MalformedURLException ex) { + LOG.fatal(ex, ex); + Assert.fail(); + } + } + + /** + * + */ + @Override + @After + public void tearDown() { + String basedir = new File("").getAbsolutePath(); + File properties = new File(basedir, "/src/test/resources/.properties"); + properties.deleteOnExit(); + } + + public void testGetAllPluginNames() { + this.setUp(); + + Set<String> pluginsNamesExpected = new HashSet<String>(); + Set<String> pluginsNamesActual = pl.getAllPluginNames(); + + assertEquals(pluginsNamesExpected, pluginsNamesActual); + + pluginsNamesExpected.add("Test"); + pluginsMapActual.put("Test", null); + pluginsNamesActual = pl.getAllPluginNames(); + + assertEquals(pluginsNamesExpected, pluginsNamesActual); + + } + + public void testGetAllPlugin() { + this.setUp(); + + Collection<Plugin> pluginsExpected = new HashSet<Plugin>(); + Collection<Plugin> pluginsActual = pl.getAllPlugin(null); + + assertEquals(pluginsExpected, pluginsActual); + + Plugin test = new Importer() { + + @Override + public void importFrom(BigTable bigTable, File file) { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public FileFilter getFileFilter() { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public String getPluginName() { + return "test"; + } + + @Override + public String getDescription() { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public void load() { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public void unload() { + throw new UnsupportedOperationException("Not supported yet."); + } + + }; + + pluginsExpected.clear(); + pluginsExpected.add(test); + pluginsMapActual.put(test.getPluginName(), test); + pluginsActual = pl.getAllPlugin(Importer.class); + assertEquals(pluginsExpected, pluginsActual); + + pluginsExpected.clear(); + pluginsActual = pl.getAllPlugin(Exporter.class); + assertEquals(pluginsExpected, pluginsActual); + + pluginsExpected.clear(); + pluginsActual = pl.getAllPlugin(BigTable.class); + assertEquals(pluginsExpected, pluginsActual); + + pluginsExpected.clear(); + pluginsExpected.add(test); + pluginsActual = pl.getAllPlugin(null); + assertEquals(pluginsExpected, pluginsActual); + + } + + public void testGetPlugin() { + this.setUp(); + + Collection<Plugin> pluginsActual = pl.getAllPlugin(null); + + assertNull(pl.getPlugin(null)); + + Plugin testImporter = new Importer() { + + @Override + public void importFrom(BigTable bigTable, File file) { + throw new UnsupportedOperationException("Not supported yet."); + } + @Override + public FileFilter getFileFilter() { + throw new UnsupportedOperationException("Not supported yet."); + } + @Override + public String getPluginName() { + return "testImporter"; + } + + @Override + public String getDescription() { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public void load() { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public void unload() { + throw new UnsupportedOperationException("Not supported yet."); + } + }; + Plugin testExporter = new Exporter() { + + @Override + public void exportTo(BigTable bigTable, File file) { + throw new UnsupportedOperationException("Not supported yet."); + } + @Override + public FileFilter getFileFilter() { + throw new UnsupportedOperationException("Not supported yet."); + } + @Override + public String getPluginName() { + return "testExporter"; + } + + @Override + public String getDescription() { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public void load() { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public void unload() { + throw new UnsupportedOperationException("Not supported yet."); + } + }; + + pluginsMapActual.put(testImporter.getPluginName(), testImporter); + pluginsMapActual.put(testExporter.getPluginName(), testExporter); + + assertNull(pl.getPlugin("")); + assertEquals(testImporter, pl.getPlugin(testImporter.getPluginName())); + assertEquals(testExporter, pl.getPlugin(testExporter.getPluginName())); + } +}

1 0

r255 - in trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui: . engine
by dlanglais＠users.nuiton.org 18 Mar '10

18 Mar '10

Author: dlanglais Date: 2010-03-18 14:28:20 +0100 (Thu, 18 Mar 2010) New Revision: 255 Log: Bon, normalement le build passe maintenant. Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx 2010-03-18 13:20:41 UTC (rev 254) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx 2010-03-18 13:28:20 UTC (rev 255) @@ -3,7 +3,7 @@  <script> <![CDATA[ -import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; +import org.nuiton.mapstoragemanager.ui.engine.ApplicationEngine; /** * Logger. Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java 2010-03-18 13:20:41 UTC (rev 254) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java 2010-03-18 13:28:20 UTC (rev 255) @@ -79,6 +79,22 @@ new File(new File("").getAbsolutePath()).getParentFile(); /** + * Getter for MSM_BASEDIR. + * @return MSM_BASEDIR + */ + public static File getMSM_BASEDIR() { + return MSM_BASEDIR; + } + + /** + * Getter for MSM_PLUGINS_DIR. + * @return MSM_PLUGINS_DIR + */ + public static File getMSM_PLUGINS_DIR() { + return MSM_PLUGINS_DIR; + } + + /** * msm plugin dir. */ private static final File MSM_PLUGINS_DIR =

1 0

r254 - in trunk: msm/src/main/java/org/nuiton/mapstoragemanager/ui msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager
by dlanglais＠users.nuiton.org 18 Mar '10

18 Mar '10

Author: dlanglais Date: 2010-03-18 14:20:41 +0100 (Thu, 18 Mar 2010) New Revision: 254 Log: Ajout d'un BootLoaderManager pour les plugins ?\195?\160 charger au d?\195?\169marrage. J'ai l'impression que tu n'as pas re?\195?\167u mon sms florent... Added: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx Modified: trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginManager.jaxx trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx Added: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx (rev 0) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx 2010-03-18 13:20:41 UTC (rev 254) @@ -0,0 +1,134 @@ +<Application id='bootLoaderManager' width='640' height='480' onWindowClosing='getInstance().setVisible(false)'> + +  + <script> + <![CDATA[ +import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; + +/** + * Logger. + */ +private static final Log LOG = LogFactory.getLog(BootLoaderManager.class); + +/** + * classe instance (singleton pattern). + */ +private static BootLoaderManager instance = null; + +/** + * getInstance method (singleton pattern). + * @return instance of the class + */ +public static BootLoaderManager getInstance() { + if (instance == null){ + instance = new BootLoaderManager(); + } + instance.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); + instance.refreshJarList(); + return instance; +} + +/** + * loadAPlugin. + * Call the MSM instance to load a Plugin. + */ +public void loadAPlugin() { + ApplicationEngine.getInstance().loadAPlugin(); + refreshJarList(); +} + +/** + * Refresh the jar list. + * Read .properties of the pluginFolderPath. + * For each .jar file : + * - show a checkBox to load or not the plugin at startup, + * - show the .jar url. + */ +public void refreshJarList() { + + /** Load properties file of the folder. */ + final Properties properties = new Properties(); + final File propertiesFile = new File(ApplicationEngine.getInstance().getMSM_PLUGINS_DIR(), ".properties"); + try { + FileInputStream fis = new FileInputStream(propertiesFile); + properties.load(fis); + } catch (FileNotFoundException e) { + try { + FileOutputStream fos = new FileOutputStream(propertiesFile); + properties.store(fos , null); + fos.close(); + } catch (FileNotFoundException ex) { + LOG.fatal(ex, ex); + } catch (IOException ex) { + LOG.fatal(ex, ex); + } + } catch (IOException ex) { + LOG.error(ex, ex); + } + + /** + * For each Jar file + */ + for (final String propertyName : properties.stringPropertyNames()) { + if(propertyName.endsWith(".jar")) { + final String propertyValue = properties.getProperty(propertyName); + LOG.info(propertyName + " : " + propertyValue); + + final JCheckBox checkBox = new JCheckBox(); + + /** If propertyValue equals true, checkBox selected, + * else not selected. */ + final boolean selected = "true".equals(propertyValue); + checkBox.setSelected(selected); + checkBox.addActionListener(new ActionListener() { + boolean selectedState = selected; + @Override + public void actionPerformed(ActionEvent e) { + /** Invert selected State */ + selectedState = !selectedState; + /** Modify properties */ + properties.put(propertyName, Boolean.toString(selectedState)); + try { + FileOutputStream fos = new FileOutputStream(propertiesFile); + /** Store modified properties */ + properties.store(fos , null); + fos.close(); + } catch (FileNotFoundException ex) { + LOG.fatal(ex, ex); + } catch (IOException ex) { + LOG.fatal(ex, ex); + } + } + }); + + final JLabel label = new JLabel(propertyName); + + final JPanel panel = new JPanel(new FlowLayout(FlowLayout.LEFT)); + panel.add(checkBox); + panel.add(label); + + this.getBootLoaderPanel().add(panel); + } + } + + this.getBootLoaderPanel().updateUI(); +} + ]]> + </script> + +  + <style source='MainUI.css'/> + +  + <JMenuBar> + <JMenu id='menuPlugin'> + <JMenuItem id='menuPluginLoad' + onActionPerformed='this.loadAPlugin()' /> + <JMenuItem id='refreshJarList' + onActionPerformed='this.refreshJarList()' /> + </JMenu> + </JMenuBar> + <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'> + <VBox layout='{new GridLayout(0,1)}' id='bootLoaderPanel' /> + </JPanel> +</Application> \ No newline at end of file Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-18 13:11:33 UTC (rev 253) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-18 13:20:41 UTC (rev 254) @@ -155,6 +155,8 @@ <JMenuItem id='menuPluginSave' onActionPerformed='engine.savePlugin()'/> <JSeparator/> + <JMenuItem id='menuPluginBootLoaderManager' + onActionPerformed='BootLoaderManager.getInstance().setVisible(true)'/> </JMenu> <JMenu id='menuHelp'> Modified: trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginManager.jaxx =================================================================== --- trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginManager.jaxx 2010-03-18 13:11:33 UTC (rev 253) +++ trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginManager.jaxx 2010-03-18 13:20:41 UTC (rev 254) @@ -12,6 +12,7 @@ * classe instance (singleton pattern). */ private static PluginManager instance = null; + /** * MenuItemPlugin. */

1 0