Author: acheype Date: 2013-02-15 06:08:09 +0100 (Fri, 15 Feb 2013) New Revision: 112 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/112 Log: Cleaning the pom.xml for all the modules Added: trunk/cantharella.web/src/main/resources/log4j.xml trunk/cantharella.web/src/main/resources/log4j_prod.xml Removed: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/SandboxPage.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/SandboxPage.java trunk/cantharella.web/src/main/resources/log4j.xml Modified: trunk/cantharella.data/pom.xml trunk/cantharella.data/src/main/resources/cantharella.conf trunk/cantharella.service/pom.xml trunk/cantharella.service/src/main/resources/cantharella.conf trunk/cantharella.utils/pom.xml trunk/cantharella.web/ trunk/cantharella.web/pom.xml trunk/cantharella.web/src/main/resources/cantharella.conf trunk/pom.xml Modified: trunk/cantharella.data/pom.xml =================================================================== --- trunk/cantharella.data/pom.xml 2013-02-15 00:08:42 UTC (rev 111) +++ trunk/cantharella.data/pom.xml 2013-02-15 05:08:09 UTC (rev 112) @@ -1,181 +1,150 @@ <?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"> - <modelVersion>4.0.0</modelVersion> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>nc.ird</groupId> - <artifactId>cantharella</artifactId> - <version>1.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>nc.ird</groupId> + <artifactId>cantharella</artifactId> + <version>1.1-SNAPSHOT</version> + </parent> - <artifactId>cantharella.data</artifactId> - <name>Cantharella :: Data</name> + <artifactId>cantharella.data</artifactId> + <name>Cantharella :: Data</name> - <build> - <plugins> - <!-- Plugins for the data layer --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>hibernate3-maven-plugin</artifactId> - <configuration> - <components> - <component> - <name>hbm2ddl</name> - <implementation>annotationconfiguration</implementation> - </component> - </components> - <componentProperties> - <scan-classes>true</scan-classes> - <format>true</format> - <export>false</export> - <update>false</update> - <outputfilename>cantharella.sql</outputfilename> - </componentProperties> - </configuration> - <dependencies> - <dependency> + <build> + <plugins> + <!-- Plugins for the data layer --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>hibernate3-maven-plugin</artifactId> + <configuration> + <components> + <component> + <name>hbm2ddl</name> + <implementation>annotationconfiguration</implementation> + </component> + </components> + <componentProperties> + <scan-classes>true</scan-classes> + <format>true</format> + <export>false</export> + <update>false</update> + <outputfilename>cantharella.sql</outputfilename> + </componentProperties> + </configuration> + <dependencies> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>${version.postgresql}</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>cantharella.utils</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + <dependency> <groupId>postgresql</groupId> <artifactId>postgresql</artifactId> - <version>${version.postgresql}</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> - - <dependencies> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cantharella.utils</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>aspectjrt</artifactId> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-ehcache</artifactId> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-search-engine</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-orm</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-tx</artifactId> - </dependency> - - <dependency> - <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-core</artifactId> - </dependency> - - <dependency> - <groupId>c3p0</groupId> - <artifactId>c3p0</artifactId> - </dependency> - - <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - </dependency> - - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - </dependency> - - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib-nodep</artifactId> - </dependency> - - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>aspectjweaver</artifactId> - <scope>test</scope> - </dependency> - </dependencies> + </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-ehcache</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-search-engine</artifactId> + </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-core</artifactId> + </dependency> + <dependency> + <groupId>c3p0</groupId> + <artifactId>c3p0</artifactId> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjrt</artifactId> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjweaver</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-orm</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + </dependency> + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib-nodep</artifactId> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: trunk/cantharella.data/src/main/resources/cantharella.conf =================================================================== --- trunk/cantharella.data/src/main/resources/cantharella.conf 2013-02-15 00:08:42 UTC (rev 111) +++ trunk/cantharella.data/src/main/resources/cantharella.conf 2013-02-15 05:08:09 UTC (rev 112) @@ -28,4 +28,6 @@ db.user=cantharella db.password=cantharella db.debug=true +# value for production +#db.debug=false db.hbm2ddl=validate Modified: trunk/cantharella.service/pom.xml =================================================================== --- trunk/cantharella.service/pom.xml 2013-02-15 00:08:42 UTC (rev 111) +++ trunk/cantharella.service/pom.xml 2013-02-15 05:08:09 UTC (rev 112) @@ -1,140 +1,115 @@ <?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"> - <modelVersion>4.0.0</modelVersion> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>cantharella</artifactId> - <groupId>nc.ird</groupId> - <version>1.1-SNAPSHOT</version> - </parent> + <parent> + <artifactId>cantharella</artifactId> + <groupId>nc.ird</groupId> + <version>1.1-SNAPSHOT</version> + </parent> - <artifactId>cantharella.service</artifactId> - <name>Cantharella :: Service</name> + <artifactId>cantharella.service</artifactId> + <name>Cantharella :: Service</name> - <dependencies> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>cantharella.utils</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>cantharella.data</artifactId> + <version>${project.version}</version> + </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cantharella.utils</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cantharella.data</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-search-engine</artifactId> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-search-orm</artifactId> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-core</artifactId> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context-support</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-orm</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-tx</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-jdbc</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>aspectjrt</artifactId> - </dependency> - - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - </dependency> - - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib-nodep</artifactId> - </dependency> - - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>aspectjweaver</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.poi</groupId> - <artifactId>poi</artifactId> - <scope>test</scope> - </dependency> - </dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>test</scope> + </dependency> + <!-- ??? --> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-search-engine</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-search-orm</artifactId> + </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-core</artifactId> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjrt</artifactId> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjweaver</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context-support</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-jdbc</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-orm</artifactId> + </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib-nodep</artifactId> + </dependency> + <dependency> + <groupId>org.apache.poi</groupId> + <artifactId>poi</artifactId> + <scope>test</scope> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: trunk/cantharella.service/src/main/resources/cantharella.conf =================================================================== --- trunk/cantharella.service/src/main/resources/cantharella.conf 2013-02-15 00:08:42 UTC (rev 111) +++ trunk/cantharella.service/src/main/resources/cantharella.conf 2013-02-15 05:08:09 UTC (rev 112) @@ -25,6 +25,8 @@ # SERVICE CONFIGURATION # mail.debug=true +# value for production +#mail.debug=false mail.from=no-reply@ird.fr mail.host=smtp Modified: trunk/cantharella.utils/pom.xml =================================================================== --- trunk/cantharella.utils/pom.xml 2013-02-15 00:08:42 UTC (rev 111) +++ trunk/cantharella.utils/pom.xml 2013-02-15 05:08:09 UTC (rev 112) @@ -1,50 +1,42 @@ <?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"> - <modelVersion>4.0.0</modelVersion> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>nc.ird</groupId> - <artifactId>cantharella</artifactId> - <version>1.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>nc.ird</groupId> + <artifactId>cantharella</artifactId> + <version>1.1-SNAPSHOT</version> + </parent> - <artifactId>cantharella.utils</artifactId> - <name>Cantharella :: Utils</name> + <artifactId>cantharella.utils</artifactId> + <name>Cantharella :: Utils</name> - <dependencies> + <dependencies> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> + <dependency> + <groupId>net.sf.opencsv</groupId> + <artifactId>opencsv</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + </dependencies> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - - <dependency> - <groupId>net.sf.opencsv</groupId> - <artifactId>opencsv</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - </dependencies> - </project> \ No newline at end of file Property changes on: trunk/cantharella.web ___________________________________________________________________ Modified: svn:ignore - .apt_generated target *.ipr *.iws *.iml .idea .classpath .project .settings + *.ipr nb-configuration.xml *.iws .classpath *.iml .idea .project target .apt_generated nbactions.xml .settings Modified: trunk/cantharella.web/pom.xml =================================================================== --- trunk/cantharella.web/pom.xml 2013-02-15 00:08:42 UTC (rev 111) +++ trunk/cantharella.web/pom.xml 2013-02-15 05:08:09 UTC (rev 112) @@ -1,300 +1,161 @@ <?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"> - <modelVersion>4.0.0</modelVersion> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>cantharella</artifactId> - <groupId>nc.ird</groupId> - <version>1.1-SNAPSHOT</version> - </parent> + <parent> + <artifactId>cantharella</artifactId> + <groupId>nc.ird</groupId> + <version>1.1-SNAPSHOT</version> + </parent> - <artifactId>cantharella.web</artifactId> - <name>Cantharella :: Web</name> - <packaging>war</packaging> + <artifactId>cantharella.web</artifactId> + <name>Cantharella :: Web</name> + <packaging>war</packaging> - <properties> - <!-- Deployment details for the integration server, host & password to update --> - <deploy.integration-host>INTEGRATION_SVR</deploy.integration-host> - <deploy.integration-port>8080</deploy.integration-port> - <deploy.integration-user>admin</deploy.integration-user> - <deploy.integration-password>INTEGRATION_PASSWD - </deploy.integration-password> - <!-- Deployment details for the production server, host & password to update --> - <deploy.production-host>PROD_SVR</deploy.production-host> - <deploy.production-port>80</deploy.production-port> - <deploy.production-user>admin</deploy.production-user> - <deploy.production-password>PROD_PASSWD</deploy.production-password> - <deploy.production-war-name>ROOT</deploy.production-war-name> - - </properties> - <build> - <resources> - <!-- for html in java packages (wicket) --> - <resource> - <filtering>false</filtering> - <directory>src/main/java</directory> - <includes> - <include>**</include> - </includes> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </resource> - - <!-- Default resources for the web layer --> - <resource> - <directory>src/main/resources</directory> - </resource> - </resources> - </build> - - <profiles> - <profile> - <id>integration</id> - <build> - <!-- Integration plugins for the web layer --> + <build> + <resources> + <!-- for html in java packages (wicket) --> + <resource> + <filtering>false</filtering> + <directory>${basedir}/src/main/java</directory> + <includes> + <include>**/*</include> + </includes> + <excludes> + <exclude>**/*.java</exclude> + </excludes> + </resource> + <!-- Default resources for the web layer --> + <resource> + <filtering>false</filtering> + <directory>${basedir}/src/main/resources</directory> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> <plugins> - <plugin> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-maven2-plugin</artifactId> - - <executions> - <execution> - <id>redeploy</id> - <phase>install</phase> - <goals> - <goal>redeploy</goal> - </goals> + <!-- Default plugins for the web layer --> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>maven-jetty-plugin</artifactId> + <version>6.1.26</version> <configuration> - <container> - <containerId>tomcat7x</containerId> - <type>remote</type> - </container> - <configuration> - <type>runtime</type> - <properties> - <cargo.remote.uri> - http://${deploy.integration-host}:${deploy.integration-port}/manager/text - </cargo.remote.uri> - <cargo.remote.username>${deploy.integration-user} - </cargo.remote.username> - <cargo.remote.password>${deploy.integration-password} - </cargo.remote.password> - </properties> - </configuration> - <deployer> - <type>remote</type> - <deployables> - <deployable> - <groupId>${project.groupId}</groupId> - <artifactId>${project.artifactId}</artifactId> - <type>war</type> - <pingURL> - http://${deploy.integration-host}:${deploy.integration-port}/${parent.project.build.finalName}/ - </pingURL> - </deployable> - </deployables> - </deployer> + <scanIntervalSeconds>2</scanIntervalSeconds> + <stopPort>9966</stopPort> + <stopKey>jetty-stop</stopKey> </configuration> - </execution> - </executions> - </plugin> + </plugin> </plugins> - </build> - </profile> - <profile> - <id>production</id> - <build> - <!-- Production plugins for the web layer --> - <plugins> - <plugin> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-maven2-plugin</artifactId> - <executions> - <execution> - <id>redeploy</id> - <phase>install</phase> - <goals> - <goal>redeploy</goal> - </goals> - <configuration> - <container> - <containerId>tomcat7x</containerId> - <type>remote</type> - </container> - <configuration> - <type>runtime</type> - <properties> - <cargo.remote.uri> - http://${deploy.production-host}:${deploy.production-port}/manager/text - </cargo.remote.uri> - <cargo.remote.username>${deploy.production-user} - </cargo.remote.username> - <cargo.remote.password>${deploy.production-password} - </cargo.remote.password> - </properties> - </configuration> + </build> + + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>cantharella.utils</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>cantharella.data</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>cantharella.service</artifactId> + <version>${project.version}</version> + </dependency> - <deployer> - <type>remote</type> - <deployables> - <deployable> - <groupId>${project.groupId}</groupId> - <artifactId>${project.artifactId}</artifactId> - <type>war</type> - <pingURL> - http://${deploy.production-host}:${deploy.production-port}/ - </pingURL> - <properties> - <context>/</context> - </properties> - </deployable> - </deployables> - </deployer> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - <dependencies> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cantharella.utils</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cantharella.data</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>cantharella.service</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-util</artifactId> - </dependency> - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-ioc</artifactId> - </dependency> - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-request</artifactId> - </dependency> - <!--dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-auth-roles</artifactId> - </dependency --> - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-datetime</artifactId> - </dependency> - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-extensions</artifactId> - </dependency> - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-spring</artifactId> - </dependency> - - <dependency> - <groupId>backport-util-concurrent</groupId> - <artifactId>backport-util-concurrent</artifactId> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - </dependency> - - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib-nodep</artifactId> - </dependency> - - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>aspectjweaver</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - <scope>runtime</scope> - </dependency> - - </dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + </dependency> + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjweaver</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + </dependency> + <dependency> + <groupId>backport-util-concurrent</groupId> + <artifactId>backport-util-concurrent</artifactId> + </dependency> + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib-nodep</artifactId> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-util</artifactId> + </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-ioc</artifactId> + </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-request</artifactId> + </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-datetime</artifactId> + </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-extensions</artifactId> + </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-spring</artifactId> + </dependency> + </dependencies> </project> \ No newline at end of file Deleted: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/SandboxPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/SandboxPage.html 2013-02-15 00:08:42 UTC (rev 111) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/SandboxPage.html 2013-02-15 05:08:09 UTC (rev 112) @@ -1,31 +0,0 @@ -<!-- - #%L - Cantharella :: Web - $Id:$ - $HeadURL:$ - %% - Copyright (C) 2009 - 2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> -<head> -<title>Sandbox</title> -</head> -<body> - <!-- Page dedicated to test some Wicket behaviors --> -</body> -</html> \ No newline at end of file Deleted: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/SandboxPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/SandboxPage.java 2013-02-15 00:08:42 UTC (rev 111) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/SandboxPage.java 2013-02-15 05:08:09 UTC (rev 112) @@ -1,96 +0,0 @@ -/* - * #%L - * Cantharella :: Web - * $Id:$ - * $HeadURL:$ - * %% - * Copyright (C) 2009 - 2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package nc.ird.cantharella.web.pages; - -import java.util.List; - -import nc.ird.cantharella.data.dao.GenericDao; -import nc.ird.cantharella.data.dao.impl.PersonneDao; -import nc.ird.cantharella.data.model.Utilisateur; -import nc.ird.cantharella.data.model.Utilisateur.TypeDroit; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.apache.wicket.markup.html.WebPage; -import org.apache.wicket.spring.injection.annot.SpringBean; -import org.hibernate.criterion.DetachedCriteria; -import org.hibernate.criterion.Restrictions; - -/** - * Page dedicated to test some Wicket behaviors - * @author Adrien Cheype - */ -public class SandboxPage extends WebPage { - - /** Logger */ - private static final Logger LOG = LoggerFactory.getLogger(SandboxPage.class); - - /** DAO */ - @SpringBean - private GenericDao dao; - - /** session factory hibernate **/ - // @SpringBean - // private SessionFactory sf; - /** - * Constructor - */ - @SuppressWarnings("unchecked") - public SandboxPage() { - long count = dao.count(PersonneDao.CRITERIA_LIST_ADMINS); - LOG.debug(String.valueOf(count)); - - List<Utilisateur> users = (List<Utilisateur>) dao.list(DetachedCriteria.forClass(Utilisateur.class) - .add(Restrictions.eq("typeDroit", TypeDroit.ADMINISTRATEUR)) - .add(Restrictions.eq("estValide", Boolean.TRUE))); - LOG.debug(users.toString()); - for (Utilisateur u : users) { - LOG.debug(u.toString()); - } - - List<Utilisateur> users2 = (List<Utilisateur>) dao.list(PersonneDao.CRITERIA_LIST_ADMINS); - LOG.debug(users2.toString()); - for (Utilisateur u : users2) { - LOG.debug(u.toString()); - } - - // LOG.debug("createur proxy : " + (p1.createur instanceof HibernateProxy)); - // LOG.debug(p1.createur); - // Personne pers2 = (Personne) session.get(Personne.class, p1.createur.idPersonne); - // LOG.debug(pers2.nom); - - /* - * Station st1 = (Station) session.load(Station.class, 47); LOG.debug(st1.getClass().getSimpleName()); - * LOG.debug(st1.idStation + " " + st1.nom); LOG.debug("createur proxy : " + (st1.createur instanceof - * HibernateProxy)); LOG.debug(st1.createur); Personne pers1 = (Personne) session.load(Personne.class, 27); - * LOG.debug(pers1.getClass().getSimpleName()); LOG.debug(pers1.idPersonne + " " + pers1.nom); - * LOG.debug("proxy : " + (pers1 instanceof HibernateProxy)); LOG.debug(pers1.purificationsCrees); - */ - - /* - * Map cacheEntries = sf.getStatistics() .getSecondLevelCacheStatistics(regionName) .getEntries(); - */ - - // session.close(); - } -} Modified: trunk/cantharella.web/src/main/resources/cantharella.conf =================================================================== --- trunk/cantharella.web/src/main/resources/cantharella.conf 2013-02-15 00:08:42 UTC (rev 111) +++ trunk/cantharella.web/src/main/resources/cantharella.conf 2013-02-15 05:08:09 UTC (rev 112) @@ -24,5 +24,13 @@ # WEB CONFIGURATION # app.debug=true +# value for production +#app.debug=false app.optimize=false +# value for production +#app.optimize=true wicket.configuration=development +# value for production +#wicket.configuration=deployment + + Deleted: trunk/cantharella.web/src/main/resources/log4j.xml =================================================================== --- trunk/cantharella.web/src/main/resources/log4j.xml 2013-02-15 00:08:42 UTC (rev 111) +++ trunk/cantharella.web/src/main/resources/log4j.xml 2013-02-15 05:08:09 UTC (rev 112) @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - Cantharella :: Data - $Id:$ - $HeadURL:$ - %% - Copyright (C) 2009 - 2013 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --> - -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"> - - <!-- Console IRD: detailed logs --> - <appender name="consoleIRD" class="org.apache.log4j.ConsoleAppender"> - <param name="threshold" value="debug" /> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d{HH:mm:ss.SSS} %5p (%F:%M:%L) %m%n" /> - </layout> - </appender> - - <!-- Console root: simple logs --> - <appender name="consoleRoot" class="org.apache.log4j.ConsoleAppender"> - <param name="threshold" value="error" /> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d{HH:mm:ss.SSS} %5p (%c) %m%n" /> - </layout> - </appender> - - <!-- Logs IRD --> - <logger name="nc.ird" additivity="false"> - <level value="debug" /> - <appender-ref ref="consoleIRD" /> - </logger> - - <!-- Logs default --> - <root> - <level value="error" /> - <appender-ref ref="consoleRoot" /> - </root> - -</log4j:configuration> \ No newline at end of file Copied: trunk/cantharella.web/src/main/resources/log4j.xml (from rev 85, trunk/cantharella.data/src/main/resources/development/log4j.xml) =================================================================== --- trunk/cantharella.web/src/main/resources/log4j.xml (rev 0) +++ trunk/cantharella.web/src/main/resources/log4j.xml 2013-02-15 05:08:09 UTC (rev 112) @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Cantharella :: Data + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2009 - 2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. +#L% +--> +<!DOCTYPE log4j:configuration SYSTEM + "http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/xml/doc-files/log4j.dtd"> +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"> + + <!-- Console IRD: detailed logs --> + <appender name="consoleIRD" class="org.apache.log4j.ConsoleAppender"> + <param name="threshold" value="debug" /> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d{HH:mm:ss.SSS} %5p (%F:%M:%L) %m%n" /> + </layout> + </appender> + + <!-- Console root: simple logs --> + <appender name="consoleRoot" class="org.apache.log4j.ConsoleAppender"> + <param name="threshold" value="debug" /> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d{HH:mm:ss.SSS} %5p (%c) %m%n" /> + </layout> + </appender> + + <!-- Logs IRD --> + <logger name="nc.ird" additivity="false"> + <level value="debug" /> + <appender-ref ref="consoleIRD" /> + </logger> + + <!-- Logs Hibernate --> + <logger name="org.hibernate.SQL" additivity="false"> + <level value="info" /> + <appender-ref ref="consoleRoot" /> + </logger> + <logger name="org.hibernate.pretty" additivity="false"> + <level value="info" /> + <appender-ref ref="consoleRoot" /> + </logger> + + <!-- Logs default --> + <root> + <level value="warn" /> + <appender-ref ref="consoleRoot" /> + </root> +</log4j:configuration> \ No newline at end of file Copied: trunk/cantharella.web/src/main/resources/log4j_prod.xml (from rev 85, trunk/cantharella.data/src/main/resources/production/log4j.xml) =================================================================== --- trunk/cantharella.web/src/main/resources/log4j_prod.xml (rev 0) +++ trunk/cantharella.web/src/main/resources/log4j_prod.xml 2013-02-15 05:08:09 UTC (rev 112) @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Cantharella :: Data + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2009 - 2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --> + <!DOCTYPE log4j:configuration SYSTEM + "http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/xml/doc-files/log4j.dtd"> +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"> + + <!-- Asynchronous daily rolling file logs --> + <appender name="file" class="org.apache.log4j.DailyRollingFileAppender"> + <param name="file" value="${catalina.home}/logs/cantharella.log" /> + <param name="threshold" value="info" /> + <param name="datePattern" value="'.'yyyy-MM-dd" /> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d{HH:mm:ss.SSS} %5p (%c) %m%n" /> + </layout> + </appender> + <appender name="async" class="org.apache.log4j.AsyncAppender"> + <param name="bufferSize" value="128" /> + <appender-ref ref="file" /> + </appender> + + <!-- E-mail logs --> + <appender name="mail" class="org.apache.log4j.net.SMTPAppender"> + <param name="SMTPHost" value="smtp.ird.nc" /> + <param name="threshold" value="error" /> + <param name="bufferSize" value="512" /> + <param name="subject" value="[ISlog][Cantharella] Error" /> + <param name="from" value="no-reply@ird.fr" /> + <param name="to" value="ISlog@factor.ird.nc" /> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d{HH:mm:ss.SSS} %5p (%c) %m%n" /> + </layout> + </appender> + + <!-- Logs IRD --> + <logger name="nc.ird" additivity="false"> + <level value="info" /> + <appender-ref ref="async" /> + </logger> + + <!-- Logs Hibernate --> + <logger name="org.hibernate" additivity="false"> + <!-- Disabled --> + <level value="off"/> + </logger> + + <logger name="org.hibernate.validator" additivity="false"> + <level value="error" /> + <appender-ref ref="async" /> + </logger> + + <!-- Logs default --> + <root> + <level value="warn" /> + <appender-ref ref="async" /> + </root> + +</log4j:configuration> \ No newline at end of file Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-02-15 00:08:42 UTC (rev 111) +++ trunk/pom.xml 2013-02-15 05:08:09 UTC (rev 112) @@ -1,468 +1,479 @@ <?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"> - <modelVersion>4.0.0</modelVersion> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>3.4.7</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>3.4.7</version> + </parent> - <groupId>nc.ird</groupId> - <artifactId>cantharella</artifactId> - <version>1.1-SNAPSHOT</version> - <packaging>pom</packaging> - <name>Cantharella</name> - <description>Pharmacochemical database of natural substances</description> - <inceptionYear>2009</inceptionYear> - <url>http://maven-site.forge.codelutin.com/cantharella</url> + <groupId>nc.ird</groupId> + <artifactId>cantharella</artifactId> + <version>1.1-SNAPSHOT</version> + <packaging>pom</packaging> + <name>Cantharella</name> + <description>Pharmacochemical database of natural substances</description> + <inceptionYear>2009</inceptionYear> + <url>http://maven-site.forge.codelutin.com/cantharella</url> - <organization> - <name>IRD</name> - <url>http://www.ird.fr/</url> - </organization> + <organization> + <name>IRD</name> + <url>http://www.ird.fr/</url> + </organization> - <licenses> - <license> - <name>Affero General Public License (AGPL)</name> - <url>http://www.gnu.org/licenses/agpl.txt</url> - <distribution>repo</distribution> - </license> - </licenses> + <licenses> + <license> + <name>Affero General Public License (AGPL)</name> + <url>http://www.gnu.org/licenses/agpl.txt</url> + <distribution>repo</distribution> + </license> + </licenses> - <developers> - <developer> - <id>chemit</id> - <name>Tony Chemit</name> - <email>chemit at codelutin dot com</email> - <organization>CodeLutin</organization> - <organizationUrl>http://codelutin.com</organizationUrl> - <roles> - <role>developer</role> - </roles> - <timezone>Europe/Paris</timezone> - </developer> - <developer> - <id>poussin</id> - <name>Benjamin Poussin</name> - <email>poussin at codelutin dot com</email> - <organization>CodeLutin</organization> - <organizationUrl>http://codelutin.com</organizationUrl> - <roles> - <role>developer</role> - </roles> - <timezone>Europe/Paris</timezone> - </developer> - <developer> - <id>acheype</id> - <name>Adrien Cheype</name> - <email>adrien.cheype at ird dot fr</email> - <organization>IRD</organization> - <organizationUrl>https://www.ird.fr/</organizationUrl> - <roles> - <role>developer</role> - </roles> - <timezone>Pacific/Noumea</timezone> - </developer> - </developers> + <developers> + <developer> + <id>chemit</id> + <name>Tony Chemit</name> + <email>chemit at codelutin dot com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://codelutin.com</organizationUrl> + <roles> + <role>developer</role> + </roles> + <timezone>Europe/Paris</timezone> + </developer> + <developer> + <id>poussin</id> + <name>Benjamin Poussin</name> + <email>poussin at codelutin dot com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://codelutin.com</organizationUrl> + <roles> + <role>developer</role> + </roles> + <timezone>Europe/Paris</timezone> + </developer> + <developer> + <id>acheype</id> + <name>Adrien Cheype</name> + <email>adrien.cheype at ird dot fr</email> + <organization>IRD</organization> + <organizationUrl>http://www.ird.fr/</organizationUrl> + <roles> + <role>developer</role> + </roles> + <timezone>Pacific/Noumea</timezone> + </developer> + </developers> - <scm> - <url>http://svn.forge.codelutin.com/svn/cantharella/trunk</url> - <connection> - scm:svn:http://svn.forge.codelutin.com/svn/cantharella/trunk - </connection> - <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/cantharella/trunk - </developerConnection> - </scm> + <scm> + <url>http://svn.forge.codelutin.com/svn/cantharella/trunk</url> + <connection> + scm:svn:http://svn.forge.codelutin.com/svn/cantharella/trunk + </connection> + <developerConnection> + scm:svn:http://svn.forge.codelutin.com/svn/cantharella/trunk + </developerConnection> + </scm> - <distributionManagement> - <site> - <id>${platform}</id> - <url>${our.site.repository}/${projectId}</url> - </site> - </distributionManagement> + <distributionManagement> + <site> + <id>${platform}</id> + <url>${our.site.repository}/${projectId}</url> + </site> + </distributionManagement> - <modules> - <module>cantharella.utils</module> - <module>cantharella.data</module> - <module>cantharella.service</module> - <module>cantharella.web</module> - </modules> + <modules> + <module>cantharella.utils</module> + <module>cantharella.data</module> + <module>cantharella.service</module> + <module>cantharella.web</module> + </modules> - <properties> + <properties> + <platform>forge.codelutin.com</platform> + <projectId>cantharella</projectId> - <platform>forge.codelutin.com</platform> - <projectId>cantharella</projectId> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + + <!-- license header configuration --> + <license.organizationName> + IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) + </license.organizationName> + <license.licenseName>agpl_v3</license.licenseName> - <!-- license header configuration --> - <license.organizationName> - IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - </license.organizationName> - <license.licenseName>agpl_v3</license.licenseName> + <!-- plugin versions --> + <version.hibernate3-maven-plugin>3.0</version.hibernate3-maven-plugin> + <version.maven-surefire-plugin>2.13</version.maven-surefire-plugin> + <version.animal-sniffer-maven-plugin>1.10</version.animal-sniffer-maven-plugin> + + <!-- dependency versions --> + <version.junit>4.11</version.junit> + <version.slf4j>1.7.2</version.slf4j> + <version.commons-lang3>3.1</version.commons-lang3> + <version.commons-beanutils>1.8.3</version.commons-beanutils> + <version.commons-io>2.4</version.commons-io> + <version.commons-collections>3.2.1</version.commons-collections> + <version.commons-codec>1.7</version.commons-codec> + <version.postgresql>9.1-901-1.jdbc4</version.postgresql> + <version.h2>1.3.170</version.h2> + <version.validation-api>1.0.0.GA</version.validation-api> + <version.hibernate-jpa-2.0-api>1.0.1.Final</version.hibernate-jpa-2.0-api> + <version.hibernate>4.1.9.Final</version.hibernate> + <version.hibernate-validator>4.3.1.Final</version.hibernate-validator> + <version.hibernate-search>4.2.0.Final</version.hibernate-search> + <version.lucene>3.6.2</version.lucene> + <version.c3p0>0.9.1</version.c3p0> + <version.aspectj>1.7.1</version.aspectj> + <!--<version.javassist>3.8.0.GA</version.javassist>--> + <version.spring>3.2.1.RELEASE</version.spring> + <version.mail>1.4.6</version.mail> + <version.backport-util-concurrent>3.1</version.backport-util-concurrent> + <version.cglib>2.2.2</version.cglib> + <version.opencsv>2.3</version.opencsv> + <version.poi>3.9</version.poi> + <version.nuiton-utils>2.6.6</version.nuiton-utils> + <version.servlet-api>2.5</version.servlet-api> + <version.wicket>6.5.0</version.wicket> - <version.commons-codec>1.7</version.commons-codec> - <commonsIoVersion>2.4</commonsIoVersion> - <commonsLang3Version>3.1</commonsLang3Version> - <commonsCollectionsVersion>3.2.1</commonsCollectionsVersion> - <junitVersion>4.11</junitVersion> - <version.slf4j>1.7.2</version.slf4j> + <!-- FIXME echatellier Probleme de parallelisation des tests unitaire, + cause org.hibernate.HibernateException: Don't change the reference to a collection + with cascade="all-delete-orphan": nc.ird.cantharella.data.model.Personne.campagnesDroits --> + <maven.test.skip>true</maven.test.skip> + </properties> - <version.postgresql>9.1-901-1.jdbc4</version.postgresql> - <version.h2>1.3.170</version.h2> + <build> - <version.validation-api>1.0.0.GA</version.validation-api> - <version.jpa>1.0.1.Final</version.jpa> - <version.hibernate>4.1.9.Final</version.hibernate> - <version.hibernate-validator>4.3.1.Final</version.hibernate-validator> - <version.hibernate3-maven-plugin>3.0</version.hibernate3-maven-plugin> - <version.hibernate-search>4.2.0.Final</version.hibernate-search> - <version.lucene>3.6.2</version.lucene> + <pluginManagement> + <plugins> + <!-- 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> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>hibernate3-maven-plugin</artifactId> + <version>${version.hibernate3-maven-plugin}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${version.maven-surefire-plugin}</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java16-sun</artifactId> + <version>${version.animal-sniffer-maven-plugin}</version> + </signature> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> - <version.c3p0>0.9.1</version.c3p0> - <version.aspectj>1.7.1</version.aspectj> - <version.opencsv>2.3</version.opencsv> - <version.javassist>3.8.0.GA</version.javassist> - <version.spring>3.2.1.RELEASE</version.spring> - <version.mail>1.4.6</version.mail> - <version.cglib>2.2.2</version.cglib> - - <version.servlet-api>2.5</version.servlet-api> - - <version.wicket>6.5.0</version.wicket> - - <!-- FIXME echatellier Probleme de parallelisation des tests unitaire, - cause org.hibernate.HibernateException: Don't change the reference to a collection - with cascade="all-delete-orphan": nc.ird.cantharella.data.model.Personne.campagnesDroits --> - <maven.test.skip>true</maven.test.skip> - </properties> - - <build> - - <pluginManagement> - <plugins> - - <!-- plugin site --> - <plugin> - <artifactId>maven-site-plugin</artifactId> - <dependencies> + <dependencyManagement> + <dependencies> <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>${jrstPluginVersion}</version> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${version.junit}</version> + <scope>test</scope> </dependency> - </dependencies> - </plugin> - - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>hibernate3-maven-plugin</artifactId> - <version>${version.hibernate3-maven-plugin}</version> - </plugin> - <plugin> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-maven2-plugin</artifactId> - <version>1.2.1</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>animal-sniffer-maven-plugin</artifactId> - <configuration> - <signature> - <groupId>org.codehaus.mojo.signature</groupId> - <artifactId>java16-sun</artifactId> - <version>1.10</version> - </signature> - </configuration> - </plugin> - </plugins> - - </pluginManagement> - - </build> - - <dependencyManagement> - + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${version.slf4j}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <version>${version.slf4j}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${version.slf4j}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>${version.commons-lang3}</version> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>${version.commons-beanutils}</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>${version.commons-io}</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>${version.commons-collections}</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>${version.commons-codec}</version> + </dependency> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>${version.postgresql}</version> + </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>${version.h2}</version> + </dependency> + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <version>${version.validation-api}</version> + </dependency> + <dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + <version>${version.hibernate-jpa-2.0-api}</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>${version.hibernate}</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-ehcache</artifactId> + <version>${version.hibernate}</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <version>${version.hibernate-validator}</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-search-engine</artifactId> + <version>${version.hibernate-search}</version> + <exclusions> + <!-- 13Mo of unused dependencies --> + <exclusion> + <artifactId>solr-analysis-extras</artifactId> + <groupId>org.apache.solr</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-search-orm</artifactId> + <version>${version.hibernate-search}</version> + </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-core</artifactId> + <version>${version.lucene}</version> + </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-analyzers</artifactId> + <version>${version.lucene}</version> + </dependency> + <dependency> + <groupId>c3p0</groupId> + <artifactId>c3p0</artifactId> + <version>${version.c3p0}</version> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjrt</artifactId> + <version>${version.aspectj}</version> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjweaver</artifactId> + <version>${version.aspectj}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>${version.spring}</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${version.spring}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context-support</artifactId> + <version>${version.spring}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>${version.spring}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + <version>${version.spring}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-jdbc</artifactId> + <version>${version.spring}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-orm</artifactId> + <version>${version.spring}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <version>${version.spring}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <version>${version.spring}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>${version.mail}</version> + </dependency> + <dependency> + <groupId>backport-util-concurrent</groupId> + <artifactId>backport-util-concurrent</artifactId> + <version>${version.backport-util-concurrent}</version> + </dependency> + <dependency> + <!-- for JUnit Spring Test with @Configuration --> + <groupId>cglib</groupId> + <artifactId>cglib-nodep</artifactId> + <version>${version.cglib}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>net.sf.opencsv</groupId> + <artifactId>opencsv</artifactId> + <version>${version.opencsv}</version> + </dependency> + <dependency> + <groupId>org.apache.poi</groupId> + <artifactId>poi</artifactId> + <version>${version.poi}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${version.nuiton-utils}</version> + <exclusions> + <exclusion> + <groupId>org.apache.commons</groupId> + <artifactId>commons-vfs2</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>${version.servlet-api}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-core</artifactId> + <version>${version.wicket}</version> + </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-util</artifactId> + <version>${version.wicket}</version> + </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-ioc</artifactId> + <version>${version.wicket}</version> + </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-request</artifactId> + <version>${version.wicket}</version> + </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-auth-roles</artifactId> + <version>${version.wicket}</version> + </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-datetime</artifactId> + <version>${version.wicket}</version> + </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-extensions</artifactId> + <version>${version.wicket}</version> + </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-spring</artifactId> + <version>${version.wicket}</version> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> - - <!-- Dependencies for all layers --> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>${version.commons-codec}</version> - </dependency> - - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.8.3</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>net.sf.opencsv</groupId> - <artifactId>opencsv</artifactId> - <version>${version.opencsv}</version> - </dependency> - - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>aspectjrt</artifactId> - <version>${version.aspectj}</version> - </dependency> - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>aspectjweaver</artifactId> - <version>${version.aspectj}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${version.slf4j}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <version>${version.slf4j}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.17</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${version.slf4j}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>${version.spring}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context-support</artifactId> - <version>${version.spring}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-tx</artifactId> - <version>${version.spring}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-jdbc</artifactId> - <version>${version.spring}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <version>${version.spring}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - <version>${version.spring}</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <version>${version.spring}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> - <version>${version.jpa}</version> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>${version.hibernate}</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-ehcache</artifactId> - <version>${version.hibernate}</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <version>${version.hibernate-validator}</version> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-search-orm</artifactId> - <version>${version.hibernate-search}</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-search-engine</artifactId> - <version>${version.hibernate-search}</version> - <exclusions> - <!-- 13Mo of unused dependencies --> - <exclusion> - <artifactId>solr-analysis-extras</artifactId> - <groupId>org.apache.solr</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-core</artifactId> - <version>${version.lucene}</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-analyzers</artifactId> - <version>${version.lucene}</version> - </dependency> - - <dependency> - <groupId>c3p0</groupId> - <artifactId>c3p0</artifactId> - <version>${version.c3p0}</version> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-orm</artifactId> - <version>${version.spring}</version> - </dependency> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>${version.postgresql}</version> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>${version.servlet-api}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - <version>${version.validation-api}</version> - </dependency> - - <dependency> - <groupId>backport-util-concurrent</groupId> - <artifactId>backport-util-concurrent</artifactId> - <version>3.1</version> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <version>${version.spring}</version> - </dependency> - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-core</artifactId> - <version>${version.wicket}</version> - </dependency> - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-util</artifactId> - <version>${version.wicket}</version> - </dependency> - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-ioc</artifactId> - <version>${version.wicket}</version> - </dependency> - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-request</artifactId> - <version>${version.wicket}</version> - </dependency> - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-auth-roles</artifactId> - <version>${version.wicket}</version> - </dependency> - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-datetime</artifactId> - <version>${version.wicket}</version> - </dependency> - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-extensions</artifactId> - <version>${version.wicket}</version> - </dependency> - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-spring</artifactId> - <version>${version.wicket}</version> - </dependency> - - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>${version.h2}</version> - </dependency> - - <!-- for JUnit Spring Test with @Configuration --> - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib-nodep</artifactId> - <version>${version.cglib}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - <version>${version.mail}</version> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>2.6.6</version> - <exclusions> - <exclusion> - <groupId>org.apache.commons</groupId> - <artifactId>commons-vfs2</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.poi</groupId> - <artifactId>poi</artifactId> - <version>3.9</version> - <scope>test</scope> - </dependency> + <!-- shared dependencies --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </dependency> </dependencies> - - </dependencyManagement> + </project>