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.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> - <version>${jaxx.version}</version> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - + <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <version>${i18n.version}</version> - <configuration> - silent>true</silent - <entries> - <entry> - <basedir>${maven.gen.dir}/java/</basedir> - </entry> - </entries> - </configuration> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>bundle</goal> - </goals> - </execution> - </executions> - </plugin>--> - - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> 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)