August 2012 - Wao-commits - mailman.cloud.codelutin.com

r1621 - trunk
by tchemit＠users.forge.codelutin.com 30 Aug '12

30 Aug '12

Author: tchemit Date: 2012-08-30 16:47:31 +0200 (Thu, 30 Aug 2012) New Revision: 1621 Url: http://forge.codelutin.com/repositories/revision/wao/1621 Log: Update mavenpom4redmine to 3.3.7. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-28 12:54:02 UTC (rev 1620) +++ trunk/pom.xml 2012-08-30 14:47:31 UTC (rev 1621) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.6</version> + <version>3.3.7</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r1620 - trunk
by tchemit＠users.forge.codelutin.com 28 Aug '12

28 Aug '12

Author: tchemit Date: 2012-08-28 14:54:02 +0200 (Tue, 28 Aug 2012) New Revision: 1620 Url: http://forge.codelutin.com/repositories/revision/wao/1620 Log: updates back to t5-easy-fckeditor 1.0.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-28 10:09:15 UTC (rev 1619) +++ trunk/pom.xml 2012-08-28 12:54:02 UTC (rev 1620) @@ -109,7 +109,7 @@ <dependency> <groupId>com.orientimport</groupId> <artifactId>t5-easy-fckeditor</artifactId> - <version>1.0.4</version> + <version>1.0.5</version> </dependency> <dependency> <groupId>org.chenillekit</groupId>

1 0

r1619 - in trunk: . wao-ui
by maven-release＠users.forge.codelutin.com 28 Aug '12

28 Aug '12

Author: maven-release Date: 2012-08-28 12:09:15 +0200 (Tue, 28 Aug 2012) New Revision: 1619 Url: http://forge.codelutin.com/repositories/revision/wao/1619 Log: update mavenpom + use new way of demo deploy Modified: trunk/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-27 17:06:29 UTC (rev 1618) +++ trunk/pom.xml 2012-08-28 10:09:15 UTC (rev 1619) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.2.1</version> + <version>3.3.6</version> </parent> <groupId>fr.ifremer</groupId> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2012-08-27 17:06:29 UTC (rev 1618) +++ trunk/wao-ui/pom.xml 2012-08-28 10:09:15 UTC (rev 1619) @@ -165,6 +165,11 @@    + + <properties> + <deployFiles>target/${project.build.finalName}.war</deployFiles> + </properties> + <build> <plugins> <plugin>

1 0

r1618 - in trunk/wao-business/src/main: java/fr/ifremer/wao/service resources/i18n
by bleny＠users.forge.codelutin.com 27 Aug '12

27 Aug '12

Author: bleny Date: 2012-08-27 19:06:29 +0200 (Mon, 27 Aug 2012) New Revision: 1618 Url: http://forge.codelutin.com/repositories/revision/wao/1618 Log: fixes #1423 Ajouter le code 'FIF' au r?\195?\169f?\195?\169rentiel des esp?\195?\168ces cibles Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2012-08-27 17:04:59 UTC (rev 1617) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2012-08-27 17:06:29 UTC (rev 1618) @@ -690,7 +690,7 @@ "TBB", "TBN", "TBS", "TMS"}; final String[] speciesCodesBase = {"ALG", "ANA", "CAT", "CRU", - "DEF", "DWS", "LPF", "MOL", "SPF"}; + "DEF", "DWS", "LPF", "MOL", "SPF", "FIF"}; long nbCodes = fishingGearDCFDAO.count() + targetSpeciesDCFDAO.count(); Modified: trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2012-08-27 17:04:59 UTC (rev 1617) +++ trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2012-08-27 17:06:29 UTC (rev 1618) @@ -132,6 +132,7 @@ fr.ifremer.wao.entity.TargetSpeciesDCF.CSJ=Scallop fr.ifremer.wao.entity.TargetSpeciesDCF.DEF=Demersal species fr.ifremer.wao.entity.TargetSpeciesDCF.DWS=Deep water species +fr.ifremer.wao.entity.TargetSpeciesDCF.FIF=Finfish fr.ifremer.wao.entity.TargetSpeciesDCF.FIN=Flatfishes fr.ifremer.wao.entity.TargetSpeciesDCF.LP=Tall pelagic fr.ifremer.wao.entity.TargetSpeciesDCF.LPF=Tall pelagic Modified: trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2012-08-27 17:04:59 UTC (rev 1617) +++ trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2012-08-27 17:06:29 UTC (rev 1618) @@ -133,6 +133,7 @@ fr.ifremer.wao.entity.TargetSpeciesDCF.CSJ=Coquilles Saint-Jacques fr.ifremer.wao.entity.TargetSpeciesDCF.DEF=Espèces démersales fr.ifremer.wao.entity.TargetSpeciesDCF.DWS=Espèces d'eaux profondes +fr.ifremer.wao.entity.TargetSpeciesDCF.FIF=Poissons fr.ifremer.wao.entity.TargetSpeciesDCF.FIN=Poisson plats fr.ifremer.wao.entity.TargetSpeciesDCF.LPF=Grands pélagiques fr.ifremer.wao.entity.TargetSpeciesDCF.MOL=Mollusques

1 0

r1617 - in trunk: . wao-ui
by bleny＠users.forge.codelutin.com 27 Aug '12

27 Aug '12

Author: bleny Date: 2012-08-27 19:04:59 +0200 (Mon, 27 Aug 2012) New Revision: 1617 Url: http://forge.codelutin.com/repositories/revision/wao/1617 Log: move repositories declaration in parent pom ; change version com.orientimport:t5-easy-fckeditor to 1.0.4, repository seems corrupted and 1.0.5 is missing Modified: trunk/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-04 16:25:41 UTC (rev 1616) +++ trunk/pom.xml 2012-08-27 17:04:59 UTC (rev 1617) @@ -109,7 +109,7 @@ <dependency> <groupId>com.orientimport</groupId> <artifactId>t5-easy-fckeditor</artifactId> - <version>1.0.5</version> + <version>1.0.4</version> </dependency> <dependency> <groupId>org.chenillekit</groupId> @@ -438,4 +438,14 @@ </archive> </mailingList> </mailingLists> + + <repositories> + + <repository> + <id>wao-group</id> + <name>Wao dependencies</name> + <url>http://nexus.nuiton.org/nexus/content/groups/wao-group/</url> + </repository> + + </repositories> </project> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2012-06-04 16:25:41 UTC (rev 1616) +++ trunk/wao-ui/pom.xml 2012-08-27 17:04:59 UTC (rev 1617) @@ -240,14 +240,4 @@ </plugins> </build> - <repositories> - - <repository> - <id>wao-group</id> - <name>Wao dependencies</name> - <url>http://nexus.nuiton.org/nexus/content/groups/wao-group/</url> - </repository> - - </repositories> - </project> \ No newline at end of file

1 0