r293 - in trunk: . nuiton-matrix nuiton-matrix/src nuiton-matrix-gui src
Author: echatellier Date: 2010-12-08 14:32:51 +0100 (Wed, 08 Dec 2010) New Revision: 293 Url: http://nuiton.org/repositories/revision/nuiton-matrix/293 Log: Move to multimodules layout Added: trunk/nuiton-matrix-gui/ trunk/nuiton-matrix-gui/pom.xml trunk/nuiton-matrix/ trunk/nuiton-matrix/pom.xml trunk/nuiton-matrix/src/ trunk/nuiton-matrix/src/main/ trunk/nuiton-matrix/src/test/ Removed: trunk/src/main/ trunk/src/test/ Modified: trunk/pom.xml Added: trunk/nuiton-matrix/pom.xml =================================================================== --- trunk/nuiton-matrix/pom.xml (rev 0) +++ trunk/nuiton-matrix/pom.xml 2010-12-08 13:32:51 UTC (rev 293) @@ -0,0 +1,138 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> + + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmineAndCentral</artifactId> + <version>2.4.1</version> + </parent> + + <artifactId>matrix</artifactId> + <version>2.1-SNAPSHOT</version> + + <modules> + <module>nuiton-matrix</module> + <module>nuiton-matrix-gui</module> + </modules> + + <dependencyManagement> + <dependencies> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonUtilsVersion}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${nuitonI18nVersion}</version> + <scope>compile</scope> + </dependency> + + <!--Jaxx --> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime</artifactId> + <version>${jaxxVersion}</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>javax.help</groupId> + <artifactId>javahelp</artifactId> + </exclusion> + <exclusion> + <groupId>com.opensymphony</groupId> + <artifactId>xwork</artifactId> + </exclusion> + <exclusion> + <groupId>opensymphony</groupId> + <artifactId>ognl</artifactId> + </exclusion> + <exclusion> + <groupId>commons-jxpath</groupId> + <artifactId>commons-jxpath</artifactId> + </exclusion> + <exclusion> + <groupId>org.swinglabs</groupId> + <artifactId>jxlayer</artifactId> + </exclusion> + </exclusions> + </dependency> + + </dependencies> + </dependencyManagement> + + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> + + <name>NuitonMatrix</name> + <description>Multiple dimensions matrix library</description> + <inceptionYear>2004</inceptionYear> + <url>http://maven-site.nuiton.org/nuiton-matrix</url> + + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> + + <packaging>pom</packaging> + + <properties> + + <jaxxVersion>2.2.3</jaxxVersion> + <nuitonUtilsVersion>1.5</nuitonUtilsVersion> + <nuitonI18nVersion>2.0</nuitonI18nVersion> + + <!-- extra files to include in release --> + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> + + </properties> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <version>${jaxxVersion}</version> + </plugin> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${nuitonI18nVersion}</version> + </plugin> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${jrstPluginVersion}</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + + </build> + + <!-- ************************************************************* --> + <!-- *** Build Environment ************************************** --> + <!-- ************************************************************* --> + + <!-- Source control management. --> + <scm> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-matrix/trunk</url> + </scm> +</project> Added: trunk/nuiton-matrix-gui/pom.xml =================================================================== --- trunk/nuiton-matrix-gui/pom.xml (rev 0) +++ trunk/nuiton-matrix-gui/pom.xml 2010-12-08 13:32:51 UTC (rev 293) @@ -0,0 +1,167 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> + + <parent> + <groupId>org.nuiton</groupId> + <artifactId>matrix</artifactId> + <version>2.1-SNAPSHOT</version> + </parent> + + <groupId>org.nuiton.matrix</groupId> + <artifactId>nuiton-matrix-gui</artifactId> + + <dependencies> + + <dependency> + <groupId>org.nuiton.matrix</groupId> + <artifactId>nuiton-matrix</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime</artifactId> + </dependency> + + </dependencies> + + + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> + + <packaging>jar</packaging> + + <properties> + + <!-- extra files to include in release --> + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> + + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + <id>generate-ui</id> + <configuration> + <extraImportList>jaxx.runtime.SwingUtil,static jaxx.runtime.JAXXUtil.getStringValue</extraImportList> + <addSourcesToClassPath>true</addSourcesToClassPath> + <addProjectClassPath>true</addProjectClassPath> + </configuration> + </execution> + <execution> + <goals> + <goal>generate</goal> + </goals> + <id>generate-tests</id> + <phase>generate-test-sources</phase> + <configuration> + <testPhase>true</testPhase> + <src>src/test/java</src> + <outJava>target/generated-sources/test-java</outJava> + <addProjectClassPath>true</addProjectClassPath> + <addCompileClassPath>true</addCompileClassPath> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <configuration> + <entries> + <entry> + <basedir>${project.build.directory}/generated-sources/java/</basedir> + </entry> + </entries> + </configuration> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + + </build> + + <!-- ************************************************************* --> + <!-- *** Build Environment ************************************** --> + <!-- ************************************************************* --> + + <profiles> + + <!-- create assemblies only at release time --> + <profile> + <id>assembly-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + <!-- launch in a release the assembly automatically --> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>create-assemblies</id> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + <configuration> + <attach>false</attach> + <descriptorRefs> + <descriptorRef>deps</descriptorRef> + <descriptorRef>full</descriptorRef> + </descriptorRefs> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-08 11:13:06 UTC (rev 292) +++ trunk/pom.xml 2010-12-08 13:32:51 UTC (rev 293) @@ -13,82 +13,64 @@ <version>2.4.1</version> </parent> - <artifactId>nuiton-matrix</artifactId> + <artifactId>matrix</artifactId> <version>2.1-SNAPSHOT</version> - <dependencies> + <modules> + <module>nuiton-matrix</module> + <module>nuiton-matrix-gui</module> + </modules> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <dependencyManagement> + <dependencies> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>${nuitonUtilsVersion}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - <version>${nuitonI18nVersion}</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonUtilsVersion}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${nuitonI18nVersion}</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> + <!--Jaxx --> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime</artifactId> + <version>${jaxxVersion}</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>javax.help</groupId> + <artifactId>javahelp</artifactId> + </exclusion> + <exclusion> + <groupId>com.opensymphony</groupId> + <artifactId>xwork</artifactId> + </exclusion> + <exclusion> + <groupId>opensymphony</groupId> + <artifactId>ognl</artifactId> + </exclusion> + <exclusion> + <groupId>commons-jxpath</groupId> + <artifactId>commons-jxpath</artifactId> + </exclusion> + <exclusion> + <groupId>org.swinglabs</groupId> + <artifactId>jxlayer</artifactId> + </exclusion> + </exclusions> + </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> + </dependencies> + </dependencyManagement> - <dependency> - <groupId>commons-primitives</groupId> - <artifactId>commons-primitives</artifactId> - </dependency> - - <!--Jaxx --> - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-runtime</artifactId> - <version>${jaxxVersion}</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>javax.help</groupId> - <artifactId>javahelp</artifactId> - </exclusion> - <exclusion> - <groupId>com.opensymphony</groupId> - <artifactId>xwork</artifactId> - </exclusion> - <exclusion> - <groupId>opensymphony</groupId> - <artifactId>ognl</artifactId> - </exclusion> - <exclusion> - <groupId>commons-jxpath</groupId> - <artifactId>commons-jxpath</artifactId> - </exclusion> - <exclusion> - <groupId>org.swinglabs</groupId> - <artifactId>jxlayer</artifactId> - </exclusion> - </exclusions> - </dependency> - - </dependencies> - <!-- ************************************************************* --> <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> @@ -102,7 +84,7 @@ <!-- *** Build Settings ****************************************** --> <!-- ************************************************************* --> - <packaging>jar</packaging> + <packaging>pom</packaging> <properties> @@ -141,61 +123,6 @@ </plugins> </pluginManagement> - <plugins> - <plugin> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - <id>generate-ui</id> - <configuration> - <extraImportList>jaxx.runtime.SwingUtil,static jaxx.runtime.JAXXUtil.getStringValue</extraImportList> - <addSourcesToClassPath>true</addSourcesToClassPath> - <addProjectClassPath>true</addProjectClassPath> - </configuration> - </execution> - <execution> - <goals> - <goal>generate</goal> - </goals> - <id>generate-tests</id> - <phase>generate-test-sources</phase> - <configuration> - <testPhase>true</testPhase> - <src>src/test/java</src> - <outJava>target/generated-sources/test-java</outJava> - <addProjectClassPath>true</addProjectClassPath> - <addCompileClassPath>true</addCompileClassPath> - </configuration> - </execution> - </executions> - </plugin> - - <!-- plugin i18n --> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <configuration> - <entries> - <entry> - <basedir>${project.build.directory}/generated-sources/java/</basedir> - </entry> - </entries> - </configuration> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> <!-- ************************************************************* --> @@ -208,42 +135,4 @@ <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/trunk</developerConnection> <url>http://www.nuiton.org/repositories/browse/nuiton-matrix/trunk</url> </scm> - - <profiles> - - <!-- create assemblies only at release time --> - <profile> - <id>assembly-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - <!-- launch in a release the assembly automatically --> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>create-assemblies</id> - <phase>verify</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - <configuration> - <attach>false</attach> - <descriptorRefs> - <descriptorRef>deps</descriptorRef> - <descriptorRef>full</descriptorRef> - </descriptorRefs> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project>
participants (1)
-
echatellier＠users.nuiton.org