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

r100 - in trunk/msm/src/main/java/org/nuiton/mapstoragemanager: . core
by dlanglais＠users.nuiton.org 18 Feb '10

18 Feb '10

Author: dlanglais Date: 2010-02-18 10:16:23 +0100 (Thu, 18 Feb 2010) New Revision: 100 Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java Log: passage des classes main en public final. Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-02-18 08:47:52 UTC (rev 99) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-02-18 09:16:23 UTC (rev 100) @@ -15,7 +15,7 @@ * Mise a jour: $Date: 2010-01-21 15:24:35 +0100 (jeu., 21 janv. 2010) $ par : * $Author: tchemit $ */ -public class Main { +public final class Main { Locale locale = Locale.FRANCE; Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-02-18 08:47:52 UTC (rev 99) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-02-18 09:16:23 UTC (rev 100) @@ -9,7 +9,7 @@ * @deprecated Use org.nuiton.mapstoragemanager.core.BigTableLoaderText instead */ @Deprecated -public class TestServiceLoader { +public final class TestServiceLoader { /** * Logger.

1 0

r99 - trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase
by dlanglais＠users.nuiton.org 18 Feb '10

18 Feb '10

Author: dlanglais Date: 2010-02-18 09:47:52 +0100 (Thu, 18 Feb 2010) New Revision: 99 Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseNewBigTable.java Log: am?\195?\169lioration qualit?\195?\169 (suppresion imports inutile, variable inutile). Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseNewBigTable.java =================================================================== --- trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseNewBigTable.java 2010-02-18 08:42:25 UTC (rev 98) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseNewBigTable.java 2010-02-18 08:47:52 UTC (rev 99) @@ -5,8 +5,6 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.MasterNotRunningException; @@ -185,7 +183,6 @@ put.add(column.getBytes(), key.getBytes(), content.getBytes()); //HTable hTable = new HTable(config, table); - Result result; synchronized (selectedTable) { this.selectTable(table); this.selectedTable.put(put);

1 0

r98 - in trunk/msm/src/main/java/org/nuiton/mapstoragemanager: . ui ui/gui
by fgilet＠users.nuiton.org 18 Feb '10

18 Feb '10

Author: fgilet Date: 2010-02-18 09:42:25 +0100 (Thu, 18 Feb 2010) New Revision: 98 Added: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMModel.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMNavigationListener.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java Modified: 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/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java Log: Travail sur la navigation et le contenu d'une table. Affichage de l'arborescence lors de la validation d'une connexion. Affichage du contenu d'une table lors de la selection d'un noeud de l'arbre. Affichage basique (A modifier). Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-02-17 22:06:29 UTC (rev 97) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-02-18 08:42:25 UTC (rev 98) @@ -16,11 +16,13 @@ * $Author: tchemit $ */ public class Main { - + + Locale locale = Locale.FRANCE; + private Main(){ I18n.setUniqueBundleName("mapstoragemanager-i18n"); - I18n.init(Locale.FRANCE); - final MainUI ui = new MainUI(); + I18n.init(locale); + final MainUI ui = MainUI.getInstance(); SwingUtilities.invokeLater(new Runnable() { Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-02-17 22:06:29 UTC (rev 97) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-02-18 08:42:25 UTC (rev 98) @@ -5,8 +5,27 @@ <script> <![CDATA[ import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; + import javax.swing.tree.*; - ApplicationEngine engine = new ApplicationEngine(); + ApplicationEngine engine = new ApplicationEngine(this); + + /** + * classe instance (singleton pattern). + */ + private static MainUI instance = null; + + /** + * getInstance method (singleton pattern). + * @return instance of the class + */ + public static MainUI getInstance() { + if (instance == null){ + instance = new MainUI(); + } + return instance; + } + + ]]> </script> @@ -53,47 +72,27 @@ <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'/> + <JAXXComboBox id='nameBase' onActionPerformed='engine.doSomething()' > + <item value='HBase' selected='true' /> <item value='Cassandra'/> <item value='Other'/> </JAXXComboBox> <JLabel text="login :" styleClass='boldUnderline'/> - <JTextField/> + <JTextField id='login'/> <JLabel text="password :" styleClass='boldUnderline'/> - <JPasswordField/> - <JButton text="ok"/> + <JPasswordField id='password'/> + <JButton text="ok" onActionPerformed='engine.connection()'/> </JToolBar> - <JSplitPane constraints='BorderLayout.CENTER' dividerLocation='200' > + <JSplitPane constraints='BorderLayout.CENTER' dividerLocation='300' > <JScrollPane> <JPanel> -  - - <JAXXTree id='baseSchema' showsRootHandles='true' onValueChanged='engine.doSomething()' > - <item value='No base schema' /> - </JAXXTree> + model='{new DefaultTreeModel(new DefaultMutableTreeNode("Welcome to MapStorageManager"))}' /> </JPanel> </JScrollPane> <JScrollPane> -  - - <VBox horizontalAlignment='center'> - <JPanel> - </JPanel> - <JLabel text="TABLE NAME : TODO"/> - </VBox> </JScrollPane> </JSplitPane> </JPanel> Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-02-17 22:06:29 UTC (rev 97) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-02-18 08:42:25 UTC (rev 98) @@ -3,8 +3,16 @@ import java.util.Locale; import java.util.ResourceBundle; import javax.swing.JOptionPane; +import javax.swing.SwingUtilities; +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.DefaultTreeModel; +import javax.swing.tree.MutableTreeNode; +import javax.swing.tree.TreeModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.i18n.I18n; +import org.nuiton.mapstoragemanager.Main; +import org.nuiton.mapstoragemanager.ui.MainUI; /** * Engine Class with methods for application user interface. @@ -21,6 +29,12 @@ private Locale currentLocale; private ResourceBundle messages; + public MainUI application; + + public ApplicationEngine(MainUI application){ + this.application = application; + } + /** * Show the developers. * // TODO @@ -47,8 +61,47 @@ * @param country the country */ public void setLocale(String language, String country) { - currentLocale= new Locale(language,country); - messages = ResourceBundle.getBundle("mapstoragemanager",currentLocale); - LOG.info(messages.getString("ok")); + /*Locale locale = new Locale(language,country); + System.out.println("local en "+language+"_"+country); + I18n.close(); + I18n.setUniqueBundleName("mapstoragemanager-i18n"); + I18n.init(locale); + final MainUI ui = new MainUI(); + ui.setVisible(true);*/ } + + /*public void setMainUI(MainUI application) { + this.application = application; + }*/ + + public void connection(){ + String nameBase = MainUI.getInstance().getNameBase().getSelectedJaxxItem().getValue().toString(); + String login = MainUI.getInstance().getLogin().getText(); + char[] password = MainUI.getInstance().getPassword().getPassword(); + + //connection verification + boolean goodUse = true; + //boolean goodUse = verifyConnection(nameBase, login, password); + if(goodUse){ + //update tree + MainUI.getInstance().getNavigation().setModel(new MSMModel(nameBase)); + MainUI.getInstance().getNavigation().addTreeSelectionListener(new MSMNavigationListener()); + + DefaultMutableTreeNode root = (DefaultMutableTreeNode) MainUI.getInstance().getNavigation().getModel().getRoot(); + DefaultTreeModel dtm = ((DefaultTreeModel) MainUI.getInstance().getNavigation().getModel()); + dtm.insertNodeInto(new DefaultMutableTreeNode("table1"), root, root.getChildCount()); + dtm.insertNodeInto(new DefaultMutableTreeNode("table2"), root, root.getChildCount()); + dtm.insertNodeInto(new DefaultMutableTreeNode("table3"), root, root.getChildCount()); + + MainUI.getInstance().getNavigation().repaint(); + MainUI.getInstance().getNavigation().revalidate(); + }else{ + //display error + JOptionPane.showMessageDialog(null, "The connection attempt has failed, Please retry !"); + } + + } + + + } Added: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMModel.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMModel.java (rev 0) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMModel.java 2010-02-18 08:42:25 UTC (rev 98) @@ -0,0 +1,30 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package org.nuiton.mapstoragemanager.ui.gui; + +import java.awt.*; +import javax.swing.*; +import javax.swing.event.TreeModelListener; +import javax.swing.tree.*; +import jaxx.runtime.swing.Item; +import jaxx.runtime.swing.JAXXComboBox; +import org.nuiton.mapstoragemanager.ui.MainUI; + +/** + * + * @author E045231P + */ +public class MSMModel extends DefaultTreeModel { + + public MSMModel(String value){ + super(null); + DefaultMutableTreeNode racine = new DefaultMutableTreeNode(value); + setRoot(racine); + } + + + +} Added: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMNavigationListener.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMNavigationListener.java (rev 0) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMNavigationListener.java 2010-02-18 08:42:25 UTC (rev 98) @@ -0,0 +1,46 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package org.nuiton.mapstoragemanager.ui.gui; + +import javax.swing.JTable; +import javax.swing.event.TreeSelectionEvent; +import javax.swing.event.TreeSelectionListener; +import javax.swing.tree.DefaultMutableTreeNode; +import org.nuiton.mapstoragemanager.ui.MainUI; + +/** + * + * @author E045231P + */ +public class MSMNavigationListener implements TreeSelectionListener { + + @Override + public void valueChanged(TreeSelectionEvent e) { + DefaultMutableTreeNode node = (DefaultMutableTreeNode)MainUI.getInstance().getNavigation().getLastSelectedPathComponent(); + MainUI.getInstance().getTableContent().removeAll() + ; + /* if nothing is selected */ + if (node == null) { + return; + } else { + //we create a standard model of table + TableModel exemple = new TableModel(); + JTable jTable = new JTable(exemple); + + //we check attributes and values of the select table + + + //and display the result into the JPanel named 'tableContent' + MainUI.getInstance().getTableContent().add(jTable); + } + + MainUI.getInstance().getTableContent().repaint(); + MainUI.getInstance().getTableContent().revalidate(); + } + + + +} Added: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java (rev 0) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java 2010-02-18 08:42:25 UTC (rev 98) @@ -0,0 +1,45 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package org.nuiton.mapstoragemanager.ui.gui; + +import javax.swing.table.AbstractTableModel; + +/** + * + * @author E045231P + */ +public class TableModel extends AbstractTableModel { + + public TableModel() { } + + public int getColumnCount() { + return 10; + } + + public Object getValueAt(int parm1, int parm2) { + if(parm1==0) + if( parm2==0) return "1"; else return ""; + else + if(parm2>parm1) return ""; + else + if (parm2==parm1) return "1"; + else + if (parm2==0) return "1"; + else{ + int i = Integer.parseInt((String)getValueAt(parm1-1, parm2-1)); + int j = Integer.parseInt((String)getValueAt(parm1-1, parm2)); + return Integer.toString(i+j); + } + } + + public int getRowCount() { + return 10; + } + + public String getColumnName(int col){ + return ""; + } +}

1 0

r97 - trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase
by dlanglais＠users.nuiton.org 17 Feb '10

17 Feb '10

Author: dlanglais Date: 2010-02-17 23:06:29 +0100 (Wed, 17 Feb 2010) New Revision: 97 Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseNewBigTable.java Log: Ajout javacode et "synchronized" sur selectedTable pour empecher les acc?\195?\168s concurents sur selectedTable... Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseNewBigTable.java =================================================================== --- trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseNewBigTable.java 2010-02-17 21:56:07 UTC (rev 96) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseNewBigTable.java 2010-02-17 22:06:29 UTC (rev 97) @@ -32,14 +32,29 @@ */ private static final Log LOG = LogFactory.getLog(NewBigTable.class); + /** + * HBaseAdmin. + * Permit to manage the HBase. + */ private HBaseAdmin hBaseAdmin; + /** + * HBaseConfiguration. + * Contains the configuration to connect to the HBase. + */ private HBaseConfiguration config; + /** + * The selected Table. + */ private HTable selectedTable; // private HTable table; // private String familyName = "mylittlecolumnfamily"; // private String rowName = "myLittleRow"; // private String tableName = "mylittletable"; + /** + * HBase plugin Constructor. + * @throws MasterNotRunningException + */ public HBaseNewBigTable() throws MasterNotRunningException { // You need a configuration object to tell the client where to connect. // When you create a HBaseConfiguration, it reads in whatever you've set @@ -170,8 +185,11 @@ put.add(column.getBytes(), key.getBytes(), content.getBytes()); //HTable hTable = new HTable(config, table); - this.selectTable(table); - this.selectedTable.put(put); + Result result; + synchronized (selectedTable) { + this.selectTable(table); + this.selectedTable.put(put); + } LOG.trace("put " + table + " " + column + " " + key + " " + content); } catch (IOException ex) { @@ -189,8 +207,11 @@ get = get.addColumn(column.getBytes()); //HTable hTable = new HTable(config, table); - this.selectTable(table); - Result result = this.selectedTable.get(get); + Result result; + synchronized (selectedTable) { + this.selectTable(table); + result = this.selectedTable.get(get); + } ret = result.getCellValue().toString(); @@ -212,8 +233,11 @@ get = get.setTimeStamp(version); //HTable hTable = new HTable(config, table); - this.selectTable(table); - Result result = this.selectedTable.get(get); + Result result; + synchronized (selectedTable) { + this.selectTable(table); + result = this.selectedTable.get(get); + } ret = result.getCellValue().toString(); @@ -236,9 +260,12 @@ get = get.addColumn(column.getBytes()); //HTable hTable = new HTable(config, table); - this.selectTable(table); - Result result = this.selectedTable.get(get); - + Result result; + synchronized (selectedTable) { + this.selectTable(table); + result = this.selectedTable.get(get); + } + String columnContent = result.getCellValue().toString(); ret.put(column, columnContent); @@ -258,13 +285,15 @@ public Set<String> getKeys(String table) { Set<String> ret = new HashSet<String>(); try { - //HTable hTable = new HTable(config, table); - this.selectTable(table); - Set<byte[]> familiesKeys; - familiesKeys = - this.selectedTable.getTableDescriptor().getFamiliesKeys(); - for (byte[] key : familiesKeys) { - ret.add(key.toString()); + + synchronized (selectedTable) { + this.selectTable(table); + Set<byte[]> familiesKeys; + familiesKeys = + this.selectedTable.getTableDescriptor().getFamiliesKeys(); + for (byte[] key : familiesKeys) { + ret.add(key.toString()); + } } } catch (IOException ex) {

1 0

r96 - in trunk/msm-hbase/src: main/java/org/nuiton/mapstoragemanager/plugins/hbase site
by dlanglais＠users.nuiton.org 17 Feb '10

17 Feb '10

Author: dlanglais Date: 2010-02-17 22:56:07 +0100 (Wed, 17 Feb 2010) New Revision: 96 Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseNewBigTable.java trunk/msm-hbase/src/site/todo.rst Log: Avancement plugin HBaseNewBigTable Toujours autant ?\195?\160 tester... Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseNewBigTable.java =================================================================== --- trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseNewBigTable.java 2010-02-17 20:44:44 UTC (rev 95) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseNewBigTable.java 2010-02-17 21:56:07 UTC (rev 96) @@ -1,6 +1,7 @@ package org.nuiton.mapstoragemanager.plugins.hbase; import java.io.IOException; +import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; @@ -14,7 +15,6 @@ import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTable; @@ -34,7 +34,7 @@ private HBaseAdmin hBaseAdmin; private HBaseConfiguration config; - private HTable hTable; + private HTable selectedTable; // private HTable table; // private String familyName = "mylittlecolumnfamily"; // private String rowName = "myLittleRow"; @@ -49,7 +49,6 @@ new org.apache.hadoop.conf.Configuration(); config = new HBaseConfiguration(conf); hBaseAdmin = new HBaseAdmin(config); - LOG.info("test"); } /** @@ -170,9 +169,10 @@ Put put = new Put(key.getBytes()); put.add(column.getBytes(), key.getBytes(), content.getBytes()); - HTable hTable = new HTable(config, table); - hTable.put(put); - + //HTable hTable = new HTable(config, table); + this.selectTable(table); + this.selectedTable.put(put); + LOG.trace("put " + table + " " + column + " " + key + " " + content); } catch (IOException ex) { LOG.error(ex, ex); @@ -188,8 +188,9 @@ Get get = new Get(key.getBytes()); get = get.addColumn(column.getBytes()); - HTable hTable = new HTable(config, table); - Result result = hTable.get(get); + //HTable hTable = new HTable(config, table); + this.selectTable(table); + Result result = this.selectedTable.get(get); ret = result.getCellValue().toString(); @@ -204,27 +205,82 @@ * {@inheritDoc} */ public String get(String table, String column, String key, int version) { - throw new UnsupportedOperationException("Not supported yet."); + String ret = ""; + try { + Get get = new Get(key.getBytes()); + get = get.addColumn(column.getBytes()); + get = get.setTimeStamp(version); + + //HTable hTable = new HTable(config, table); + this.selectTable(table); + Result result = this.selectedTable.get(get); + + ret = result.getCellValue().toString(); + + LOG.trace("put " + table + " " + column + " " + key + " " + ret + + " " + version); + } catch (IOException ex) { + LOG.error(ex, ex); + } + return ret; } /** * {@inheritDoc} */ public Map<String, String> getRow(String table, String key) { - throw new UnsupportedOperationException("Not supported yet."); + Map<String, String> ret = new HashMap<String, String>(); + try { + for (String column : this.getColumnsNames(table)) { + Get get = new Get(key.getBytes()); + get = get.addColumn(column.getBytes()); + + //HTable hTable = new HTable(config, table); + this.selectTable(table); + Result result = this.selectedTable.get(get); + + String columnContent = result.getCellValue().toString(); + + ret.put(column, columnContent); + } + + + LOG.trace("row " + key + " " + ret.toString()); + } catch (IOException ex) { + LOG.error(ex, ex); + } + return ret; } /** * {@inheritDoc} */ public Set<String> getKeys(String table) { - throw new UnsupportedOperationException("Not supported yet."); + Set<String> ret = new HashSet<String>(); + try { + //HTable hTable = new HTable(config, table); + this.selectTable(table); + Set<byte[]> familiesKeys; + familiesKeys = + this.selectedTable.getTableDescriptor().getFamiliesKeys(); + for (byte[] key : familiesKeys) { + ret.add(key.toString()); + } + + } catch (IOException ex) { + LOG.error(ex, ex); + } + return ret; } /** * {@inheritDoc} */ public void selectTable(String table) { - throw new UnsupportedOperationException("Not supported yet."); + try { + selectedTable = new HTable(config, table); + } catch (IOException ex) { + LOG.error(ex, ex); + } } } Modified: trunk/msm-hbase/src/site/todo.rst =================================================================== --- trunk/msm-hbase/src/site/todo.rst 2010-02-17 20:44:44 UTC (rev 95) +++ trunk/msm-hbase/src/site/todo.rst 2010-02-17 21:56:07 UTC (rev 96) @@ -11,7 +11,7 @@ - getColumnsNames [to test] - put [to test] - get [to test] - - get (version) [pending] - - getRow [pending] - - getKeys [pending] - - selectTable [pending] \ No newline at end of file + - get (version) [to test] + - getRow [to test] + - getKeys [to test] + - selectTable [to test] \ No newline at end of file

1 0

r95 - in trunk/msm-hbase/src: main/java/org/nuiton/mapstoragemanager/plugins/hbase site
by dlanglais＠users.nuiton.org 17 Feb '10

17 Feb '10

Author: dlanglais Date: 2010-02-17 21:44:44 +0100 (Wed, 17 Feb 2010) New Revision: 95 Added: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/NoSuchTableException.java trunk/msm-hbase/src/site/todo.rst Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseNewBigTable.java Log: Avancement plugin HBase, todo.rst -> commente l'avancement. Pour le moment, ce que j'ai impl?\195?\169ment?\195?\169 est fait en "suivant" l'API HBase. Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseNewBigTable.java =================================================================== --- trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseNewBigTable.java 2010-02-17 18:51:10 UTC (rev 94) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseNewBigTable.java 2010-02-17 20:44:44 UTC (rev 95) @@ -4,6 +4,8 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.MasterNotRunningException; @@ -12,8 +14,12 @@ import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.KeyValue; +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; /** * A plugin for MSM using HBase API. @@ -28,6 +34,7 @@ private HBaseAdmin hBaseAdmin; private HBaseConfiguration config; + private HTable hTable; // private HTable table; // private String familyName = "mylittlecolumnfamily"; // private String rowName = "myLittleRow"; @@ -60,6 +67,7 @@ HTableDescriptor hTableDescriptor = new HTableDescriptor(table); try { hBaseAdmin.createTable(hTableDescriptor); + LOG.trace("table " + table + " created."); } catch (IOException ex) { LOG.error(ex, ex); } @@ -71,6 +79,7 @@ public void deleteTable(String table) { try { hBaseAdmin.deleteTable(table); + LOG.trace("table " + table + " deleted."); } catch (IOException ex) { LOG.error(ex, ex); } @@ -102,6 +111,7 @@ HColumnDescriptor hColumnDescriptor = new HColumnDescriptor(column); try { hBaseAdmin.addColumn(table, hColumnDescriptor); + LOG.trace("colum " + column + " created in table " + table + "."); } catch (IOException ex) { LOG.error(ex, ex); } @@ -113,6 +123,7 @@ public void deleteColumn(String table, String column) { try { hBaseAdmin.deleteColumn(table, column); + LOG.trace("colum " + column + " deleted from table " + table + "."); } catch (IOException ex) { LOG.error(ex, ex); } @@ -122,21 +133,71 @@ * {@inheritDoc} */ public Set<String> getColumnsNames(String table) { - throw new UnsupportedOperationException("Not supported yet."); + Set<String> columnsNames = new HashSet<String>(); + try { + if (hBaseAdmin.tableExists(table)) { + HTableDescriptor hTableDescriptor; + hTableDescriptor = + hBaseAdmin.getTableDescriptor(table.getBytes()); + + HColumnDescriptor[] hColumnsDescriptor; + hColumnsDescriptor = hTableDescriptor.getColumnFamilies(); + + for (int i = 0 ; i < hColumnsDescriptor.length ; i++) { + columnsNames.add(hColumnsDescriptor[i].getNameAsString()); + } + + } else { + try { + throw new NoSuchTableException(table); + } catch (NoSuchTableException ex) { + LOG.error(ex, ex); + } + } + } catch (MasterNotRunningException ex) { + LOG.error(ex, ex); + } catch (IOException ex) { + LOG.error(ex, ex); + } + return columnsNames; } /** * {@inheritDoc} */ public void put(String table, String column, String key, String content) { - throw new UnsupportedOperationException("Not supported yet."); + try { + Put put = new Put(key.getBytes()); + put.add(column.getBytes(), key.getBytes(), content.getBytes()); + + HTable hTable = new HTable(config, table); + hTable.put(put); + + LOG.trace("put " + table + " " + column + " " + key + " " + content); + } catch (IOException ex) { + LOG.error(ex, ex); + } } /** * {@inheritDoc} */ public String get(String table, String column, String key) { - throw new UnsupportedOperationException("Not supported yet."); + String ret = ""; + try { + Get get = new Get(key.getBytes()); + get = get.addColumn(column.getBytes()); + + HTable hTable = new HTable(config, table); + Result result = hTable.get(get); + + ret = result.getCellValue().toString(); + + LOG.trace("put " + table + " " + column + " " + key + " " + ret); + } catch (IOException ex) { + LOG.error(ex, ex); + } + return ret; } /** Added: 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 (rev 0) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/NoSuchTableException.java 2010-02-17 20:44:44 UTC (rev 95) @@ -0,0 +1,16 @@ +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 !"); + } +} Added: trunk/msm-hbase/src/site/todo.rst =================================================================== --- trunk/msm-hbase/src/site/todo.rst (rev 0) +++ trunk/msm-hbase/src/site/todo.rst 2010-02-17 20:44:44 UTC (rev 95) @@ -0,0 +1,17 @@ + +Function to implement in HBaseNewBigTable +========================================= + + - connect [pending] + - createTable [to test] + - deleteTable [to test] + - getTablesNames [to test] + - createColumn [to test] + - deleteColumn [to test] + - getColumnsNames [to test] + - put [to test] + - get [to test] + - get (version) [pending] + - getRow [pending] + - getKeys [pending] + - selectTable [pending] \ No newline at end of file

1 0

r94 - trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase
by dlanglais＠users.nuiton.org 17 Feb '10

17 Feb '10

Author: dlanglais Date: 2010-02-17 19:51:10 +0100 (Wed, 17 Feb 2010) New Revision: 94 Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseNewBigTable.java Log: Modifications mineures... (les PC s'?\195?\169teignent ?\195?\160 19h55 ?\195?\160 la fac...) Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseNewBigTable.java =================================================================== --- trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseNewBigTable.java 2010-02-17 18:24:43 UTC (rev 93) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseNewBigTable.java 2010-02-17 18:51:10 UTC (rev 94) @@ -15,6 +15,10 @@ import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTable; +/** + * A plugin for MSM using HBase API. + * @author Dorian Langlais + */ public class HBaseNewBigTable implements NewBigTable { /** @@ -24,10 +28,10 @@ private HBaseAdmin hBaseAdmin; private HBaseConfiguration config; - private HTable table; - private String familyName = "mylittlecolumnfamily"; - private String rowName = "myLittleRow"; - private String tableName = "mylittletable"; +// private HTable table; +// private String familyName = "mylittlecolumnfamily"; +// private String rowName = "myLittleRow"; +// private String tableName = "mylittletable"; public HBaseNewBigTable() throws MasterNotRunningException { // You need a configuration object to tell the client where to connect. @@ -41,13 +45,17 @@ LOG.info("test"); } - @Override + /** + * {@inheritDoc} + */ public boolean connect(String host, int port, String base, String username, String passwd) { throw new UnsupportedOperationException("Not supported yet."); } - @Override + /** + * {@inheritDoc} + */ public void createTable(String table) { HTableDescriptor hTableDescriptor = new HTableDescriptor(table); try { @@ -57,7 +65,9 @@ } } - @Override + /** + * {@inheritDoc} + */ public void deleteTable(String table) { try { hBaseAdmin.deleteTable(table); @@ -66,7 +76,9 @@ } } - @Override + /** + * {@inheritDoc} + */ public Set<String> getTablesNames() { Set<String> tablesNames = new HashSet<String>(); try { @@ -83,7 +95,9 @@ return tablesNames; } - @Override + /** + * {@inheritDoc} + */ public void createColumn(String table, String column) { HColumnDescriptor hColumnDescriptor = new HColumnDescriptor(column); try { @@ -93,7 +107,9 @@ } } - @Override + /** + * {@inheritDoc} + */ public void deleteColumn(String table, String column) { try { hBaseAdmin.deleteColumn(table, column); @@ -102,37 +118,51 @@ } } - @Override + /** + * {@inheritDoc} + */ public Set<String> getColumnsNames(String table) { throw new UnsupportedOperationException("Not supported yet."); } - @Override + /** + * {@inheritDoc} + */ public void put(String table, String column, String key, String content) { throw new UnsupportedOperationException("Not supported yet."); } - @Override + /** + * {@inheritDoc} + */ public String get(String table, String column, String key) { throw new UnsupportedOperationException("Not supported yet."); } - @Override + /** + * {@inheritDoc} + */ public String get(String table, String column, String key, int version) { throw new UnsupportedOperationException("Not supported yet."); } - @Override + /** + * {@inheritDoc} + */ public Map<String, String> getRow(String table, String key) { throw new UnsupportedOperationException("Not supported yet."); } - @Override + /** + * {@inheritDoc} + */ public Set<String> getKeys(String table) { throw new UnsupportedOperationException("Not supported yet."); } - @Override + /** + * {@inheritDoc} + */ public void selectTable(String table) { throw new UnsupportedOperationException("Not supported yet."); }

1 0

r93 - in trunk: msm-bighashmap msm-bighashmapV2 msm-hbase
by dlanglais＠users.nuiton.org 17 Feb '10

17 Feb '10

Author: dlanglais Date: 2010-02-17 19:24:43 +0100 (Wed, 17 Feb 2010) New Revision: 93 Modified: trunk/msm-bighashmap/pom.xml trunk/msm-bighashmapV2/pom.xml trunk/msm-hbase/pom.xml Log: Bon, une erreur "?\195?\160 la ***" msn au lieu de msm. Avec maven qui enregistre les jar que l'on a correctement compil?\195?\169 dans ~/.m2/repositories/* lors du build sur ma machine ras (il utilisait les "vieux" jars). Et maintenant, build ou build pas ? Modified: trunk/msm-bighashmap/pom.xml =================================================================== --- trunk/msm-bighashmap/pom.xml 2010-02-17 17:49:31 UTC (rev 92) +++ trunk/msm-bighashmap/pom.xml 2010-02-17 18:24:43 UTC (rev 93) @@ -23,13 +23,13 @@ </parent> <version>0.1-SNAPSHOT</version> - <artifactId>msn-bighashmap</artifactId> + <artifactId>msm-bighashmap</artifactId> <dependencies> <dependency> <groupId>org.nuiton</groupId> - <artifactId>msn</artifactId> + <artifactId>msm</artifactId> <version>0.1-SNAPSHOT</version> </dependency> @@ -38,6 +38,7 @@ <artifactId>nuiton-utils</artifactId> <version>${lutinutil.version}</version> </dependency> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> Modified: trunk/msm-bighashmapV2/pom.xml =================================================================== --- trunk/msm-bighashmapV2/pom.xml 2010-02-17 17:49:31 UTC (rev 92) +++ trunk/msm-bighashmapV2/pom.xml 2010-02-17 18:24:43 UTC (rev 93) @@ -23,13 +23,13 @@ </parent> <version>0.1-SNAPSHOT</version> - <artifactId>msn-bighashmapv2</artifactId> + <artifactId>msm-bighashmapv2</artifactId> <dependencies> <dependency> <groupId>org.nuiton</groupId> - <artifactId>msn</artifactId> + <artifactId>msm</artifactId> <version>0.1-SNAPSHOT</version> </dependency> Modified: trunk/msm-hbase/pom.xml =================================================================== --- trunk/msm-hbase/pom.xml 2010-02-17 17:49:31 UTC (rev 92) +++ trunk/msm-hbase/pom.xml 2010-02-17 18:24:43 UTC (rev 93) @@ -23,13 +23,13 @@ </parent> <version>0.1-SNAPSHOT</version> - <artifactId>msn-hbase</artifactId> + <artifactId>msm-hbase</artifactId> <dependencies> <dependency> <groupId>org.nuiton</groupId> - <artifactId>msn</artifactId> + <artifactId>msm</artifactId> <version>0.1-SNAPSHOT</version> </dependency>

1 0

r92 - in trunk: msm-bighashmap msm-bighashmapV2 msm-hbase
by dlanglais＠users.nuiton.org 17 Feb '10

17 Feb '10

Author: dlanglais Date: 2010-02-17 18:49:31 +0100 (Wed, 17 Feb 2010) New Revision: 92 Modified: trunk/msm-bighashmap/pom.xml trunk/msm-bighashmapV2/pom.xml trunk/msm-hbase/pom.xml Log: Tentative de correction du build... (toujours pareil, une erreur qui n'arriche pas chez moi, mais surement de ma faute...) Modified: trunk/msm-bighashmap/pom.xml =================================================================== --- trunk/msm-bighashmap/pom.xml 2010-02-17 17:21:00 UTC (rev 91) +++ trunk/msm-bighashmap/pom.xml 2010-02-17 17:49:31 UTC (rev 92) @@ -31,7 +31,6 @@ <groupId>org.nuiton</groupId> <artifactId>msn</artifactId> <version>0.1-SNAPSHOT</version> - <type>jar</type> </dependency> <dependency> Modified: trunk/msm-bighashmapV2/pom.xml =================================================================== --- trunk/msm-bighashmapV2/pom.xml 2010-02-17 17:21:00 UTC (rev 91) +++ trunk/msm-bighashmapV2/pom.xml 2010-02-17 17:49:31 UTC (rev 92) @@ -31,7 +31,6 @@ <groupId>org.nuiton</groupId> <artifactId>msn</artifactId> <version>0.1-SNAPSHOT</version> - <type>jar</type> </dependency> <dependency> Modified: trunk/msm-hbase/pom.xml =================================================================== --- trunk/msm-hbase/pom.xml 2010-02-17 17:21:00 UTC (rev 91) +++ trunk/msm-hbase/pom.xml 2010-02-17 17:49:31 UTC (rev 92) @@ -31,7 +31,6 @@ <groupId>org.nuiton</groupId> <artifactId>msn</artifactId> <version>0.1-SNAPSHOT</version> - <type>jar</type> </dependency> <dependency>

1 0

r91 - in trunk: . msm
by dlanglais＠users.nuiton.org 17 Feb '10

17 Feb '10

Author: dlanglais Date: 2010-02-17 18:21:00 +0100 (Wed, 17 Feb 2010) New Revision: 91 Added: trunk/msm/ trunk/msm/LICENSE.txt trunk/msm/README.txt trunk/msm/changelog.txt trunk/msm/src/ Removed: trunk/mapstoragemanagerarch/ trunk/msm/LICENSE.txt trunk/msm/README.txt trunk/msm/changelog.txt trunk/msm/src/ Modified: trunk/pom.xml Log: Apres concertation, renommage du module mapstoragemanagerarch en MSM en suivant la logique du nommage des modules plugins Property changes on: trunk/msm ___________________________________________________________________ Added: svn:ignore + target Added: svn:mergeinfo + Deleted: trunk/msm/LICENSE.txt =================================================================== --- trunk/mapstoragemanagerarch/LICENSE.txt 2010-02-17 17:17:47 UTC (rev 90) +++ trunk/msm/LICENSE.txt 2010-02-17 17:21:00 UTC (rev 91) @@ -1,166 +0,0 @@ - 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. - Copied: trunk/msm/LICENSE.txt (from rev 89, trunk/mapstoragemanagerarch/LICENSE.txt) =================================================================== --- trunk/msm/LICENSE.txt (rev 0) +++ trunk/msm/LICENSE.txt 2010-02-17 17:21:00 UTC (rev 91) @@ -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. + Deleted: trunk/msm/changelog.txt =================================================================== --- trunk/mapstoragemanagerarch/changelog.txt 2010-02-17 17:17:47 UTC (rev 90) +++ trunk/msm/changelog.txt 2010-02-17 17:21:00 UTC (rev 91) @@ -1,2 +0,0 @@ -Changelog is not any longer maintained, please refer to the release note : - http://maven-site.nuiton.org/mapstoragemanager/changes-report.html Copied: trunk/msm/changelog.txt (from rev 89, trunk/mapstoragemanagerarch/changelog.txt) =================================================================== --- trunk/msm/changelog.txt (rev 0) +++ trunk/msm/changelog.txt 2010-02-17 17:21:00 UTC (rev 91) @@ -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 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-02-17 17:17:47 UTC (rev 90) +++ trunk/pom.xml 2010-02-17 17:21:00 UTC (rev 91) @@ -26,7 +26,7 @@ <artifactId>mapstoragemanager</artifactId> <modules> - <module>mapstoragemanagerarch</module> + <module>msm</module> <module>msm-bighashmap</module> <module>msm-bighashmapV2</module> <module>msm-hbase</module>

1 0