March 2014 - Cantharella-commits - mailman.cloud.codelutin.com

r263 - in trunk: . cantharella.data cantharella.service cantharella.utils cantharella.web
by echatellier＠users.forge.codelutin.com 04 Mar '14

04 Mar '14

Author: echatellier Date: 2014-03-04 16:36:28 +0100 (Tue, 04 Mar 2014) New Revision: 263 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/263 Log: Update build for release Modified: trunk/LICENSE.txt trunk/cantharella.data/LICENSE.txt trunk/cantharella.service/LICENSE.txt trunk/cantharella.utils/LICENSE.txt trunk/cantharella.web/LICENSE.txt trunk/pom.xml Modified: trunk/LICENSE.txt =================================================================== --- trunk/LICENSE.txt 2014-03-04 15:35:13 UTC (rev 262) +++ trunk/LICENSE.txt 2014-03-04 15:36:28 UTC (rev 263) @@ -658,4 +658,4 @@ You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. \ No newline at end of file +<http://www.gnu.org/licenses/>. Modified: trunk/cantharella.data/LICENSE.txt =================================================================== --- trunk/cantharella.data/LICENSE.txt 2014-03-04 15:35:13 UTC (rev 262) +++ trunk/cantharella.data/LICENSE.txt 2014-03-04 15:36:28 UTC (rev 263) @@ -658,4 +658,4 @@ You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. \ No newline at end of file +<http://www.gnu.org/licenses/>. Modified: trunk/cantharella.service/LICENSE.txt =================================================================== --- trunk/cantharella.service/LICENSE.txt 2014-03-04 15:35:13 UTC (rev 262) +++ trunk/cantharella.service/LICENSE.txt 2014-03-04 15:36:28 UTC (rev 263) @@ -658,4 +658,4 @@ You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. \ No newline at end of file +<http://www.gnu.org/licenses/>. Modified: trunk/cantharella.utils/LICENSE.txt =================================================================== --- trunk/cantharella.utils/LICENSE.txt 2014-03-04 15:35:13 UTC (rev 262) +++ trunk/cantharella.utils/LICENSE.txt 2014-03-04 15:36:28 UTC (rev 263) @@ -658,4 +658,4 @@ You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. \ No newline at end of file +<http://www.gnu.org/licenses/>. Modified: trunk/cantharella.web/LICENSE.txt =================================================================== --- trunk/cantharella.web/LICENSE.txt 2014-03-04 15:35:13 UTC (rev 262) +++ trunk/cantharella.web/LICENSE.txt 2014-03-04 15:36:28 UTC (rev 263) @@ -658,4 +658,4 @@ You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. \ No newline at end of file +<http://www.gnu.org/licenses/>. Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-04 15:35:13 UTC (rev 262) +++ trunk/pom.xml 2014-03-04 15:36:28 UTC (rev 263) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.11</version> + <version>5.0</version> </parent> <groupId>nc.ird</groupId> @@ -67,13 +67,9 @@ </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> + <url>http://svn.codelutin.com/cantharella/trunk</url> + <connection>scm:svn:http://svn.codelutin.com/cantharella/trunk</connection> + <developerConnection>scm:svn:http://svn.codelutin.com/cantharella/trunk</developerConnection> </scm> <distributionManagement> @@ -91,7 +87,7 @@ </modules> <properties> - <platform>forge.codelutin.com</platform> + <platform>codelutin.com</platform> <projectId>cantharella</projectId> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

1 0

r262 - trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document
by echatellier＠users.forge.codelutin.com 04 Mar '14

04 Mar '14

Author: echatellier Date: 2014-03-04 16:35:13 +0100 (Tue, 04 Mar 2014) New Revision: 262 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/262 Log: Format code Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentTooltipColumn.java Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentTooltipColumn.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentTooltipColumn.java 2014-03-04 15:34:54 UTC (rev 261) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentTooltipColumn.java 2014-03-04 15:35:13 UTC (rev 262) @@ -114,7 +114,7 @@ ContextImage image = new ContextImage("tooltip", Model.of("images/attachment.png")); image.add(new AttributeModifier("title", messageModel)); - + link.add(image); } }

1 0

r261 - trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl
by echatellier＠users.forge.codelutin.com 04 Mar '14

04 Mar '14

Author: echatellier Date: 2014-03-04 16:34:54 +0100 (Tue, 04 Mar 2014) New Revision: 261 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/261 Log: Format code Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java 2014-03-04 15:26:02 UTC (rev 260) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java 2014-03-04 15:34:54 UTC (rev 261) @@ -304,7 +304,8 @@ ResultatTestBio resultatTestBio = itResultatTestBios.next(); Lot lot = resultatTestBio.getLotSource(); // le lot peut être null pour les tests temoin - if (resultatTestBio.getTypeResultat() != TypeResultat.PRODUIT || !lotService.isLotAccessibleByUser(lot, utilisateur)) { + if (resultatTestBio.getTypeResultat() != TypeResultat.PRODUIT + || !lotService.isLotAccessibleByUser(lot, utilisateur)) { itResultatTestBios.remove(); } }

1 0

r260 - trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document
by echatellier＠users.forge.codelutin.com 04 Mar '14

04 Mar '14

Author: echatellier Date: 2014-03-04 16:26:02 +0100 (Tue, 04 Mar 2014) New Revision: 260 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/260 Log: fixes #4634: Make attachemnt image static Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentTooltipColumn.java Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentTooltipColumn.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentTooltipColumn.java 2013-07-02 17:47:49 UTC (rev 259) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentTooltipColumn.java 2014-03-04 15:26:02 UTC (rev 260) @@ -112,9 +112,10 @@ }; add(link); - WebComponent img = new Image("tooltip", new ContextRelativeResource("images/attachment.png")); - img.add(new AttributeModifier("title", messageModel)); - link.add(img); + ContextImage image = new ContextImage("tooltip", Model.of("images/attachment.png")); + image.add(new AttributeModifier("title", messageModel)); + + link.add(image); } }

1 0