Author: tchemit Date: 2010-11-26 15:53:18 +0000 (Fri, 26 Nov 2010) New Revision: 807 Log: reformat poms optimize dependencies Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-26 14:35:58 UTC (rev 806) +++ trunk/pom.xml 2010-11-26 15:53:18 UTC (rev 807) @@ -1,469 +1,504 @@ <?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/maven-v4_0_0.xsd"> +<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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>mavenpom4labs</artifactId> - <version>2.4.1</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4labs</artifactId> + <version>2.4.1</version> + </parent> - <groupId>fr.ifremer</groupId> - <artifactId>wao</artifactId> - <version>1.6-SNAPSHOT</version> + <groupId>fr.ifremer</groupId> + <artifactId>wao</artifactId> + <version>1.6-SNAPSHOT</version> - <modules> - <module>wao-ui</module> - <module>wao-business</module> - </modules> + <modules> + <module>wao-ui</module> + <module>wao-business</module> + </modules> - <dependencyManagement> - <dependencies> + <dependencyManagement> + <dependencies> - <!--dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.5</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.4</version> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.8.2</version> - </dependency--> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-email</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>${nuitonUtilsVersion}</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-tapestry-extra</artifactId> - <version>${nuitonWebVersion}</version> - </dependency> - <!-- ToPIA --> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topiaVersion}</version> - </dependency> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-service-migration</artifactId> - <version>${topiaVersion}</version> - </dependency> - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-core</artifactId> - <version>${tapestryVersion}</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>jboss</groupId> - <artifactId>javassist</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-upload</artifactId> - <version>${tapestryVersion}</version> - </dependency> - <dependency> - <groupId>com.orientimport</groupId> - <artifactId>t5-easy-fckeditor</artifactId> - <version>1.0.4</version> - </dependency> - <dependency> - <groupId>org.chenillekit</groupId> - <artifactId>chenillekit-tapestry</artifactId> - <version>1.2.0</version> - <exclusions> - <exclusion> - <groupId>jboss</groupId> - <artifactId>javassist</artifactId> - </exclusion> - </exclusions> - </dependency> -<!-- <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-test</artifactId> - <version>${tapestryVersion}</version> - <scope>test</scope> - </dependency>--> - <!--dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency--> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.5.10</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.5.10</version> - <scope>runtime</scope> - </dependency> - <!-- Graphics --> - <dependency> - <groupId>jfree</groupId> - <artifactId>jfreechart</artifactId> - <version>1.0.12</version> - </dependency> - <!-- KML for Cartography --> - <dependency> - <groupId>de.micromata.jak</groupId> - <artifactId>JavaAPIforKml</artifactId> - <version>2.2.0</version> - <exclusions> - <exclusion> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-xjc</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.2</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-xjc</artifactId> - <version>2.2</version> - </dependency> - <!-- - Note : classes used from Xerces are deprecated since 2.9 - Don't know how to replace behavior used in Kml writing. - --> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.8.1</version> - </dependency> - <!--<dependency>--> - <!--<groupId>xpp3</groupId>--> - <!--<artifactId>xpp3</artifactId>--> - <!--<version>1.1.4c</version>--> - <!--</dependency>--> - <!--<dependency>--> - <!--<groupId>xpp3</groupId>--> - <!--<artifactId>xpp3_xpath</artifactId>--> - <!--<version>1.1.4c</version>--> - <!--</dependency>--> - <!-- Csv import/export --> - <dependency> - <groupId>net.sourceforge.javacsv</groupId> - <artifactId>javacsv</artifactId> - <version>2.0</version> - </dependency> - <!-- base h2 --> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.2.137</version> - </dependency> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>8.4-701.jdbc4</version> - </dependency> - <dependency> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> - <version>0.9.10-hudson-16</version> - <scope>provided</scope> - </dependency> - <!--dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency--> - <dependency> - <groupId>com.formos.tapestry</groupId> - <artifactId>tapestry-testify</artifactId> - <version>1.0.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>1.8.4</version> - <scope>test</scope> - </dependency> - </dependencies> - </dependencyManagement> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-email</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonUtilsVersion}</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${nuitonI18nVersion}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-tapestry-extra</artifactId> + <version>${nuitonWebVersion}</version> + </dependency> + <!-- ToPIA --> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topiaVersion}</version> + </dependency> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-migration</artifactId> + <version>${topiaVersion}</version> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-core</artifactId> + <version>${tapestryVersion}</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>jboss</groupId> + <artifactId>javassist</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-ioc</artifactId> + <version>${tapestryVersion}</version> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry5-annotations</artifactId> + <version>${tapestryVersion}</version> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-upload</artifactId> + <version>${tapestryVersion}</version> + </dependency> + <dependency> + <groupId>com.orientimport</groupId> + <artifactId>t5-easy-fckeditor</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> + <groupId>org.chenillekit</groupId> + <artifactId>chenillekit-tapestry</artifactId> + <version>1.2.0</version> + <exclusions> + <exclusion> + <groupId>jboss</groupId> + <artifactId>javassist</artifactId> + </exclusion> + </exclusions> + </dependency> + <!-- <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-test</artifactId> + <version>${tapestryVersion}</version> + <scope>test</scope> + </dependency>--> + <!--dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency--> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.5.10</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.10</version> + <scope>runtime</scope> + </dependency> + <!-- Graphics --> + <dependency> + <groupId>jfree</groupId> + <artifactId>jfreechart</artifactId> + <version>${jfreeVersion}</version> + </dependency> + <dependency> + <groupId>jfree</groupId> + <artifactId>jcommon</artifactId> + <version>${jfreeVersion}</version> + </dependency> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> + <!-- KML for Cartography --> + <dependency> + <groupId>de.micromata.jak</groupId> + <artifactId>JavaAPIforKml</artifactId> + <version>2.2.0</version> + <exclusions> + <exclusion> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-xjc</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>2.2</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-xjc</artifactId> + <version>2.2</version> + </dependency> + <!-- + Note : classes used from Xerces are deprecated since 2.9 + Don't know how to replace behavior used in Kml writing. + --> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.8.1</version> + </dependency> - <name>Wao</name> - <description>Application pour le suivi d'embarquements sur des bateaux de pêches dans le cadre - d'observations scientifiques.</description> - <inceptionYear>2009</inceptionYear> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>1.3.03</version> + </dependency> - <organization> - <name>Ifremer</name> - <url>http://www.ifremer.fr/</url> - </organization> + <!--<dependency>--> + <!--<groupId>xpp3</groupId>--> + <!--<artifactId>xpp3</artifactId>--> + <!--<version>1.1.4c</version>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>xpp3</groupId>--> + <!--<artifactId>xpp3_xpath</artifactId>--> + <!--<version>1.1.4c</version>--> + <!--</dependency>--> + <!-- Csv import/export --> + <dependency> + <groupId>net.sourceforge.javacsv</groupId> + <artifactId>javacsv</artifactId> + <version>2.0</version> + </dependency> - <licenses> - <license> - <name>Affero General Public License (AGPL)</name> - <url>${maven.license.file}</url> - <distribution>local</distribution> - </license> - </licenses> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>${hibernateVersion}</version> + </dependency> - <!-- Developpers, contributors... --> - <developers> - <developer> - <id>fdesbois</id> - <name>Florian Desbois</name> - <email>fdesbois at codelutin.com</email> - <organization>CodeLutin</organization> - <organizationUrl>http://www.codelutin.com</organizationUrl> - <timezone>+1</timezone> - <roles> - <role>Chef de Projet</role> - <role>Analyste</role> - <role>Développeur</role> - </roles> - </developer> - <developer> - <name>Tony Chemit</name> - <id>tchemit</id> - <email>chemit at codelutin.com</email> - <organization>CodeLutin</organization> - <organizationUrl>http://www.codelutin.com</organizationUrl> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - <developer> - <name>Brendan Le Ny</name> - <id>bleny</id> - <email>bleny at codelutin.com</email> - <organization>CodeLutin</organization> - <organizationUrl>http://www.codelutin.com</organizationUrl> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - </developers> - - <url>http://suiviobsmer.labs.libre-entreprise.org/suiviobsmer</url> + <!-- base h2 --> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.2.137</version> + </dependency> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.4-701.jdbc4</version> + </dependency> + <dependency> + <groupId>org.jvnet.hudson.winstone</groupId> + <artifactId>winstone</artifactId> + <version>0.9.10-hudson-16</version> + <scope>provided</scope> + </dependency> + <!--dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.1</version> + <scope>test</scope> + </dependency--> + <dependency> + <groupId>com.formos.tapestry</groupId> + <artifactId>tapestry-testify</artifactId> + <version>1.0.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>1.8.4</version> + <scope>test</scope> + </dependency> + </dependencies> + </dependencyManagement> - <issueManagement> - <system>gforge</system> - <url>https://${platform}/tracker?group_id=${labs.id}</url> - </issueManagement> - - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> - <packaging>pom</packaging> + <name>Wao</name> + <description>Application pour le suivi d'embarquements sur des bateaux de + pêches dans le cadre + d'observations scientifiques. + </description> + <inceptionYear>2009</inceptionYear> - <properties> + <organization> + <name>Ifremer</name> + <url>http://www.ifremer.fr/</url> + </organization> - <projectId>suiviobsmer</projectId> - <license.licenseName>agpl_v3</license.licenseName> - <labs.id>154</labs.id> - - <!-- libraries version --> - <nuitonI18nVersion>1.2.2</nuitonI18nVersion> - <nuitonUtilsVersion>1.4.2</nuitonUtilsVersion> - <nuitonWebVersion>0.1</nuitonWebVersion> - <topiaVersion>2.4.3</topiaVersion> - <eugeneVersion>2.2</eugeneVersion> - <tapestryVersion>5.1.0.5</tapestryVersion> + <licenses> + <license> + <name>Affero General Public License (AGPL)</name> + <url>${maven.license.file}</url> + <distribution>local</distribution> + </license> + </licenses> - </properties> + <!-- Developpers, contributors... --> + <developers> + <developer> + <id>fdesbois</id> + <name>Florian Desbois</name> + <email>fdesbois at codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <timezone>+1</timezone> + <roles> + <role>Chef de Projet</role> + <role>Analyste</role> + <role>Développeur</role> + </roles> + </developer> + <developer> + <name>Tony Chemit</name> + <id>tchemit</id> + <email>chemit at codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <timezone>+2</timezone> + <roles> + <role>developer</role> + </roles> + </developer> + <developer> + <name>Brendan Le Ny</name> + <id>bleny</id> + <email>bleny at codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + </developers> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> + <url>http://suiviobsmer.labs.libre-entreprise.org/suiviobsmer</url> - <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</connection> - <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer</url> - </scm> - - <build> -<!-- <resources> - <resource> - <directory>src/main/filters</directory> - <filtering>true</filtering> - </resource> - </resources>--> + <issueManagement> + <system>gforge</system> + <url>https://${platform}/tracker?group_id=${labs.id}</url> + </issueManagement> - <pluginManagement> - <plugins> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> - <!-- plugin site --> - <plugin> - <artifactId>maven-site-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>${jrstPluginVersion}</version> - </dependency> - </dependencies> - </plugin> + <packaging>pom</packaging> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <version>${eugeneVersion}</version> - <configuration> - <inputs>zargo</inputs> - <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> - </configuration> - <dependencies> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topiaVersion}</version> - </dependency> - </dependencies> - </plugin> + <properties> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <version>${nuitonI18nVersion}</version> - </plugin> + <projectId>suiviobsmer</projectId> + <license.licenseName>agpl_v3</license.licenseName> + <labs.id>154</labs.id> - </plugins> - </pluginManagement> + <!-- libraries version --> + <nuitonI18nVersion>1.2.2</nuitonI18nVersion> + <nuitonUtilsVersion>1.4.2</nuitonUtilsVersion> + <nuitonWebVersion>0.1</nuitonWebVersion> + <topiaVersion>2.4.3</topiaVersion> + <eugeneVersion>2.2</eugeneVersion> + <tapestryVersion>5.1.0.5</tapestryVersion> + <hibernateVersion>3.3.2.GA</hibernateVersion> - </build> + <jfreeVersion>1.0.12</jfreeVersion> - <!-- No generation of reports for maven-site (will be generated for release) --> - <reporting> - <excludeDefaults>true</excludeDefaults> - </reporting> + </properties> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** Build Environment ************************************** --> + <!-- ************************************************************* --> - <!--Any mailing lists for the project--> - <mailingLists> + <scm> + <connection> + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk + </connection> + <developerConnection> + scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk + </developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer + </url> + </scm> - <mailingList> - <name>${projectId}-devel</name> - <subscribe>http://${labs.list.host}/mailman/listinfo/${projectId}-devel</subscribe> - <unsubscribe>http://${labs.list.host}/mailman/listinfo/${projectId}-devel</unsubscribe> - <post>${projectId}-devel@${labs.list.host}</post> - <archive>http://${labs.list.host}/pipermail/${projectId}-devel/</archive> - </mailingList> + <build> + <!-- <resources> + <resource> + <directory>src/main/filters</directory> + <filtering>true</filtering> + </resource> + </resources>--> - </mailingLists> + <pluginManagement> + <plugins> - <!--<repositories>--> + <!-- plugin site --> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${jrstPluginVersion}</version> + </dependency> + </dependencies> + </plugin> - <!--<!– depot des releases nuiton –>--> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <version>${eugeneVersion}</version> + <configuration> + <inputs>zargo</inputs> + <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> + </configuration> + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topiaVersion}</version> + </dependency> + </dependencies> + </plugin> - <!--<repository>--> - <!--<id>nuiton.release</id>--> - <!--<name>NuitonReleaseRepository</name>--> - <!--<url>http://maven.nuiton.org/release</url>--> - <!--<snapshots>--> - <!--<enabled>false</enabled>--> - <!--</snapshots>--> - <!--<releases>--> - <!--<enabled>true</enabled>--> - <!--<checksumPolicy>warn</checksumPolicy>--> - <!--</releases>--> - <!--</repository>--> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${nuitonI18nVersion}</version> + </plugin> - <!--<!– depot des snapshots nuiton –>--> + </plugins> + </pluginManagement> - <!--<repository>--> - <!--<id>nuiton.snapshot</id>--> - <!--<name>NuitonSnapshotRepository</name>--> - <!--<url>http://maven.nuiton.org/snapshot</url>--> - <!--<snapshots>--> - <!--<enabled>true</enabled>--> - <!--<checksumPolicy>fail</checksumPolicy>--> - <!--</snapshots>--> - <!--<releases>--> - <!--<enabled>false</enabled>--> - <!--</releases>--> - <!--</repository>--> + </build> - <!--</repositories>--> + <!-- No generation of reports for maven-site (will be generated for release) --> + <reporting> + <excludeDefaults>true</excludeDefaults> + </reporting> - <!--<pluginRepositories>--> + <!-- ************************************************************* --> + <!-- *** Build Environment ************************************** --> + <!-- ************************************************************* --> - <!--<!– depot des releases nuiton –>--> + <!--Any mailing lists for the project--> + <mailingLists> - <!--<pluginRepository>--> + <mailingList> + <name>${projectId}-devel</name> + <subscribe>http://${labs.list.host}/mailman/listinfo/${projectId}-devel + </subscribe> + <unsubscribe>http://${labs.list.host}/mailman/listinfo/${projectId}-devel + </unsubscribe> + <post>${projectId}-devel@${labs.list.host}</post> + <archive>http://${labs.list.host}/pipermail/${projectId}-devel/</archive> + </mailingList> - <!--<id>nuiton.release</id>--> - <!--<name>NuitonReleaseRepository</name>--> - <!--<url>http://maven.nuiton.org/release</url>--> - <!--<snapshots>--> - <!--<enabled>false</enabled>--> - <!--</snapshots>--> - <!--<releases>--> - <!--<enabled>true</enabled>--> - <!--<checksumPolicy>warn</checksumPolicy>--> - <!--</releases>--> - <!--</pluginRepository>--> + </mailingLists> - <!--<!– depot des snapshots nuiton –>--> + <!--<repositories>--> - <!--<pluginRepository>--> - <!--<id>nuiton.snapshot</id>--> - <!--<name>NuitonSnapshotRepository</name>--> - <!--<url>http://maven.nuiton.org/snapshot</url>--> - <!--<snapshots>--> - <!--<enabled>true</enabled>--> - <!--<checksumPolicy>fail</checksumPolicy>--> - <!--</snapshots>--> - <!--<releases>--> - <!--<enabled>false</enabled>--> - <!--</releases>--> - <!--</pluginRepository>--> + <!--<!– depot des releases nuiton –>--> - <!--</pluginRepositories>--> + <!--<repository>--> + <!--<id>nuiton.release</id>--> + <!--<name>NuitonReleaseRepository</name>--> + <!--<url>http://maven.nuiton.org/release</url>--> + <!--<snapshots>--> + <!--<enabled>false</enabled>--> + <!--</snapshots>--> + <!--<releases>--> + <!--<enabled>true</enabled>--> + <!--<checksumPolicy>warn</checksumPolicy>--> + <!--</releases>--> + <!--</repository>--> + <!--<!– depot des snapshots nuiton –>--> + + <!--<repository>--> + <!--<id>nuiton.snapshot</id>--> + <!--<name>NuitonSnapshotRepository</name>--> + <!--<url>http://maven.nuiton.org/snapshot</url>--> + <!--<snapshots>--> + <!--<enabled>true</enabled>--> + <!--<checksumPolicy>fail</checksumPolicy>--> + <!--</snapshots>--> + <!--<releases>--> + <!--<enabled>false</enabled>--> + <!--</releases>--> + <!--</repository>--> + + <!--</repositories>--> + + <!--<pluginRepositories>--> + + <!--<!– depot des releases nuiton –>--> + + <!--<pluginRepository>--> + + <!--<id>nuiton.release</id>--> + <!--<name>NuitonReleaseRepository</name>--> + <!--<url>http://maven.nuiton.org/release</url>--> + <!--<snapshots>--> + <!--<enabled>false</enabled>--> + <!--</snapshots>--> + <!--<releases>--> + <!--<enabled>true</enabled>--> + <!--<checksumPolicy>warn</checksumPolicy>--> + <!--</releases>--> + <!--</pluginRepository>--> + + <!--<!– depot des snapshots nuiton –>--> + + <!--<pluginRepository>--> + <!--<id>nuiton.snapshot</id>--> + <!--<name>NuitonSnapshotRepository</name>--> + <!--<url>http://maven.nuiton.org/snapshot</url>--> + <!--<snapshots>--> + <!--<enabled>true</enabled>--> + <!--<checksumPolicy>fail</checksumPolicy>--> + <!--</snapshots>--> + <!--<releases>--> + <!--<enabled>false</enabled>--> + <!--</releases>--> + <!--</pluginRepository>--> + + <!--</pluginRepositories>--> + </project> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-11-26 14:35:58 UTC (rev 806) +++ trunk/wao-business/pom.xml 2010-11-26 15:53:18 UTC (rev 807) @@ -1,225 +1,257 @@ <?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/maven-v4_0_0.xsd"> +<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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> - <parent> - <groupId>fr.ifremer</groupId> - <artifactId>wao</artifactId> - <version>1.6-SNAPSHOT</version> - </parent> + <parent> + <groupId>fr.ifremer</groupId> + <artifactId>wao</artifactId> + <version>1.6-SNAPSHOT</version> + </parent> - <groupId>fr.ifremer.wao</groupId> - <artifactId>wao-business</artifactId> + <groupId>fr.ifremer.wao</groupId> + <artifactId>wao-business</artifactId> - <dependencies> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-email</artifactId> - </dependency> - <!-- Utils --> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - <!-- Logging --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - <!-- CSV lib --> - <dependency> - <groupId>net.sourceforge.javacsv</groupId> - <artifactId>javacsv</artifactId> - </dependency> - <!-- KML lib --> - <dependency> - <groupId>de.micromata.jak</groupId> - <artifactId>JavaAPIforKml</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-xjc</artifactId> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </dependency> - <!--<dependency>--> - <!--<groupId>xpp3</groupId>--> - <!--<artifactId>xpp3</artifactId>--> - <!--</dependency>--> - <!--<dependency>--> - <!--<groupId>xpp3</groupId>--> - <!--<artifactId>xpp3_xpath</artifactId>--> - <!--</dependency>--> - <!-- ToPIA --> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-service-migration</artifactId> - </dependency> - <!-- SGBD --> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - </dependency> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - </dependency> - <!-- Tests --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-email</artifactId> + </dependency> + + <!-- Utils --> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + <!-- Logging --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <!-- CSV lib --> + <dependency> + <groupId>net.sourceforge.javacsv</groupId> + <artifactId>javacsv</artifactId> + </dependency> + <!-- KML lib --> + <dependency> + <groupId>de.micromata.jak</groupId> + <artifactId>JavaAPIforKml</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-xjc</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </dependency> + <!--<dependency>--> + <!--<groupId>xpp3</groupId>--> + <!--<artifactId>xpp3</artifactId>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>xpp3</groupId>--> + <!--<artifactId>xpp3_xpath</artifactId>--> + <!--</dependency>--> + <!-- ToPIA --> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-migration</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> + <!-- SGBD --> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>test</scope> + </dependency> + <!--<dependency>--> + <!--<groupId>postgresql</groupId>--> + <!--<artifactId>postgresql</artifactId>--> + <!--</dependency>--> + <!-- Tests --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + </dependency> + </dependencies> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> - <name>Wao :: Business</name> - <description>Métier de l'application Wao</description> + <name>Wao :: Business</name> + <description>Métier de l'application Wao</description> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> - <packaging>jar</packaging> + <packaging>jar</packaging> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** Build Environment ************************************** --> + <!-- ************************************************************* --> - <build> - <!-- Filter for resolving maven properties in Wao.properties in resource folder --> - <resources> - <resource> - <directory>src/main/filters</directory> - <filtering>true</filtering> - <includes> - <include>Wao.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <includes> - <include>**/*</include> - </includes> - </resource> + <build> + <!-- Filter for resolving maven properties in Wao.properties in resource folder --> + <resources> + <resource> + <directory>src/main/filters</directory> + <filtering>true</filtering> + <includes> + <include>Wao.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <includes> + <include>**/*</include> + </includes> + </resource> - </resources> - <plugins> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <executions> - <execution> - <id>generate-entities</id> - <phase>generate-sources</phase> - <!-- By default, generation from ObjectModel --> - <configuration> - <!-- Corresponding to extracted package from zargo file --> - <fullPackagePath>fr.ifremer.wao</fullPackagePath> - <!-- DefaultPackage used for DAOHelper generation --> - <defaultPackage>fr.ifremer.wao</defaultPackage> - <templates> - org.nuiton.topia.generator.TopiaMetaTransformer, - org.nuiton.eugene.java.JavaBeanTransformer, - org.nuiton.topia.generator.ServiceTransformer, - org.nuiton.eugene.java.JavaInterfaceTransformer, - org.nuiton.topia.generator.BinderHelperTransformer, - org.nuiton.topia.generator.QueryHelperTransformer - </templates> - </configuration> - <goals> - <goal>smart-generate</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <configuration> - <entries> - <entry> - <basedir>${maven.gen.dir}/java</basedir> - </entry> - </entries> - </configuration> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - <execution> - <id>make-bundle</id> - <configuration> - <bundleOutputName>wao-business</bundleOutputName> - </configuration> - <goals> - <goal>bundle</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + </resources> + <plugins> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <executions> + <execution> + <id>generate-entities</id> + <phase>generate-sources</phase> + <!-- By default, generation from ObjectModel --> + <configuration> + <!-- Corresponding to extracted package from zargo file --> + <fullPackagePath>fr.ifremer.wao</fullPackagePath> + <!-- DefaultPackage used for DAOHelper generation --> + <defaultPackage>fr.ifremer.wao</defaultPackage> + <templates> + org.nuiton.topia.generator.TopiaMetaTransformer, + org.nuiton.eugene.java.JavaBeanTransformer, + org.nuiton.topia.generator.ServiceTransformer, + org.nuiton.eugene.java.JavaInterfaceTransformer, + org.nuiton.topia.generator.BinderHelperTransformer, + org.nuiton.topia.generator.QueryHelperTransformer + </templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <configuration> + <entries> + <entry> + <basedir>${maven.gen.dir}/java</basedir> + </entry> + </entries> + </configuration> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + <execution> + <id>make-bundle</id> + <configuration> + <bundleOutputName>wao-business</bundleOutputName> + </configuration> + <goals> + <goal>bundle</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> - <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=suiviobsmer</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> - </scm> + <scm> + <url> + http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=sui... + </url> + <connection> + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business + </connection> + <developerConnection> + scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business + </developerConnection> + </scm> - <!--<repositories>--> - <!--<repository>--> - <!--<id>maven2-repository.dev.java.net</id>--> - <!--<name>Java.net Maven 2 Repository</name>--> - <!--<url>http://download.java.net/maven/2</url>--> - <!--<layout>default</layout>--> - <!--<snapshots>--> - <!--<enabled>true</enabled>--> - <!--</snapshots>--> - <!--</repository>--> - <!--</repositories>--> + <!--<repositories>--> + <!--<repository>--> + <!--<id>maven2-repository.dev.java.net</id>--> + <!--<name>Java.net Maven 2 Repository</name>--> + <!--<url>http://download.java.net/maven/2</url>--> + <!--<layout>default</layout>--> + <!--<snapshots>--> + <!--<enabled>true</enabled>--> + <!--</snapshots>--> + <!--</repository>--> + <!--</repositories>--> </project> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-11-26 14:35:58 UTC (rev 806) +++ trunk/wao-ui/pom.xml 2010-11-26 15:53:18 UTC (rev 807) @@ -1,235 +1,285 @@ <?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/maven-v4_0_0.xsd"> +<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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> - <parent> - <groupId>fr.ifremer</groupId> - <artifactId>wao</artifactId> - <version>1.6-SNAPSHOT</version> - </parent> + <parent> + <groupId>fr.ifremer</groupId> + <artifactId>wao</artifactId> + <version>1.6-SNAPSHOT</version> + </parent> - <groupId>fr.ifremer.wao</groupId> - <artifactId>wao-ui</artifactId> + <groupId>fr.ifremer.wao</groupId> + <artifactId>wao-ui</artifactId> - <dependencies> - <!-- Wao business : services and entities --> - <dependency> - <groupId>fr.ifremer.wao</groupId> - <artifactId>wao-business</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <!-- Utils --> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-tapestry-extra</artifactId> - </dependency> - <!-- Tapestry framework + components --> - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-upload</artifactId> - </dependency> - <dependency> - <groupId>org.chenillekit</groupId> - <artifactId>chenillekit-tapestry</artifactId> - </dependency> - <dependency> - <groupId>com.orientimport</groupId> - <artifactId>t5-easy-fckeditor</artifactId> - </dependency> - <!-- Graph library for synthesis --> - <dependency> - <groupId>jfree</groupId> - <artifactId>jfreechart</artifactId> - </dependency> - <!-- Tests --> -<!-- <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-test</artifactId> - </dependency>--> - <dependency> - <groupId>com.formos.tapestry</groupId> - <artifactId>tapestry-testify</artifactId> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.7</version> - </dependency> - <!-- Logging --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <!-- Embedded war lib for Nuiton-utils WarLauncher --> - <dependency> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> + <dependencies> + <!-- Wao business : services and entities --> + <dependency> + <groupId>fr.ifremer.wao</groupId> + <artifactId>wao-business</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <!-- Utils --> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-tapestry-extra</artifactId> + <scope>runtime</scope> + </dependency> + <!-- Tapestry framework + components --> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-ioc</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry5-annotations</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-upload</artifactId> + </dependency> + <dependency> + <groupId>org.chenillekit</groupId> + <artifactId>chenillekit-tapestry</artifactId> + </dependency> + <dependency> + <groupId>com.orientimport</groupId> + <artifactId>t5-easy-fckeditor</artifactId> + <scope>runtime</scope> + </dependency> + <!-- Graph library for synthesis --> + <dependency> + <groupId>jfree</groupId> + <artifactId>jfreechart</artifactId> + </dependency> + <dependency> + <groupId>jfree</groupId> + <artifactId>jcommon</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-xjc</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <scope>runtime</scope> + </dependency> + <!-- Tests --> + <!-- <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-test</artifactId> + </dependency>--> + <dependency> + <groupId>com.formos.tapestry</groupId> + <artifactId>tapestry-testify</artifactId> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <!-- Logging --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + <!-- Embedded war lib for Nuiton-utils WarLauncher --> + <dependency> + <groupId>org.jvnet.hudson.winstone</groupId> + <artifactId>winstone</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - <name>Wao :: Web Interface</name> - <description>Interface utilisateur du Wao</description> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <name>Wao :: Web Interface</name> + <description>Interface utilisateur du Wao</description> - <packaging>war</packaging> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> - <build> - <!-- call result war : suiviobsmer-xxx.war --> - <!--<finalName>wao-${project.version}</finalName>--> + <packaging>war</packaging> - <!-- Add main class into war to make it executable --> + <!-- ************************************************************* --> + <!-- *** Build Environment ************************************** --> + <!-- ************************************************************* --> + <build> + <!-- call result war : suiviobsmer-xxx.war --> + <!--<finalName>wao-${project.version}</finalName>--> + + <!-- Add main class into war to make it executable --> + <plugins> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>tapestry-bundle</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <archive> + <manifest> + <mainClass>org.nuiton.util.war.WinstoneLauncher</mainClass> + </manifest> + </archive> + <overlays> + <overlay> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <type>jar</type> + <includes> + <include>**/war/Winstone*</include> + </includes> + </overlay> + <overlay> + <groupId>org.jvnet.hudson.winstone</groupId> + <artifactId>winstone</artifactId> + <type>jar</type> + </overlay> + </overlays> + </configuration> + </plugin> + + <!-- <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.5</version> + <executions> + <execution> + <id>default-client</id> + + goals><goal>test</goal></goals </execution> + </executions> + <configuration> + <includes> + <include>**/*Test.java</include> + </includes> + </configuration> + </plugin>--> + + </plugins> + </build> + <profiles> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> <plugins> - - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>tapestry-bundle</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <archive> - <manifest> - <mainClass>org.nuiton.util.war.WinstoneLauncher</mainClass> - </manifest> - </archive> - <overlays> - <overlay> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <type>jar</type> - <includes> - <include>**/war/Winstone*</include> - </includes> - </overlay> - <overlay> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> - <type>jar</type> - </overlay> - </overlays> - </configuration> - </plugin> - -<!-- <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.5</version> - <executions> - <execution> - <id>default-client</id> - - goals><goal>test</goal></goals </execution> - </executions> - <configuration> - <includes> - <include>**/*Test.java</include> - </includes> - </configuration> - </plugin>--> - + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <finalName>wao-${project.version}</finalName> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> - </build> - <profiles> - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <finalName>wao-${project.version}</finalName> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - </descriptors> - <attach>false</attach> - </configuration> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - - <repositories> + </build> + </profile> + </profiles> - <!-- Repository for fckeditor component needed for News page --> - <repository> - <id>m2-release-repository.orientimport.kenai.com</id> - <name>Orient Import Oy Maven Release Repository</name> - <url>http://kenai.com/svn/t5-easy-fckeditor~maven-release-repository</url> - <layout>default</layout> - </repository> + <repositories> - <repository> - <id>tapestry</id> - <name>Tapestry Formos</name> - <url>http://tapestry.formos.com/maven-repository</url> - </repository> - - </repositories> - - <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobsmer</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://tchemit at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> - </scm> + <!-- Repository for fckeditor component needed for News page --> + <repository> + <id>m2-release-repository.orientimport.kenai.com</id> + <name>Orient Import Oy Maven Release Repository</name> + <url>http://kenai.com/svn/t5-easy-fckeditor~maven-release-repository</url> + <layout>default</layout> + </repository> + <repository> + <id>tapestry</id> + <name>Tapestry Formos</name> + <url>http://tapestry.formos.com/maven-repository</url> + </repository> + + </repositories> + + <scm> + <url> + http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobsm... + </url> + <connection> + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui + </connection> + <developerConnection> + scm:svn:svn+ssh://tchemit at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui + </developerConnection> + </scm> + </project>