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

r109 - in trunk: msm-bighashmap msm-bighashmap/META-INF msm-bighashmap/META-INF/services msm-bighashmapV2 msm-bighashmapV2/META-INF msm-bighashmapV2/META-INF/services msm-hbase msm-hbase/META-INF msm-hbase/META-INF/services src/site/doc/plugins
by dlanglais＠users.nuiton.org 19 Feb '10

19 Feb '10

Author: dlanglais Date: 2010-02-19 17:04:53 +0100 (Fri, 19 Feb 2010) New Revision: 109 Added: trunk/msm-bighashmap/META-INF/ trunk/msm-bighashmap/META-INF/services/ trunk/msm-bighashmap/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable trunk/msm-bighashmapV2/META-INF/ trunk/msm-bighashmapV2/META-INF/services/ trunk/msm-bighashmapV2/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable trunk/msm-hbase/META-INF/ trunk/msm-hbase/META-INF/services/ trunk/msm-hbase/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable trunk/src/site/doc/plugins/howToDoPlugins.rst Removed: trunk/src/site/doc/plugins/howto.rst Log: Modification du nom du fichier mapstoragemanager/src/site/doc/plugins/howto en howToDoPlugins (nom plus explicite). En suivant ces instructions : - ajout des fichiers META-INF/services/nom_interface_implement?\195?\169 ; - fichiers contenant le nom de la classe impl?\195?\169mentant cette interface. Added: trunk/msm-bighashmap/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable =================================================================== --- trunk/msm-bighashmap/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable (rev 0) +++ trunk/msm-bighashmap/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable 2010-02-19 16:04:53 UTC (rev 109) @@ -0,0 +1 @@ +org.nuiton.mapstoragemanager.plugins.bighashmap.BigHashMap \ No newline at end of file Added: trunk/msm-bighashmapV2/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable =================================================================== --- trunk/msm-bighashmapV2/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable (rev 0) +++ trunk/msm-bighashmapV2/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable 2010-02-19 16:04:53 UTC (rev 109) @@ -0,0 +1 @@ +org.nuiton.mapstoragemanager.plugins.bighashmapv2.BigHashMap \ No newline at end of file Added: trunk/msm-hbase/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable =================================================================== --- trunk/msm-hbase/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable (rev 0) +++ trunk/msm-hbase/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable 2010-02-19 16:04:53 UTC (rev 109) @@ -0,0 +1 @@ +org.nuiton.mapstoragemanager.plugins.hbase.HBaseNewBigTable \ No newline at end of file Copied: trunk/src/site/doc/plugins/howToDoPlugins.rst (from rev 105, trunk/src/site/doc/plugins/howto.rst) =================================================================== --- trunk/src/site/doc/plugins/howToDoPlugins.rst (rev 0) +++ trunk/src/site/doc/plugins/howToDoPlugins.rst 2010-02-19 16:04:53 UTC (rev 109) @@ -0,0 +1,12 @@ + + +Comment développer un plugin pour l'application +=============================================== + +* créer un dossier META-INF/services +* créer un fichier nommé "nom_de_l_interface_implémentée" dans ce dossier + ex : org.nuiton.mapstoragemanager.plugins.BigTable +* dans ce fichier écrire simplement le nom de la classe implémentant l'interface spécifiée + ex : org.nuiton.mapstoragemanager.plugins.HBasePlugin +* créer un jar contenant vos classes et le dossier META-INF +* placer ce jar dans le dossier plugins Deleted: trunk/src/site/doc/plugins/howto.rst =================================================================== --- trunk/src/site/doc/plugins/howto.rst 2010-02-19 02:52:53 UTC (rev 108) +++ trunk/src/site/doc/plugins/howto.rst 2010-02-19 16:04:53 UTC (rev 109) @@ -1,12 +0,0 @@ - - -Comment développer un plugin pour l'application -=============================================== - -* créer un dossier META-INF/services -* créer un fichier nommé "nom_de_l_interface_implémentée" dans ce dossier - ex : org.nuiton.mapstoragemanager.plugins.BigTable -* dans ce fichier écrire simplement le nom de la classe implémentant l'interface spécifiée - ex : org.alma.mapstoragemanager.plugins.HBasePlugin -* créer un jar contenant vos classes et le dossier META-INF -* placer ce jar dans le dossier plugins

1 0

r108 - in trunk: msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase
by dlanglais＠users.nuiton.org 19 Feb '10

19 Feb '10

Author: dlanglais Date: 2010-02-19 03:52:53 +0100 (Fri, 19 Feb 2010) New Revision: 108 Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java Log: qualit?\195?\169 : - ajout d'accolades pour les if/else ; - unused import sur HBase (?\195?\160 supprimer... ?) ; Je ne sais pas si il serait utile d'ajouter des exceptions levables par nos plugins, type : - chercher quelque chose sur une table qui n'existe pas ? -> throw new NoSuchTableException(tablename); -> throw new NoSuchColumnException(columnname); -> ... Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java 2010-02-19 02:37:19 UTC (rev 107) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java 2010-02-19 02:52:53 UTC (rev 108) @@ -26,23 +26,32 @@ */ @Override public Object getValueAt(int rowIndex, int colIndex) { - if(rowIndex==0) - if( colIndex==0) return "1"; else return ""; - else - if(colIndex>rowIndex) return ""; - else - if (colIndex==rowIndex) return "1"; - else - if (colIndex==0) return "1"; - else{ - int i = Integer.parseInt((String)getValueAt(rowIndex-1, colIndex-1)); - int j = Integer.parseInt((String)getValueAt(rowIndex-1, colIndex)); - return Integer.toString(i+j); + if (rowIndex == 0) { + if (colIndex == 0) { + return "1"; + } else { + return ""; } - - //return data(rowIndex,colIndex); - - + } else { + if (colIndex > rowIndex) { + return ""; + } else { + if (colIndex == rowIndex) { + return "1"; + } else { + if (colIndex == 0) { + return "1"; + } else { + int i = Integer.parseInt((String) getValueAt(rowIndex - 1, colIndex - 1)); + int j = Integer.parseInt((String) getValueAt(rowIndex - 1, colIndex)); + return Integer.toString(i + j); + } + + //return data(rowIndex,colIndex); + + } + } + } } /** Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java =================================================================== --- trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java 2010-02-19 02:37:19 UTC (rev 107) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java 2010-02-19 02:52:53 UTC (rev 108) @@ -8,7 +8,7 @@ import org.nuiton.mapstoragemanager.plugins.BigTable; import org.apache.hadoop.hbase.HBaseConfiguration; -import org.apache.hadoop.hbase.client.Get; +//import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result;

1 0

r107 - trunk/msm
by dlanglais＠users.nuiton.org 19 Feb '10

19 Feb '10

Author: dlanglais Date: 2010-02-19 03:37:19 +0100 (Fri, 19 Feb 2010) New Revision: 107 Modified: trunk/msm/pom.xml Log: idem pr?\195?\169c?\195?\169dent : - oubli de suppression des properties "version" sur le pom msm. Modified: trunk/msm/pom.xml =================================================================== --- trunk/msm/pom.xml 2010-02-19 02:34:59 UTC (rev 106) +++ trunk/msm/pom.xml 2010-02-19 02:37:19 UTC (rev 107) @@ -138,22 +138,22 @@  <packaging>jar</packaging> - <properties> +  + main class in jar <maven.jar.main.class>org.nuiton.mapstoragemanager.Main</maven.jar.main.class> <jaxx.version>2.0.0-beta-3</jaxx.version> <lutinutil.version>1.1.2</lutinutil.version> <i18n.version>1.0.1</i18n.version> -  + jaxx <jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon> <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> -  - </properties> + <maven.gen.dir>${project.basedir}/target/generated-sources</maven.gen.dir> + </properties>--> <build>

1 0

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

19 Feb '10

Author: dlanglais Date: 2010-02-19 03:34:59 +0100 (Fri, 19 Feb 2010) New Revision: 106 Modified: trunk/msm-bighashmap/pom.xml trunk/msm-bighashmapV2/pom.xml trunk/msm-hbase/pom.xml trunk/msm/pom.xml trunk/pom.xml Log: nettoyages pom : - les modules ont pour parent mapstoragesmanger ; - dans les pom "fils" suppression des informations h?\195?\169rit?\195?\169es du pom parent... num?\195?\169ro de version i18n, jaxx... Modified: trunk/msm/pom.xml =================================================================== --- trunk/msm/pom.xml 2010-02-19 01:07:33 UTC (rev 105) +++ trunk/msm/pom.xml 2010-02-19 02:34:59 UTC (rev 106) @@ -18,8 +18,8 @@  <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>2.0.4</version> + <artifactId>mapstoragemanager</artifactId> + <version>0.1-SNAPSHOT</version> </parent> <version>0.1-SNAPSHOT</version> @@ -32,6 +32,7 @@ <artifactId>nuiton-utils</artifactId> <version>${lutinutil.version}</version> </dependency> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> @@ -50,6 +51,7 @@ <artifactId>jaxx-widgets</artifactId> <version>${jaxx.version}</version> </dependency> +  <dependency> <groupId>junit</groupId> @@ -149,33 +151,15 @@ <jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon> <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> + +  </properties> <build> -  - - <plugins>  - - <plugin> <groupId>org.nuiton.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> <version>${jaxx.version}</version> @@ -186,14 +170,14 @@ </goals> </execution> </executions> - </plugin> + </plugin>--> <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> <version>${i18n.version}</version> <configuration> -  + <silent>true</silent> <entries> <entry> <basedir>${maven.gen.dir}/java/</basedir> @@ -210,7 +194,7 @@ </executions> </plugin> - <plugin> +  </plugins> <pluginManagement> <plugins> - <plugin> +  - <plugin> +   - <plugin> +  </plugins> </pluginManagement> Modified: trunk/msm-bighashmap/pom.xml =================================================================== --- trunk/msm-bighashmap/pom.xml 2010-02-19 01:07:33 UTC (rev 105) +++ trunk/msm-bighashmap/pom.xml 2010-02-19 02:34:59 UTC (rev 106) @@ -18,8 +18,8 @@  <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>2.0.4</version> + <artifactId>mapstoragemanager</artifactId> + <version>0.1-SNAPSHOT</version> </parent> <version>0.1-SNAPSHOT</version> @@ -45,18 +45,6 @@ <version>1.1.1</version> </dependency> -  -   <dependency> <groupId>junit</groupId> @@ -144,60 +132,11 @@  <packaging>jar</packaging> - <properties> - -  -  -  -  - -  - </properties> - <build> - <plugins> +  - - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> @@ -218,20 +157,20 @@ </plugin> - </plugins> + </plugins>--> <pluginManagement> <plugins> - <plugin> +  - <plugin> +    <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>2.0.4</version> + <artifactId>mapstoragemanager</artifactId> + <version>0.1-SNAPSHOT</version> </parent> <version>0.1-SNAPSHOT</version> @@ -38,24 +38,13 @@ <artifactId>nuiton-utils</artifactId> <version>${lutinutil.version}</version> </dependency>--> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>1.1.1</version> </dependency> - -  -  +  <dependency> <groupId>junit</groupId> @@ -146,94 +135,20 @@  <packaging>jar</packaging> - <properties> - -  -  -  -  - -  - </properties> - <build> - <plugins> - -  - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-deps</id> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <silent>true</silent> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>false</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - </configuration> - </execution> - </executions> - - </plugin> - - </plugins> - <pluginManagement> <plugins> - <plugin> +  - <plugin> +    <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>2.0.4</version> + <artifactId>mapstoragemanager</artifactId> + <version>0.1-SNAPSHOT</version> </parent> <version>0.1-SNAPSHOT</version> @@ -33,29 +33,18 @@ <version>0.1-SNAPSHOT</version> </dependency> - <dependency> +  + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>1.1.1</version> </dependency> -  -   <dependency> <groupId>junit</groupId> @@ -63,11 +52,14 @@ <version>4.7</version> <scope>test</scope> </dependency> + +  <dependency> <groupId>org.apache.mahout.hadoop</groupId> <artifactId>hadoop-core</artifactId> <version>0.20.1</version> </dependency> + <dependency> <groupId>org.apache.mahout.hbase</groupId> <artifactId>hbase</artifactId> @@ -81,7 +73,7 @@ <name>MSM-HBase</name> - <description>Creation of a graphic user interface for Hbase </description> + <description>Plugin for MapStorageManager to work with actuals HBase</description> <inceptionYear>2010</inceptionYear> <developers> @@ -152,42 +144,9 @@  <packaging>jar</packaging> - <properties> - -  - <jaxx.version>2.0.0-beta-3</jaxx.version> - <lutinutil.version>1.1.2</lutinutil.version> - <i18n.version>1.0.1</i18n.version> - -  - </properties> - <build> -  - - <plugins> - -  +  <pluginManagement> <plugins> - <plugin> +  - <plugin> +    -  + <maven.jar.main.class>org.nuiton.mapstoragemanager.Main</maven.jar.main.class> -  + <jaxx.version>2.0.0-beta-3</jaxx.version> <lutinutil.version>1.1.2</lutinutil.version> -  + <i18n.version>1.0.1</i18n.version>  -  + <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> </properties> <build> -  - - <plugins> -  - -  + </plugin> <!--<plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> <version>${i18n.version}</version> <configuration> - silent>true</silent + <silent>true</silent> <entries> <entry> <basedir>${maven.gen.dir}/java/</basedir>

1 0

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

19 Feb '10

Author: dlanglais Date: 2010-02-19 02:07:33 +0100 (Fri, 19 Feb 2010) New Revision: 105 Modified: trunk/msm-bighashmap/pom.xml trunk/msm-bighashmapV2/pom.xml trunk/msm-hbase/pom.xml trunk/pom.xml Log: nettoyage des pom.xml (suppression des plugin/dependances i18n / jaxx dans les modules n'en ayant pas besoin) Modified: trunk/msm-bighashmap/pom.xml =================================================================== --- trunk/msm-bighashmap/pom.xml 2010-02-18 13:00:12 UTC (rev 104) +++ trunk/msm-bighashmap/pom.xml 2010-02-19 01:07:33 UTC (rev 105) @@ -33,11 +33,11 @@ <version>0.1-SNAPSHOT</version> </dependency> - <dependency> +  <dependency> <groupId>commons-logging</groupId> @@ -46,7 +46,7 @@ </dependency>  - <dependency> +   <dependency> <groupId>junit</groupId> @@ -148,9 +148,9 @@  - <jaxx.version>2.0.0-beta-3</jaxx.version> - <lutinutil.version>1.1.2</lutinutil.version> - <i18n.version>1.0.1</i18n.version> +  +  +   <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> @@ -45,7 +45,7 @@ </dependency>  - <dependency> +   <dependency> <groupId>junit</groupId> @@ -150,9 +150,9 @@  - <jaxx.version>2.0.0-beta-3</jaxx.version> - <lutinutil.version>1.1.2</lutinutil.version> - <i18n.version>1.0.1</i18n.version> +  +  +   - <dependency> +   <dependency> <groupId>junit</groupId> @@ -168,26 +168,26 @@ <build> - <resources> - <resource> - <directory>src/main/java/org/nuiton/mapstoragemanager/plugins/hbase</directory> - <excludes> -  - </excludes> - </resource> - </resources> +  - <plugins> + <plugins> - <plugin> +  + <exclude>org/nuiton/mapstoragemanager/plugins/hbase/HBase.java</exclude> </excludes> </configuration> - </plugin> + </plugin>--> <plugin> <groupId>org.apache.maven.plugins</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-02-18 13:00:12 UTC (rev 104) +++ trunk/pom.xml 2010-02-19 01:07:33 UTC (rev 105) @@ -114,9 +114,9 @@   - <jaxx.version>2.0.0-beta-3</jaxx.version> +  <lutinutil.version>1.1.2</lutinutil.version> - <i18n.version>1.0.1</i18n.version> +    - <plugin> - <groupId>org.nuiton.jaxx</groupId> +  <!--<plugin> <groupId>org.nuiton.i18n</groupId>

1 0

r104 - in trunk/src/site: doc doc/analyse reports
by dlanglais＠users.nuiton.org 18 Feb '10

18 Feb '10

Author: dlanglais Date: 2010-02-18 14:00:12 +0100 (Thu, 18 Feb 2010) New Revision: 104 Added: trunk/src/site/doc/analyse/usecase.rst trunk/src/site/doc/exampleHBase.rst Modified: trunk/src/site/reports/CompteRenduReunion_18-02-2010.rst Log: ajout fichier de sp?\195?\169cification des usecase, ajout todo au compte rendu de la r?\195?\169union de ce jour (18/02/2010), ajout d'un exampleHBase.rst lisant des exemple d'utilisation de l'API HBase (sharengo notamment). Added: trunk/src/site/doc/analyse/usecase.rst =================================================================== --- trunk/src/site/doc/analyse/usecase.rst (rev 0) +++ trunk/src/site/doc/analyse/usecase.rst 2010-02-18 13:00:12 UTC (rev 104) @@ -0,0 +1,44 @@ +Description des cas d'utilisation +================================= + +Describe Database +----------------- + +Permet de récupérer les tables de la base. + +Describe Table +-------------- + +Permet de récupérer la structure des tables (colonnes...) + +View content +------------ + + + +Monitor +------- + + +Import +------ + +Importer des données dans une base via des fichiers XML. +-> Nécéssite la création d'un XSD ou DTD. + +Export +------ + +Exporter des données d'une base dans des fichiers XML. +-> Nécéssite la création d'un XSD ou DTD. + + +Connect +------- + +Permet la connexion à une base de donnée BigTable. + +Extend +------ + +Permet la création de plugin... ? \ No newline at end of file Added: trunk/src/site/doc/exampleHBase.rst =================================================================== --- trunk/src/site/doc/exampleHBase.rst (rev 0) +++ trunk/src/site/doc/exampleHBase.rst 2010-02-18 13:00:12 UTC (rev 104) @@ -0,0 +1,15 @@ + + +Exemple d'utilisation de HBase +============================== + +le projet Sharengo : +http://wiki.sharengo.org/xwiki2/bin/view/Main/WebHome + +svn de sharengo : +http://svn.sharengo.org/svn/ +login : anonymous +mdp : anon + +sources de test (lance un serveur HBase notamment) : +http://svn.sharengo.org/svn/wikengo/trunk/core/wikitty/wikitty-hbase-impl/src/test/java/org/sharengo/wikitty/hbase/test/ \ No newline at end of file Modified: trunk/src/site/reports/CompteRenduReunion_18-02-2010.rst =================================================================== --- trunk/src/site/reports/CompteRenduReunion_18-02-2010.rst 2010-02-18 12:47:03 UTC (rev 103) +++ trunk/src/site/reports/CompteRenduReunion_18-02-2010.rst 2010-02-18 13:00:12 UTC (rev 104) @@ -1,4 +1,10 @@ Discussion avec Benjamin Poussin sur l'avancée du projet (analyse + architecture + ihm). Plus particulièrement, sur la description des cas d'utilisation et les familles, tables, colonnes dans HBase. -Mise en place de la prochaine réunion le jeudi 04 mars 2010 à 11h00 \ No newline at end of file +Mise en place de la prochaine réunion le jeudi 04 mars 2010 à 11h00 + +Todo +==== + + - Avancer les diagrammes UML... + - Nécéssité de décrire les cas d'utilisation. \ No newline at end of file

1 0

r103 - in trunk: msm/src/main/java/org/nuiton/mapstoragemanager/plugins msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2 msm-hbase msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase src/site/doc/analyse
by dlanglais＠users.nuiton.org 18 Feb '10

18 Feb '10

Author: dlanglais Date: 2010-02-18 13:47:03 +0100 (Thu, 18 Feb 2010) New Revision: 103 Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMap.java trunk/msm-hbase/pom.xml trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseNewBigTable.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/NewBigTable.java trunk/src/site/doc/analyse/msm.zargo Log: remplacement connection BigTable(host, port, ...) par BigTable(properties). Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/NewBigTable.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/NewBigTable.java 2010-02-18 11:41:10 UTC (rev 102) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/NewBigTable.java 2010-02-18 12:47:03 UTC (rev 103) @@ -1,6 +1,7 @@ package org.nuiton.mapstoragemanager.plugins; import java.util.Map; +import java.util.Properties; import java.util.Set; /** @@ -11,15 +12,10 @@ /** * Connects to the database. - * @param host the server - * @param port the port - * @param base the base name - * @param username the user login - * @param passwd the user password + * @param properties the properties to initialize the connection. * @return return true if connexion is established, else return false. */ - boolean connect( - String host, int port, String base, String username, String passwd); + boolean connect(Properties properties); /****************** * Tables * Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-02-18 11:41:10 UTC (rev 102) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-02-18 12:47:03 UTC (rev 103) @@ -2,6 +2,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.Properties; import java.util.Set; import org.nuiton.mapstoragemanager.plugins.NewBigTable; @@ -37,7 +38,7 @@ * {@inheritDoc} * Create a new HashMap database. */ - public boolean connect(String host, int port, String base, String username, String passwd) { + public boolean connect(Properties properties) { //throw new UnsupportedOperationException("Not supported yet."); new BigHashMap(); return true; Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMap.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMap.java 2010-02-18 11:41:10 UTC (rev 102) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMap.java 2010-02-18 12:47:03 UTC (rev 103) @@ -2,6 +2,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.Properties; import java.util.Set; import org.nuiton.mapstoragemanager.plugins.NewBigTable; @@ -37,7 +38,7 @@ * {@inheritDoc} * Create a new HashMap database. */ - public boolean connect(String host, int port, String base, String username, String passwd) { + public boolean connect(Properties properties) { //throw new UnsupportedOperationException("Not supported yet."); new BigHashMap(); return true; Modified: trunk/msm-hbase/pom.xml =================================================================== --- trunk/msm-hbase/pom.xml 2010-02-18 11:41:10 UTC (rev 102) +++ trunk/msm-hbase/pom.xml 2010-02-18 12:47:03 UTC (rev 103) @@ -188,43 +188,8 @@ </excludes> </configuration> </plugin> - -  - - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> 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 11:41:10 UTC (rev 102) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseNewBigTable.java 2010-02-18 12:47:03 UTC (rev 103) @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; +import java.util.Properties; import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -67,8 +68,7 @@ /** * {@inheritDoc} */ - public boolean connect(String host, int port, String base, String username, - String passwd) { + public boolean connect(Properties properties) { throw new UnsupportedOperationException("Not supported yet."); } Modified: trunk/src/site/doc/analyse/msm.zargo =================================================================== (Binary files differ)

1 0

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

18 Feb '10

Author: fgilet Date: 2010-02-18 12:41:10 +0100 (Thu, 18 Feb 2010) New Revision: 102 Added: trunk/src/site/reports/CompteRenduReunion_18-02-2010.rst trunk/src/site/reports/CompteRendu_18-02-2010.rst Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMModel.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java trunk/src/site/reports/CompteRendu_08-02-2010.rst Log: Ajout des comptes rendus (A completer avant d'envoyer sur la liste devel). 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-18 09:19:26 UTC (rev 101) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-02-18 11:41:10 UTC (rev 102) @@ -7,7 +7,7 @@ import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; import javax.swing.tree.*; - ApplicationEngine engine = new ApplicationEngine(this); + ApplicationEngine engine = new ApplicationEngine(); /** * classe instance (singleton pattern). @@ -84,13 +84,11 @@ <JButton text="ok" onActionPerformed='engine.connection()'/> </JToolBar> - <JSplitPane constraints='BorderLayout.CENTER' dividerLocation='300' > - <JScrollPane> - <JPanel> - <JTree id='navigation' - model='{new DefaultTreeModel(new DefaultMutableTreeNode("Welcome to MapStorageManager"))}' /> - </JPanel> - </JScrollPane> + <JSplitPane constraints='BorderLayout.CENTER' dividerLocation='200' > + <JScrollPane> + <JTree id='navigation' + model='{new DefaultTreeModel(new DefaultMutableTreeNode("Welcome to MapStorageManager"))}' /> + </JScrollPane> <JScrollPane> <JPanel id='tableContent'/> </JScrollPane> 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-18 09:19:26 UTC (rev 101) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-02-18 11:41:10 UTC (rev 102) @@ -3,21 +3,15 @@ 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. - * @author E054030D - * + * @author Crieloue Gilles - Fages Amaury - Gilet Florent - Langlais Dorian */ public class ApplicationEngine { @@ -26,21 +20,27 @@ */ private static final Log LOG = LogFactory.getLog(ApplicationEngine.class); + /** + * current Locale. + */ private Locale currentLocale; + + /** + * ResourceBundle. + */ private ResourceBundle messages; - - public MainUI application; - - public ApplicationEngine(MainUI application){ - this.application = application; + + /** + * Constructor. + */ + public ApplicationEngine(){ } /** * Show the developers. - * // TODO */ public final void showGreeting() { - JOptionPane.showMessageDialog(null, "hi"); + JOptionPane.showMessageDialog(null, "CODE LUTIN"); } /** @@ -74,6 +74,9 @@ this.application = application; }*/ + /** + * Try to connect the user to a database. + */ public void connection(){ String nameBase = MainUI.getInstance().getNameBase().getSelectedJaxxItem().getValue().toString(); String login = MainUI.getInstance().getLogin().getText(); Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMModel.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMModel.java 2010-02-18 09:19:26 UTC (rev 101) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMModel.java 2010-02-18 11:41:10 UTC (rev 102) @@ -1,21 +1,10 @@ -/* - * 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 + * Model of the navigation tree. + * @author Crieloue Gilles - Fages Amaury - Gilet Florent - Langlais Dorian */ public class MSMModel extends DefaultTreeModel { Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java 2010-02-18 09:19:26 UTC (rev 101) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java 2010-02-18 11:41:10 UTC (rev 102) @@ -8,38 +8,81 @@ import javax.swing.table.AbstractTableModel; /** - * + * Model of a table content * @author E045231P */ public class TableModel extends AbstractTableModel { + /** + * Constructor. + */ public TableModel() { } - public int getColumnCount() { - return 10; - } - - public Object getValueAt(int parm1, int parm2) { - if(parm1==0) - if( parm2==0) return "1"; else return ""; + + /** + * Add data into the table. + * @param rowIndex the rox index + * @param colIndex the column index + */ + @Override + public Object getValueAt(int rowIndex, int colIndex) { + if(rowIndex==0) + if( colIndex==0) return "1"; else return ""; else - if(parm2>parm1) return ""; + if(colIndex>rowIndex) return ""; else - if (parm2==parm1) return "1"; + if (colIndex==rowIndex) return "1"; else - if (parm2==0) return "1"; + if (colIndex==0) return "1"; else{ - int i = Integer.parseInt((String)getValueAt(parm1-1, parm2-1)); - int j = Integer.parseInt((String)getValueAt(parm1-1, parm2)); + int i = Integer.parseInt((String)getValueAt(rowIndex-1, colIndex-1)); + int j = Integer.parseInt((String)getValueAt(rowIndex-1, colIndex)); return Integer.toString(i+j); } + + //return data(rowIndex,colIndex); + + } + + /** + * count the number of column. + * @return the column count + */ + @Override + public int getColumnCount() { + return 2; + } + /** + * count the number of line. + * @return the line count + */ + @Override public int getRowCount() { return 10; } + /** + * count the number of column. + * @param col the column number + * @return the name of the column col + */ + @Override public String getColumnName(int col){ return ""; } + + /** + * Check if the cell is editable + * @param row the line number + * @param col the column number + * @return false + */ + @Override + public boolean isCellEditable(int row, int col) { + return false; + } + + } Added: trunk/src/site/reports/CompteRenduReunion_18-02-2010.rst =================================================================== --- trunk/src/site/reports/CompteRenduReunion_18-02-2010.rst (rev 0) +++ trunk/src/site/reports/CompteRenduReunion_18-02-2010.rst 2010-02-18 11:41:10 UTC (rev 102) @@ -0,0 +1,4 @@ +Discussion avec Benjamin Poussin sur l'avancée du projet (analyse + architecture + ihm). +Plus particulièrement, sur la description des cas d'utilisation et les familles, tables, colonnes dans HBase. + +Mise en place de la prochaine réunion le jeudi 04 mars 2010 à 11h00 \ No newline at end of file Modified: trunk/src/site/reports/CompteRendu_08-02-2010.rst =================================================================== --- trunk/src/site/reports/CompteRendu_08-02-2010.rst 2010-02-18 09:19:26 UTC (rev 101) +++ trunk/src/site/reports/CompteRendu_08-02-2010.rst 2010-02-18 11:41:10 UTC (rev 102) @@ -22,5 +22,5 @@ RAF (Reste à faire) ------------------ -- Diag. de classes du modèle [pending] -- Implémentation plus complexe de l'interface graphique [pending] \ No newline at end of file +- Diag. de classes du modèle +- Implémentation plus complexe de l'interface graphique \ No newline at end of file Added: trunk/src/site/reports/CompteRendu_18-02-2010.rst =================================================================== --- trunk/src/site/reports/CompteRendu_18-02-2010.rst (rev 0) +++ trunk/src/site/reports/CompteRendu_18-02-2010.rst 2010-02-18 11:41:10 UTC (rev 102) @@ -0,0 +1,31 @@ +semaine du 18 janvier 2010 +========================== + +Architecture à plugins +---------------------- +- + +HBase +---- +- + +JAXX +---- +- Arbre de navigation et visualisation d'une contenu d'une table (version baasique en codage dur). + + +Objectifs des deux semaines prochaines +----------------------------------- +- Récuperer les éléments réels d'une base pour affichage dans l'UI. +- Amélioration graphique sur tous les points (arbre, menu, boutons,...). +- Réalisation des "Cockburn" des cas d'utilisations. +- Test sous shell HBase sur le retour des méthodes et faire l'analogie avec l'API. + + +RAF (Reste à faire) +------------------ + +- Diagramme de classe. +- Décrire les actions du diagramme du cas d'utilisation. +- Schéma général de l'application (architecture, action entre les entités, dépendances,...). +- Implémentation plus complexe de l'interface graphique. \ No newline at end of file

1 0

r101 - 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 10:19:26 +0100 (Thu, 18 Feb 2010) New Revision: 101 Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java Log: Suppression variables inutilis?\195?\169es. Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java =================================================================== --- trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java 2010-02-18 09:16:23 UTC (rev 100) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java 2010-02-18 09:19:26 UTC (rev 101) @@ -85,8 +85,8 @@ // Now, to retrieve the data we just wrote. The values that come back are // Result instances. Generally, a Result is an object that will package up // the hbase return into the form you find most palatable. - Get g = new Get(Bytes.toBytes(rowName)); - Result r; + /**Get g = new Get(Bytes.toBytes(rowName)); + Result r;*/ byte[] value = null; // try { // r = table.get(g); @@ -98,7 +98,7 @@ // If we convert the value bytes, we should get back 'Some Value', the // value we inserted at this location. - String valueStr = Bytes.toString(value); + /**String valueStr = Bytes.toString(value);*/ return "valeur"; //return valueStr; @@ -171,6 +171,6 @@ } public static void main(String[] args) { - HBase h = new HBase(); + /**HBase h = */new HBase(); } }

1 0

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