June 2013 - Cantharella-commits - mailman.cloud.codelutin.com

r245 - trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages
by echatellier＠users.forge.codelutin.com 21 Jun '13

21 Jun '13

Author: echatellier Date: 2013-06-21 11:08:32 +0200 (Fri, 21 Jun 2013) New Revision: 245 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/245 Log: Fix dev banner text Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.html Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.html 2013-06-21 08:24:20 UTC (rev 244) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.html 2013-06-21 09:08:32 UTC (rev 245) @@ -43,7 +43,7 @@ <body onload="slideMenu.build('sm',360,10,10,1)"> <div class="banner" wicket:id="TemplatePage.Banner"> - <a>Under developement</a> + <a>En développement</a> </div> <div id="header"><div>

1 0

r244 - trunk/cantharella.data/src/main/resources
by echatellier＠users.forge.codelutin.com 21 Jun '13

21 Jun '13

Author: echatellier Date: 2013-06-21 10:24:20 +0200 (Fri, 21 Jun 2013) New Revision: 244 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/244 Log: Remove unused configuration Modified: trunk/cantharella.data/src/main/resources/cantharella.conf Modified: trunk/cantharella.data/src/main/resources/cantharella.conf =================================================================== --- trunk/cantharella.data/src/main/resources/cantharella.conf 2013-06-21 08:21:15 UTC (rev 243) +++ trunk/cantharella.data/src/main/resources/cantharella.conf 2013-06-21 08:24:20 UTC (rev 244) @@ -34,5 +34,3 @@ # Hibernate search lucene index location on filesystem. hibernate.search.indexBase=/tmp/cantharella -# Hibernate search analyzer -hibernate.search.analyzer=org.apache.lucene.analysis.fr.FrenchAnalyzer

1 0

r243 - trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config
by echatellier＠users.forge.codelutin.com 21 Jun '13

21 Jun '13

Author: echatellier Date: 2013-06-21 10:21:15 +0200 (Fri, 21 Jun 2013) New Revision: 243 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/243 Log: Remove unused configuration Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java 2013-06-16 20:22:01 UTC (rev 242) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java 2013-06-21 08:21:15 UTC (rev 243) @@ -186,12 +186,6 @@ @Value("${hibernate.search.indexBase}") protected String hibernateSearchIndexBase; - /** - * Hibernate search analyzer. - */ - @Value("${hibernate.search.analyzer}") - protected String hibernateSearchAnalyzer; - static { // The first Locale in the list is the default one List<Locale> locales = new ArrayList<Locale>();

1 0

r242 - in trunk/cantharella.data/src: main/java/nc/ird/cantharella/data/model/search test/java/nc/ird/cantharella/data/model test/java/nc/ird/cantharella/data/model/search
by echatellier＠users.forge.codelutin.com 16 Jun '13

16 Jun '13

Author: echatellier Date: 2013-06-16 22:22:01 +0200 (Sun, 16 Jun 2013) New Revision: 242 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/242 Log: fixes #2712: Keep duplicated caracters (even 2 last ones) Added: trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/search/ trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/search/CantharellaAnalyzerTest.java Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/CantharellaStemmer.java Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/CantharellaStemmer.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/CantharellaStemmer.java 2013-06-14 16:19:26 UTC (rev 241) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/CantharellaStemmer.java 2013-06-16 20:22:01 UTC (rev 242) @@ -252,8 +252,10 @@ len--; if (s[len - 1] == 'e') len--; + /* XXX chatellier 20130516 disabled for cantharella because + duplicated characters are usefull in some refs identifiers if (s[len - 1] == s[len - 2]) - len--; + len--;*/ } return len; } Added: trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/search/CantharellaAnalyzerTest.java =================================================================== --- trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/search/CantharellaAnalyzerTest.java (rev 0) +++ trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/search/CantharellaAnalyzerTest.java 2013-06-16 20:22:01 UTC (rev 242) @@ -0,0 +1,39 @@ +package nc.ird.cantharella.data.model.search; + +import java.io.IOException; +import java.io.StringReader; + +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; +import org.apache.lucene.util.Version; +import org.junit.Assert; +import org.junit.Test; + +public class CantharellaAnalyzerTest { + + /** + * Test que les caractères dupliqués ne sont pas perdu (supprimé) par l'analyzer. + * @throws IOException + */ + @Test + public void testDuplicated() throws IOException { + Analyzer analyzer = new CantharellaAnalyzer(Version.LUCENE_36); + + // without * + StringReader reader = new StringReader("R3044"); + TokenStream stream = analyzer.tokenStream("label", reader); + stream.incrementToken(); + String term = stream.getAttribute(CharTermAttribute.class).toString(); + Assert.assertEquals("r3044", term.toString()); + + // with * + reader = new StringReader("*3044"); + stream = analyzer.tokenStream("label", reader); + stream.incrementToken(); + term = stream.getAttribute(CharTermAttribute.class).toString(); + Assert.assertEquals("3044", term.toString()); + + analyzer.close(); + } +} Property changes on: trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/search/CantharellaAnalyzerTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r241 - in trunk/cantharella.web/src/main: java/nc/ird/cantharella/web/pages java/nc/ird/cantharella/web/pages/domain/document webapp/css
by echatellier＠users.forge.codelutin.com 14 Jun '13

14 Jun '13

Author: echatellier Date: 2013-06-14 18:19:26 +0200 (Fri, 14 Jun 2013) New Revision: 241 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/241 Log: Add developpement banner. Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java trunk/cantharella.web/src/main/webapp/css/general.css Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.html 2013-06-05 07:35:45 UTC (rev 240) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.html 2013-06-14 16:19:26 UTC (rev 241) @@ -41,6 +41,11 @@ <script type="text/javascript" src="js/slidemenu.js"></script> </head> <body onload="slideMenu.build('sm',360,10,10,1)"> + +<div class="banner" wicket:id="TemplatePage.Banner"> + <a>Under developement</a> +</div> + <div id="header"><div> <div id="title"> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.java 2013-06-05 07:35:45 UTC (rev 240) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.java 2013-06-14 16:19:26 UTC (rev 241) @@ -137,6 +137,11 @@ add(new BookmarkablePageLink<Void>(ContactPage.class.getSimpleName(), ContactPage.class)); add(new BookmarkablePageLink<Void>(ImprintPage.class.getSimpleName(), ImprintPage.class)); setVersioned(true); + + // dev banner + WebMarkupContainer bannerContainer = new WebMarkupContainer("TemplatePage.Banner"); + bannerContainer.setVisibilityAllowed(getApplication().getDebugSettings().isDevelopmentUtilitiesEnabled()); + add(bannerContainer); } /** {@inheritDoc} */ Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java 2013-06-05 07:35:45 UTC (rev 240) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java 2013-06-14 16:19:26 UTC (rev 241) @@ -281,10 +281,10 @@ // if no error validateModel(); } catch (InvalidFileExtensionException ex) { - error(getStringModel("ManageDocumentPage.Error.notAllowedExtension")); + error(getString("ManageDocumentPage.Error.notAllowedExtension")); } } else if (StringUtils.isEmpty(document.getFileName())) { - error(getStringModel("ManageDocumentPage.Error.emptyFile")); + error(getString("ManageDocumentPage.Error.emptyFile")); } else { validateModel(); } Modified: trunk/cantharella.web/src/main/webapp/css/general.css =================================================================== --- trunk/cantharella.web/src/main/webapp/css/general.css 2013-06-05 07:35:45 UTC (rev 240) +++ trunk/cantharella.web/src/main/webapp/css/general.css 2013-06-14 16:19:26 UTC (rev 241) @@ -704,4 +704,31 @@ #content li.feedbackPanelDEBUG:before { content: url("../images/info.png"); } + +.banner { + background-color: #AA0000; + box-shadow: 0 0 1em #888888; + font-size: 17px; + left: -3em; + overflow: hidden; + position: absolute; + top: 2.5em; + -webkit-transform: rotate(-45deg); + -moz-transform: rotate(-45deg); + -o-transform: rotate(-45deg); + transform: rotate(-45deg); + width: 220px; + z-index: 999; +} +.banner a { + border: 1px solid #FFAAAA; + color: #FFFFFF; + display: block; + font-size: 0.8em; + font-weight: bold; + padding: 0.5em; + text-align: center; + text-decoration: none; + text-shadow: 1px 1px 10px #000000; +}

1 0

Jenkins build is back to normal : cantharella #186
by admin+hudson＠codelutin.com 05 Jun '13

05 Jun '13

See <http://ci.nuiton.org/jenkins/job/cantharella/186/changes>

1 0

Jenkins build is back to normal : cantharella » Cantharella :: Utils #186
by admin+hudson＠codelutin.com 05 Jun '13

05 Jun '13

See <http://ci.nuiton.org/jenkins/job/cantharella/nc.ird$cantharella.utils/186/c…>

1 0

r240 - in trunk: . cantharella.data cantharella.service cantharella.utils cantharella.web
by maven-release＠users.forge.codelutin.com 05 Jun '13

05 Jun '13

Author: maven-release Date: 2013-06-05 09:35:45 +0200 (Wed, 05 Jun 2013) New Revision: 240 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/240 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/cantharella.data/pom.xml trunk/cantharella.service/pom.xml trunk/cantharella.utils/pom.xml trunk/cantharella.web/pom.xml trunk/pom.xml Modified: trunk/cantharella.data/pom.xml =================================================================== --- trunk/cantharella.data/pom.xml 2013-06-05 07:35:37 UTC (rev 239) +++ trunk/cantharella.data/pom.xml 2013-06-05 07:35:45 UTC (rev 240) @@ -5,7 +5,7 @@ <parent> <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.1</version> + <version>1.1.1-SNAPSHOT</version> </parent> <artifactId>cantharella.data</artifactId> Modified: trunk/cantharella.service/pom.xml =================================================================== --- trunk/cantharella.service/pom.xml 2013-06-05 07:35:37 UTC (rev 239) +++ trunk/cantharella.service/pom.xml 2013-06-05 07:35:45 UTC (rev 240) @@ -5,7 +5,7 @@ <parent> <artifactId>cantharella</artifactId> <groupId>nc.ird</groupId> - <version>1.1</version> + <version>1.1.1-SNAPSHOT</version> </parent> <artifactId>cantharella.service</artifactId> Modified: trunk/cantharella.utils/pom.xml =================================================================== --- trunk/cantharella.utils/pom.xml 2013-06-05 07:35:37 UTC (rev 239) +++ trunk/cantharella.utils/pom.xml 2013-06-05 07:35:45 UTC (rev 240) @@ -5,7 +5,7 @@ <parent> <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.1</version> + <version>1.1.1-SNAPSHOT</version> </parent> <artifactId>cantharella.utils</artifactId> Modified: trunk/cantharella.web/pom.xml =================================================================== --- trunk/cantharella.web/pom.xml 2013-06-05 07:35:37 UTC (rev 239) +++ trunk/cantharella.web/pom.xml 2013-06-05 07:35:45 UTC (rev 240) @@ -5,7 +5,7 @@ <parent> <artifactId>cantharella</artifactId> <groupId>nc.ird</groupId> - <version>1.1</version> + <version>1.1.1-SNAPSHOT</version> </parent> <artifactId>cantharella.web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-06-05 07:35:37 UTC (rev 239) +++ trunk/pom.xml 2013-06-05 07:35:45 UTC (rev 240) @@ -10,7 +10,7 @@ <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.1</version> + <version>1.1.1-SNAPSHOT</version> <packaging>pom</packaging> <name>Cantharella</name> <description>Pharmacochemical database of natural substances</description> @@ -67,12 +67,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/cantharella/tags/cantharella-1.1</url> + <url>http://svn.forge.codelutin.com/svn/cantharella/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/cantharella/tags/cantharella-1.1 + scm:svn:http://svn.forge.codelutin.com/svn/cantharella/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/cantharella/tags/cantharella-1.1 + scm:svn:http://svn.forge.codelutin.com/svn/cantharella/trunk </developerConnection> </scm>

1 0

r239 - tags
by maven-release＠users.forge.codelutin.com 05 Jun '13

05 Jun '13

Author: maven-release Date: 2013-06-05 09:35:37 +0200 (Wed, 05 Jun 2013) New Revision: 239 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/239 Log: [maven-release-plugin] copy for tag cantharella-1.1 Added: tags/cantharella-1.1/

1 0

r238 - in trunk: . cantharella.data cantharella.service cantharella.utils cantharella.web
by maven-release＠users.forge.codelutin.com 05 Jun '13

05 Jun '13

Author: maven-release Date: 2013-06-05 09:35:29 +0200 (Wed, 05 Jun 2013) New Revision: 238 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/238 Log: [maven-release-plugin] prepare release cantharella-1.1 Modified: trunk/cantharella.data/pom.xml trunk/cantharella.service/pom.xml trunk/cantharella.utils/pom.xml trunk/cantharella.web/pom.xml trunk/pom.xml Modified: trunk/cantharella.data/pom.xml =================================================================== --- trunk/cantharella.data/pom.xml 2013-06-05 07:23:17 UTC (rev 237) +++ trunk/cantharella.data/pom.xml 2013-06-05 07:35:29 UTC (rev 238) @@ -5,7 +5,7 @@ <parent> <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> </parent> <artifactId>cantharella.data</artifactId> Modified: trunk/cantharella.service/pom.xml =================================================================== --- trunk/cantharella.service/pom.xml 2013-06-05 07:23:17 UTC (rev 237) +++ trunk/cantharella.service/pom.xml 2013-06-05 07:35:29 UTC (rev 238) @@ -5,7 +5,7 @@ <parent> <artifactId>cantharella</artifactId> <groupId>nc.ird</groupId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> </parent> <artifactId>cantharella.service</artifactId> Modified: trunk/cantharella.utils/pom.xml =================================================================== --- trunk/cantharella.utils/pom.xml 2013-06-05 07:23:17 UTC (rev 237) +++ trunk/cantharella.utils/pom.xml 2013-06-05 07:35:29 UTC (rev 238) @@ -5,7 +5,7 @@ <parent> <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> </parent> <artifactId>cantharella.utils</artifactId> Modified: trunk/cantharella.web/pom.xml =================================================================== --- trunk/cantharella.web/pom.xml 2013-06-05 07:23:17 UTC (rev 237) +++ trunk/cantharella.web/pom.xml 2013-06-05 07:35:29 UTC (rev 238) @@ -5,7 +5,7 @@ <parent> <artifactId>cantharella</artifactId> <groupId>nc.ird</groupId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> </parent> <artifactId>cantharella.web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-06-05 07:23:17 UTC (rev 237) +++ trunk/pom.xml 2013-06-05 07:35:29 UTC (rev 238) @@ -10,7 +10,7 @@ <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> <packaging>pom</packaging> <name>Cantharella</name> <description>Pharmacochemical database of natural substances</description> @@ -67,12 +67,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/cantharella/trunk</url> + <url>http://svn.forge.codelutin.com/svn/cantharella/tags/cantharella-1.1</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/cantharella/trunk + scm:svn:http://svn.forge.codelutin.com/svn/cantharella/tags/cantharella-1.1 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/cantharella/trunk + scm:svn:http://svn.forge.codelutin.com/svn/cantharella/tags/cantharella-1.1 </developerConnection> </scm>

1 0