r176 - in trunk: msm msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui msm-bighashmap/META-INF/services msm-bighashmapV2/META-INF/services - Mapstoragemanager-commits

3 Mar 2010

Author: dlanglais
Date: 2010-03-03 18:57:28 +0100 (Wed, 03 Mar 2010)
New Revision: 176

Added:
   trunk/msm-bighashmap/META-INF/services/org.nuiton.mapstoragemanager.plugins.BigTable
   trunk/msm-bighashmapV2/META-INF/services/org.nuiton.mapstoragemanager.plugins.BigTable
Removed:
   trunk/msm-bighashmap/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable
   trunk/msm-bighashmapV2/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable
Modified:
   trunk/msm/pom.xml
   trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java
Log:
Il ne reste plus grand chose pour pouvoir utiliser le plugin BigHashMapV2,

J'ai l'impression que lors du build, le Dossier META-INF de chaque plugin n'est pas copi?\195?\169 dans le jar final..

Modified: trunk/msm/pom.xml
===================================================================

--- trunk/msm/pom.xml	2010-03-03 17:08:42 UTC (rev 175)
+++ trunk/msm/pom.xml	2010-03-03 17:57:28 UTC (rev 176)
@@ -285,3 +285,4 @@
 </project>
 
 
+

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-03-03 17:08:42 UTC (rev 175)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java	2010-03-03 17:57:28 UTC (rev 176)
@@ -1,6 +1,8 @@
 package org.nuiton.mapstoragemanager.ui.gui;
 
 import java.awt.Desktop;
+import java.io.File;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Iterator;
 import java.util.Locale;
@@ -17,8 +19,10 @@
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.mapstoragemanager.Main;
 import org.nuiton.mapstoragemanager.MsmConfig;
+import org.nuiton.mapstoragemanager.core.BigTableLoader;
 import org.nuiton.mapstoragemanager.plugins.BigTable;
 import org.nuiton.mapstoragemanager.plugins.OurHashMap2;
+//import org.nuiton.mapstoragemanager.plugins.bighashmapv2.BigHashMapV2;
 import org.nuiton.mapstoragemanager.ui.MainUI;
 import static org.nuiton.i18n.I18n._;
 
@@ -47,8 +51,29 @@
      * Constructor.
      */
     private ApplicationEngine() {
+        
+        String basedir = new File("").getAbsolutePath();
+        File msnBasedir = new File(basedir).getParentFile();
+        String toPlugin = "msm-bighashmapV2/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmapv2";
+        File pluginPath = new File(msnBasedir, toPlugin);
 
-        bigTable = new  OurHashMap2();
+        BigTableLoader btl = null;
+
+        LOG.info("basedir : " + basedir + '\n'
+            + "msnBbasedir : " + msnBasedir + '\n'
+            + "pluginPath : " + pluginPath.getPath());
+
+        try {
+            btl =
+                new BigTableLoader(pluginPath.getPath(), this.getClass().getClassLoader());
+        } catch (MalformedURLException ex) {
+            LOG.fatal(ex, ex);
+        }
+
+        LOG.info("getBigtable() : " + btl.getBigTable());
+
+
+        bigTable = new OurHashMap2();
         bigTable.createTable("table1");
         bigTable.createTable("table2");
         bigTable.createColumn("table1", "column1");

Added: trunk/msm-bighashmap/META-INF/services/org.nuiton.mapstoragemanager.plugins.BigTable
===================================================================
--- trunk/msm-bighashmap/META-INF/services/org.nuiton.mapstoragemanager.plugins.BigTable	                        (rev 0)
+++ trunk/msm-bighashmap/META-INF/services/org.nuiton.mapstoragemanager.plugins.BigTable	2010-03-03 17:57:28 UTC (rev 176)
@@ -0,0 +1 @@
+org.nuiton.mapstoragemanager.plugins.bighashmap.BigHashMap
\ No newline at end of file

Deleted: trunk/msm-bighashmap/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable
===================================================================
--- trunk/msm-bighashmap/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable	2010-03-03 17:08:42 UTC (rev 175)
+++ trunk/msm-bighashmap/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable	2010-03-03 17:57:28 UTC (rev 176)
@@ -1 +0,0 @@
-org.nuiton.mapstoragemanager.plugins.bighashmap.BigHashMap
\ No newline at end of file

Added: trunk/msm-bighashmapV2/META-INF/services/org.nuiton.mapstoragemanager.plugins.BigTable
===================================================================
--- trunk/msm-bighashmapV2/META-INF/services/org.nuiton.mapstoragemanager.plugins.BigTable	                        (rev 0)
+++ trunk/msm-bighashmapV2/META-INF/services/org.nuiton.mapstoragemanager.plugins.BigTable	2010-03-03 17:57:28 UTC (rev 176)
@@ -0,0 +1 @@
+org.nuiton.mapstoragemanager.plugins.bighashmapv2.BigHashMapV2
\ No newline at end of file

Deleted: trunk/msm-bighashmapV2/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable
===================================================================
--- trunk/msm-bighashmapV2/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable	2010-03-03 17:08:42 UTC (rev 175)
+++ trunk/msm-bighashmapV2/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable	2010-03-03 17:57:28 UTC (rev 176)
@@ -1 +0,0 @@
-org.nuiton.mapstoragemanager.plugins.bighashmapv2.BigHashMap
\ No newline at end of file

    

r176 - in trunk: msm msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui msm-bighashmap/META-INF/services msm-bighashmapV2/META-INF/services

dlanglais＠users.nuiton.org

tags

participants (1)