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>
+
<!-- JUnit for tests -->
<dependency>
<groupId>junit</groupId>
@@ -149,33 +151,15 @@
<jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon>
<jaxx.addProjectClassPath>true</jaxx.addProjectClassPath>
<jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath>
+
+ <!--<maven.gen.dir>${project.basedir}/target/generated-sources</maven.gen.dir>-->
</properties>
<build>
- <!--<resources>
- <resource>
- <directory>src/main/java/org/nuiton/mapstoragemanager/plugins</directory>
- <excludes>
- <exclude>HBase.java</exclude>
- </excludes>
- </resource>
- </resources>-->
-
-
<plugins>
<!--<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/nuiton/mapstoragemanager/plugins/HBase.java</exclude>
- </excludes>
- </configuration>
- </plugin>-->
-
- <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-->
+ <silent>true</silent>
<entries>
<entry>
<basedir>${maven.gen.dir}/java/</basedir>
@@ -210,7 +194,7 @@
</executions>
</plugin>
- <plugin>
+ <!--<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -229,22 +213,22 @@
</execution>
</executions>
- </plugin>
+ </plugin>-->
</plugins>
<pluginManagement>
<plugins>
- <plugin>
+ <!--<plugin>
<groupId>org.nuiton</groupId>
<artifactId>maven-license-plugin</artifactId>
<configuration>
<copyToMETA_INF>true</copyToMETA_INF>
</configuration>
- </plugin>
+ </plugin>-->
- <plugin>
+ <!--<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
@@ -254,10 +238,10 @@
</manifest>
</archive>
</configuration>
- </plugin>
+ </plugin>-->
<!-- plugin site -->
- <plugin>
+ <!--<plugin>
<artifactId>maven-site-plugin</artifactId>
<dependencies>
<dependency>
@@ -266,7 +250,7 @@
<version>${jrst.version}</version>
</dependency>
</dependencies>
- </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>
- <!--Jaxx-->
- <!--<dependency>
- <groupId>org.nuiton.jaxx</groupId>
- <artifactId>jaxx-runtime</artifactId>
- <version>${jaxx.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.nuiton.jaxx</groupId>
- <artifactId>jaxx-widgets</artifactId>
- <version>${jaxx.version}</version>
- </dependency>-->
<!-- JUnit for tests -->
<dependency>
<groupId>junit</groupId>
@@ -144,60 +132,11 @@
<!-- ************************************************************* -->
<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>
-
<build>
- <plugins>
+ <!--<plugins>
- <!--<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>
@@ -218,20 +157,20 @@
</plugin>
- </plugins>
+ </plugins>-->
<pluginManagement>
<plugins>
- <plugin>
+ <!--<plugin>
<groupId>org.nuiton</groupId>
<artifactId>maven-license-plugin</artifactId>
<configuration>
<copyToMETA_INF>true</copyToMETA_INF>
</configuration>
- </plugin>
+ </plugin>-->
- <plugin>
+ <!--<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
@@ -241,7 +180,7 @@
</manifest>
</archive>
</configuration>
- </plugin>
+ </plugin>-->
<!-- plugin site -->
<!--<plugin>
Modified: trunk/msm-bighashmapV2/pom.xml
===================================================================
--- trunk/msm-bighashmapV2/pom.xml 2010-02-19 01:07:33 UTC (rev 105)
+++ trunk/msm-bighashmapV2/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>
@@ -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>
-
- <!--Jaxx-->
- <!--<dependency>
- <groupId>org.nuiton.jaxx</groupId>
- <artifactId>jaxx-runtime</artifactId>
- <version>${jaxx.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.nuiton.jaxx</groupId>
- <artifactId>jaxx-widgets</artifactId>
- <version>${jaxx.version}</version>
- </dependency>-->
+
<!-- JUnit for tests -->
<dependency>
<groupId>junit</groupId>
@@ -146,94 +135,20 @@
<!-- ************************************************************* -->
<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>
-
<build>
- <plugins>
-
- <!--<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>
- <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>
<groupId>org.nuiton</groupId>
<artifactId>maven-license-plugin</artifactId>
<configuration>
<copyToMETA_INF>true</copyToMETA_INF>
</configuration>
- </plugin>
+ </plugin>-->
- <plugin>
+ <!--<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
@@ -243,7 +158,7 @@
</manifest>
</archive>
</configuration>
- </plugin>
+ </plugin>-->
<!-- plugin site -->
<!--<plugin>
Modified: trunk/msm-hbase/pom.xml
===================================================================
--- trunk/msm-hbase/pom.xml 2010-02-19 01:07:33 UTC (rev 105)
+++ trunk/msm-hbase/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>
@@ -33,29 +33,18 @@
<version>0.1-SNAPSHOT</version>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.nuiton</groupId>
<artifactId>nuiton-utils</artifactId>
<version>${lutinutil.version}</version>
- </dependency>
+ </dependency>-->
+
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
</dependency>
- <!--Jaxx-->
- <!--<dependency>
- <groupId>org.nuiton.jaxx</groupId>
- <artifactId>jaxx-runtime</artifactId>
- <version>${jaxx.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.nuiton.jaxx</groupId>
- <artifactId>jaxx-widgets</artifactId>
- <version>${jaxx.version}</version>
- </dependency>-->
<!-- JUnit for tests -->
<dependency>
<groupId>junit</groupId>
@@ -63,11 +52,14 @@
<version>4.7</version>
<scope>test</scope>
</dependency>
+
+ <!-- HBase -->
<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>
-
- <!-- 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>
-
<build>
- <!--<resources>
- <resource>
- <directory>src/main/java/org/nuiton/mapstoragemanager/plugins/hbase</directory>
- <excludes>
- <exclude>HBase.java</exclude>
- </excludes>
- </resource>
- </resources>-->
-
- <plugins>
-
- <!--<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/nuiton/mapstoragemanager/plugins/hbase/HBase.java</exclude>
- </excludes>
- </configuration>
- </plugin>-->
+ <!--<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -210,20 +169,20 @@
</plugin>
- </plugins>
+ </plugins>-->
<pluginManagement>
<plugins>
- <plugin>
+ <!--<plugin>
<groupId>org.nuiton</groupId>
<artifactId>maven-license-plugin</artifactId>
<configuration>
<copyToMETA_INF>true</copyToMETA_INF>
</configuration>
- </plugin>
+ </plugin>-->
- <plugin>
+ <!--<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
@@ -233,7 +192,7 @@
</manifest>
</archive>
</configuration>
- </plugin>
+ </plugin>-->
<!-- plugin site -->
<!--<plugin>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-02-19 01:07:33 UTC (rev 105)
+++ trunk/pom.xml 2010-02-19 02:34:59 UTC (rev 106)
@@ -112,44 +112,24 @@
<properties>
<!-- main class in jar -->
- <!--<maven.jar.main.class>org.nuiton.mapstoragemanager.Main</maven.jar.main.class>-->
+ <maven.jar.main.class>org.nuiton.mapstoragemanager.Main</maven.jar.main.class>
- <!--<jaxx.version>2.0.0-beta-3</jaxx.version>-->
+ <jaxx.version>2.0.0-beta-3</jaxx.version>
<lutinutil.version>1.1.2</lutinutil.version>
- <!--<i18n.version>1.0.1</i18n.version>-->
+ <i18n.version>1.0.1</i18n.version>
<!-- jaxx -->
- <!--<jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon>
+ <jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon>
<jaxx.addProjectClassPath>true</jaxx.addProjectClassPath>
- <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath>-->
+ <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath>
</properties>
<build>
- <!--<resources>
- <resource>
- <directory>src/main/java/org/nuiton/mapstoragemanager/plugins</directory>
- <excludes>
- <exclude>HBase.java</exclude>
- </excludes>
- </resource>
- </resources>-->
-
-
<plugins>
- <!--<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/nuiton/mapstoragemanager/plugins/HBase.java</exclude>
- </excludes>
- </configuration>
- </plugin>-->
-
- <!--<plugin>
- <groupId>org.nuiton</groupId>
+ <plugin>
+ <groupId>org.nuiton.jaxx</groupId>
<artifactId>maven-jaxx-plugin</artifactId>
<version>${jaxx.version}</version>
<executions>
@@ -159,14 +139,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
+ <silent>true</silent>
<entries>
<entry>
<basedir>${maven.gen.dir}/java/</basedir>