- Wikitty-commits - mailman.cloud.codelutin.com

r1476 - in trunk: . src/site wikitty-api/src/site wikitty-generators/src/site wikitty-hessian-client/src/site wikitty-jdbc/src/site wikitty-lucene wikitty-publication wikitty-solr/src/site wp-maven-plugin/src/site
by ymartel＠users.nuiton.org 31 May '12

31 May '12

Author: ymartel Date: 2012-05-31 12:20:15 +0200 (Thu, 31 May 2012) New Revision: 1476 Url: http://nuiton.org/repositories/revision/wikitty/1476 Log: update to mavenpom 3.3.2 Modified: trunk/pom.xml trunk/src/site/site_en.xml trunk/src/site/site_fr.xml trunk/wikitty-api/src/site/site_en.xml trunk/wikitty-api/src/site/site_fr.xml trunk/wikitty-generators/src/site/site_en.xml trunk/wikitty-generators/src/site/site_fr.xml trunk/wikitty-hessian-client/src/site/site_en.xml trunk/wikitty-hessian-client/src/site/site_fr.xml trunk/wikitty-jdbc/src/site/site_en.xml trunk/wikitty-jdbc/src/site/site_fr.xml trunk/wikitty-lucene/pom.xml trunk/wikitty-publication/pom.xml trunk/wikitty-solr/src/site/site_en.xml trunk/wikitty-solr/src/site/site_fr.xml trunk/wp-maven-plugin/src/site/site_en.xml trunk/wp-maven-plugin/src/site/site_fr.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-26 12:19:55 UTC (rev 1475) +++ trunk/pom.xml 2012-05-31 10:20:15 UTC (rev 1476) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.2.1</version> + <version>3.3.2</version> </parent>  @@ -823,7 +823,7 @@ <developer> <name>Benjamin Poussin</name> <id>bpoussin</id> - <email>poussin(a)codelutin.com</email> + <email>poussin at codelutin dot com</email> <organization>CodeLutin</organization> <timezone>+2</timezone> <roles> @@ -835,7 +835,7 @@ <developer> <name>Arnaud Thimel</name> <id>athimel</id> - <email>thimel(a)codelutin.com</email> + <email>thimel at codelutin dot com</email> <organization>CodeLutin</organization> <timezone>+2</timezone> <roles> @@ -846,7 +846,7 @@ <developer> <name>Julien Ruchaud</name> <id>jruchaud</id> - <email>ruchaud(a)codelutin.com</email> + <email>ruchaud at codelutin dot com</email> <organization>CodeLutin</organization> <timezone>+2</timezone> <roles> @@ -857,7 +857,7 @@ <developer> <name>Eric Chatellier</name> <id>echatellier</id> - <email>chatellier(a)codelutin.com</email> + <email>chatellier at codelutin dot com</email> <organization>CodeLutin</organization> <timezone>+2</timezone> <roles> @@ -868,7 +868,7 @@ <developer> <name>Tony Chemit</name> <id>tchemit</id> - <email>chemit(a)codelutin.com</email> + <email>chemit at codelutin dot com</email> <organization>CodeLutin</organization> <timezone>+2</timezone> <roles> @@ -879,7 +879,7 @@ <developer> <name>Yannick Martel</name> <id>ymartel</id> - <email>martel(a)codelutin.com</email> + <email>martel at codelutin dot com</email> <organization>CodeLutin</organization> <timezone>+2</timezone> <roles> @@ -890,7 +890,7 @@ <developer> <name>Jean Couteau</name> <id>jcouteau</id> - <email>couteau(a)codelutin.com</email> + <email>couteau at codelutin dot com</email> <organization>CodeLutin</organization> <timezone>+2</timezone> <roles> @@ -902,7 +902,7 @@ <developer> <name>Kevin Morin</name> <id>kmorin</id> - <email>morin(a)codelutin.com</email> + <email>morin at codelutin dot com</email> <organization>CodeLutin</organization> <timezone>+2</timezone> <roles> @@ -913,7 +913,7 @@ <developer> <name>Brendan Le Ny</name> <id>bleny</id> - <email>bleny(a)codelutin.com</email> + <email>bleny at codelutin dot com</email> <organization>CodeLutin</organization> <timezone>+2</timezone> <roles> @@ -924,7 +924,7 @@ <developer> <name>Sylvain Letellier</name> <id>sletellier</id> - <email>letellier(a)codelutin.com</email> + <email>letellier at codelutin dot com</email> <organization>CodeLutin</organization> <timezone>+2</timezone> <roles> @@ -946,7 +946,6 @@ <contributor> <name>Manoel Fortun</name> - <email>mfortun(a)codelutin.com</email> <organization>CodeLutin</organization> <timezone>+2</timezone> <roles> @@ -1014,6 +1013,56 @@ <module>wikitty-lucene</module> </modules> </profile> + +  + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <version>${pluginPluginVersion}</version> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + <version>${coberturaPluginVersion}</version> + </plugin> + + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <reportSets> + <reportSet> + <reports> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependencies</report> + <report>dependency-convergence</report> + <report>plugin-management</report> + <report>plugins</report> + <report>dependency-management</report> + <report>summary</report> + </reports> + </reportSet> + </reportSets> + </plugin> + </plugins> + </reporting> + </profile> </profiles> <repositories> Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-05-26 12:19:55 UTC (rev 1475) +++ trunk/src/site/site_en.xml 2012-05-31 10:20:15 UTC (rev 1476) @@ -26,13 +26,35 @@ <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - <bannerLeft> <name>${project.name}</name> <href>index.html</href> </bannerLeft> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <googleSearch/> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + + <publishDate position="right" format="dd/MM/yyyy"/> + <version position="right"/> + <body> <breadcrumbs> @@ -40,6 +62,8 @@ </breadcrumbs> <links> + <item name="nuiton.org" href="http://www.nuiton.org"/> + <item name="CodeLutin" href="http://codelutin.com"/> <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> <item name="[fr" href="../index.html"/> @@ -69,5 +93,24 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-05-26 12:19:55 UTC (rev 1475) +++ trunk/src/site/site_fr.xml 2012-05-31 10:20:15 UTC (rev 1476) @@ -26,13 +26,35 @@ <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - <bannerLeft> <name>${project.name}</name> <href>index.html</href> </bannerLeft> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <googleSearch/> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + + <publishDate position="right" format="dd/MM/yyyy"/> + <version position="right"/> + <body> <breadcrumbs> @@ -40,6 +62,8 @@ </breadcrumbs> <links> + <item name="nuiton.org" href="http://www.nuiton.org"/> + <item name="CodeLutin" href="http://codelutin.com"/> <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> <item name="[fr" href="index.html"/> @@ -76,5 +100,24 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project> Modified: trunk/wikitty-api/src/site/site_en.xml =================================================================== --- trunk/wikitty-api/src/site/site_en.xml 2012-05-26 12:19:55 UTC (rev 1475) +++ trunk/wikitty-api/src/site/site_en.xml 2012-05-31 10:20:15 UTC (rev 1476) @@ -26,13 +26,35 @@ <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - <bannerLeft> <name>${project.name}</name> <href>index.html</href> </bannerLeft> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <googleSearch/> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + + <publishDate position="right" format="dd/MM/yyyy"/> + <version position="right"/> + <body> <menu ref="parent"/> @@ -42,6 +64,8 @@ </breadcrumbs> <links> + <item name="nuiton.org" href="http://www.nuiton.org"/> + <item name="CodeLutin" href="http://codelutin.com"/> <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> <item name="[fr" href="../index.html"/> @@ -54,6 +78,25 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project> \ No newline at end of file Modified: trunk/wikitty-api/src/site/site_fr.xml =================================================================== --- trunk/wikitty-api/src/site/site_fr.xml 2012-05-26 12:19:55 UTC (rev 1475) +++ trunk/wikitty-api/src/site/site_fr.xml 2012-05-31 10:20:15 UTC (rev 1476) @@ -26,13 +26,35 @@ <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - <bannerLeft> <name>${project.name}</name> <href>index.html</href> </bannerLeft> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <googleSearch/> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + + <publishDate position="right" format="dd/MM/yyyy"/> + <version position="right"/> + <body> <menu ref="parent"/> @@ -42,6 +64,8 @@ </breadcrumbs> <links> + <item name="nuiton.org" href="http://www.nuiton.org"/> + <item name="CodeLutin" href="http://codelutin.com"/> <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> <item name="[fr" href="index.html"/> @@ -54,6 +78,25 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project> \ No newline at end of file Modified: trunk/wikitty-generators/src/site/site_en.xml =================================================================== --- trunk/wikitty-generators/src/site/site_en.xml 2012-05-26 12:19:55 UTC (rev 1475) +++ trunk/wikitty-generators/src/site/site_en.xml 2012-05-31 10:20:15 UTC (rev 1476) @@ -26,13 +26,35 @@ <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - <bannerLeft> <name>${project.name}</name> <href>index.html</href> </bannerLeft> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <googleSearch/> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + + <publishDate position="right" format="dd/MM/yyyy"/> + <version position="right"/> + <body> <menu ref="parent"/> @@ -42,6 +64,8 @@ </breadcrumbs> <links> + <item name="nuiton.org" href="http://www.nuiton.org"/> + <item name="CodeLutin" href="http://codelutin.com"/> <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> <item name="[fr" href="../index.html"/> @@ -54,6 +78,25 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project> \ No newline at end of file Modified: trunk/wikitty-generators/src/site/site_fr.xml =================================================================== --- trunk/wikitty-generators/src/site/site_fr.xml 2012-05-26 12:19:55 UTC (rev 1475) +++ trunk/wikitty-generators/src/site/site_fr.xml 2012-05-31 10:20:15 UTC (rev 1476) @@ -26,13 +26,35 @@ <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - <bannerLeft> <name>${project.name}</name> <href>index.html</href> </bannerLeft> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <googleSearch/> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + + <publishDate position="right" format="dd/MM/yyyy"/> + <version position="right"/> + <body> <menu ref="parent"/> @@ -42,6 +64,8 @@ </breadcrumbs> <links> + <item name="nuiton.org" href="http://www.nuiton.org"/> + <item name="CodeLutin" href="http://codelutin.com"/> <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> <item name="[fr" href="index.html"/> @@ -54,6 +78,25 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project> \ No newline at end of file Modified: trunk/wikitty-hessian-client/src/site/site_en.xml =================================================================== --- trunk/wikitty-hessian-client/src/site/site_en.xml 2012-05-26 12:19:55 UTC (rev 1475) +++ trunk/wikitty-hessian-client/src/site/site_en.xml 2012-05-31 10:20:15 UTC (rev 1476) @@ -26,13 +26,35 @@ <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - <bannerLeft> <name>${project.name}</name> <href>index.html</href> </bannerLeft> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <googleSearch/> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + + <publishDate position="right" format="dd/MM/yyyy"/> + <version position="right"/> + <body> <menu ref="parent"/> @@ -42,6 +64,8 @@ </breadcrumbs> <links> + <item name="nuiton.org" href="http://www.nuiton.org"/> + <item name="CodeLutin" href="http://codelutin.com"/> <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> <item name="[fr" href="../index.html"/> @@ -54,6 +78,25 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project> \ No newline at end of file Modified: trunk/wikitty-hessian-client/src/site/site_fr.xml =================================================================== --- trunk/wikitty-hessian-client/src/site/site_fr.xml 2012-05-26 12:19:55 UTC (rev 1475) +++ trunk/wikitty-hessian-client/src/site/site_fr.xml 2012-05-31 10:20:15 UTC (rev 1476) @@ -26,13 +26,35 @@ <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - <bannerLeft> <name>${project.name}</name> <href>index.html</href> </bannerLeft> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <googleSearch/> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + + <publishDate position="right" format="dd/MM/yyyy"/> + <version position="right"/> + <body> <menu ref="parent"/> @@ -42,6 +64,8 @@ </breadcrumbs> <links> + <item name="nuiton.org" href="http://www.nuiton.org"/> + <item name="CodeLutin" href="http://codelutin.com"/> <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> <item name="[fr" href="index.html"/> @@ -54,6 +78,25 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project> \ No newline at end of file Modified: trunk/wikitty-jdbc/src/site/site_en.xml =================================================================== --- trunk/wikitty-jdbc/src/site/site_en.xml 2012-05-26 12:19:55 UTC (rev 1475) +++ trunk/wikitty-jdbc/src/site/site_en.xml 2012-05-31 10:20:15 UTC (rev 1476) @@ -26,13 +26,35 @@ <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - <bannerLeft> <name>${project.name}</name> <href>index.html</href> </bannerLeft> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <googleSearch/> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + + <publishDate position="right" format="dd/MM/yyyy"/> + <version position="right"/> + <body> <menu ref="parent"/> @@ -42,6 +64,8 @@ </breadcrumbs> <links> + <item name="nuiton.org" href="http://www.nuiton.org"/> + <item name="CodeLutin" href="http://codelutin.com"/> <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> <item name="[fr" href="../index.html"/> @@ -54,6 +78,25 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project> \ No newline at end of file Modified: trunk/wikitty-jdbc/src/site/site_fr.xml =================================================================== --- trunk/wikitty-jdbc/src/site/site_fr.xml 2012-05-26 12:19:55 UTC (rev 1475) +++ trunk/wikitty-jdbc/src/site/site_fr.xml 2012-05-31 10:20:15 UTC (rev 1476) @@ -26,13 +26,35 @@ <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - <bannerLeft> <name>${project.name}</name> <href>index.html</href> </bannerLeft> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <googleSearch/> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + + <publishDate position="right" format="dd/MM/yyyy"/> + <version position="right"/> + <body> <menu ref="parent"/> @@ -42,6 +64,8 @@ </breadcrumbs> <links> + <item name="nuiton.org" href="http://www.nuiton.org"/> + <item name="CodeLutin" href="http://codelutin.com"/> <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> <item name="[fr" href="index.html"/> @@ -54,6 +78,25 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project> \ No newline at end of file Modified: trunk/wikitty-lucene/pom.xml =================================================================== --- trunk/wikitty-lucene/pom.xml 2012-05-26 12:19:55 UTC (rev 1475) +++ trunk/wikitty-lucene/pom.xml 2012-05-31 10:20:15 UTC (rev 1476) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.5-SNAPSHOT</version> + <version>3.7-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-publication/pom.xml =================================================================== --- trunk/wikitty-publication/pom.xml 2012-05-26 12:19:55 UTC (rev 1475) +++ trunk/wikitty-publication/pom.xml 2012-05-31 10:20:15 UTC (rev 1476) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.5-SNAPSHOT</version> + <version>3.7-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-solr/src/site/site_en.xml =================================================================== --- trunk/wikitty-solr/src/site/site_en.xml 2012-05-26 12:19:55 UTC (rev 1475) +++ trunk/wikitty-solr/src/site/site_en.xml 2012-05-31 10:20:15 UTC (rev 1476) @@ -26,13 +26,35 @@ <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - <bannerLeft> <name>${project.name}</name> <href>index.html</href> </bannerLeft> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <googleSearch/> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + + <publishDate position="right" format="dd/MM/yyyy"/> + <version position="right"/> + <body> <menu ref="parent"/> @@ -42,6 +64,8 @@ </breadcrumbs> <links> + <item name="nuiton.org" href="http://www.nuiton.org"/> + <item name="CodeLutin" href="http://codelutin.com"/> <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> <item name="[fr" href="../index.html"/> @@ -54,6 +78,25 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project> \ No newline at end of file Modified: trunk/wikitty-solr/src/site/site_fr.xml =================================================================== --- trunk/wikitty-solr/src/site/site_fr.xml 2012-05-26 12:19:55 UTC (rev 1475) +++ trunk/wikitty-solr/src/site/site_fr.xml 2012-05-31 10:20:15 UTC (rev 1476) @@ -26,13 +26,35 @@ <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - <bannerLeft> <name>${project.name}</name> <href>index.html</href> </bannerLeft> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <googleSearch/> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + + <publishDate position="right" format="dd/MM/yyyy"/> + <version position="right"/> + <body> <menu ref="parent"/> @@ -42,6 +64,8 @@ </breadcrumbs> <links> + <item name="nuiton.org" href="http://www.nuiton.org"/> + <item name="CodeLutin" href="http://codelutin.com"/> <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> <item name="[fr" href="index.html"/> @@ -54,6 +78,25 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project> \ No newline at end of file Modified: trunk/wp-maven-plugin/src/site/site_en.xml =================================================================== --- trunk/wp-maven-plugin/src/site/site_en.xml 2012-05-26 12:19:55 UTC (rev 1475) +++ trunk/wp-maven-plugin/src/site/site_en.xml 2012-05-31 10:20:15 UTC (rev 1476) @@ -31,8 +31,34 @@ <name>${project.name}</name> </bannerLeft> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <googleSearch/> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + + <publishDate position="right" format="dd/MM/yyyy"/> + <version position="right"/> + <body> <links> + <item name="nuiton.org" href="http://www.nuiton.org"/> + <item name="CodeLutin" href="http://codelutin.com"/> <item name="[fr" href="fr/index.html"/> <item name="en]" href="index.html"/> </links> @@ -60,5 +86,24 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project> Modified: trunk/wp-maven-plugin/src/site/site_fr.xml =================================================================== --- trunk/wp-maven-plugin/src/site/site_fr.xml 2012-05-26 12:19:55 UTC (rev 1475) +++ trunk/wp-maven-plugin/src/site/site_fr.xml 2012-05-31 10:20:15 UTC (rev 1476) @@ -31,8 +31,34 @@ <name>${project.name}</name> </bannerLeft> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <googleSearch/> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + + <publishDate position="right" format="dd/MM/yyyy"/> + <version position="right"/> + <body> <links> + <item name="nuiton.org" href="http://www.nuiton.org"/> + <item name="CodeLutin" href="http://codelutin.com"/> <item name="[fr" href="index.html"/> <item name="en]" href="../index.html"/> </links> @@ -60,5 +86,24 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project>

1 0

r1475 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query
by bpoussin＠users.nuiton.org 26 May '12

26 May '12

Author: bpoussin Date: 2012-05-26 14:19:55 +0200 (Sat, 26 May 2012) New Revision: 1475 Url: http://nuiton.org/repositories/revision/wikitty/1475 Log: Evolution #2105: Add parse method to WikittyQueryMaker Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryMaker.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryMaker.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryMaker.java 2012-05-23 21:46:05 UTC (rev 1474) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryMaker.java 2012-05-26 12:19:55 UTC (rev 1475) @@ -29,6 +29,7 @@ import java.util.Deque; import java.util.LinkedList; import java.util.List; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.wikitty.WikittyException; @@ -232,6 +233,25 @@ } /** + * Parse et ajoute un bout de requete. Cette requete est prise comme une + * condition terminal si l'on veut continuer a construire la requete, il + * faut avoir ajouter avant une + * {@link #and()}, {@link #or()}, {@link #not()}, {@link #in()} + * @param query la requete a ajouter (peut-etre vide ou nul, dans ce cas, la + * condition utiliser est "true") + * @return {@code this} with the {@code c} restriction added. + */ + public WikittyQueryMaker parse(String query) { + if (StringUtils.isNotBlank(query)) { + WikittyQuery filter = WikittyQueryParser.parse(query); + addCondition(filter.getCondition(), true); + } else { + addCondition(new True()); + } + return this; + } + + /** * Ajoute une contrainte qui cree les conditions en prenant comme exemple * l'objet passer en parametre. Seuls les champs non null sont utilises ainsi * que la liste des extensions de l'objet

1 0

r1474 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org 23 May '12

23 May '12

Author: bpoussin Date: 2012-05-23 23:46:05 +0200 (Wed, 23 May 2012) New Revision: 1474 Url: http://nuiton.org/repositories/revision/wikitty/1474 Log: Si pas de condition on restraint tout de meme en en creant une nouvelle Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java 2012-04-20 00:58:23 UTC (rev 1473) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java 2012-05-23 21:46:05 UTC (rev 1474) @@ -754,7 +754,10 @@ // du coup, pour ne pas modifier le critere qui vient en parametre // il faut creer un nouveau critere ... WikittyQuery serviceQuery = null; - if (criteria != null) { + if (criteria == null) { + serviceQuery = new WikittyQueryMaker() + .extContainsAll(extensions).end(); + } else { serviceQuery = criteria.copy(); WikittyQueryMaker queryMaker; if (serviceQuery.getCondition() instanceof Select) {

1 0

r1473 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities
by bpoussin＠users.nuiton.org 20 Apr '12

20 Apr '12

Author: bpoussin Date: 2012-04-20 02:58:23 +0200 (Fri, 20 Apr 2012) New Revision: 1473 Url: http://nuiton.org/repositories/revision/wikitty/1473 Log: add support to array as valide argument to set a collection attribute Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldType.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldType.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldType.java 2012-04-06 15:17:07 UTC (rev 1472) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldType.java 2012-04-20 00:58:23 UTC (rev 1473) @@ -34,6 +34,8 @@ import java.util.Map; import java.util.Set; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.generator.WikittyTagValue; @@ -48,6 +50,9 @@ */ public class FieldType implements WikittyTagValue, Serializable { + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(FieldType.class); + /** serialVersionUID. */ private static final long serialVersionUID = -4375308750387837026L; @@ -162,8 +167,8 @@ if (value == null) { result = null; } else if (isCollection()) { - if ( !(value instanceof Collection) ) { - throw new WikittyException( "A collection is expected for type " + if ( !(value instanceof Collection || value.getClass().isArray()) ) { + throw new WikittyException( "A collection or array is expected for type " + type.name() + "[" + lowerBound + " - " + upperBound + "]" ); } Collection<Object> col; @@ -174,8 +179,15 @@ } // copy all value in new collections - for ( Object o : (Collection<?>) value ) { - col.add( getContainedValidObject(o) ); + if (value instanceof Collection) { + for ( Object o : (Collection<?>) value ) { + col.add( getContainedValidObject(o) ); + } + } else { + // is Array + for ( Object o : (Object[]) value ) { + col.add( getContainedValidObject(o) ); + } } result = col; @@ -199,7 +211,23 @@ * @return true if value is valid */ public boolean isValidValue(Object value) { - return getValidValue(value) != null; + boolean result; + if (value == null && isNotNull()) { + result = false; + } else { + try { + getValidValue(value); + // no exception value is valid + result = true; + } catch (Exception eee) { + if (log.isDebugEnabled()) { + log.debug("Can't convert value, value is not valid, return false", eee); + } + // exception value is not valid + result = false; + } + } + return result; } public WikittyTypes getType() { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java 2012-04-06 15:17:07 UTC (rev 1472) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java 2012-04-20 00:58:23 UTC (rev 1473) @@ -591,9 +591,17 @@ // we put it, in preload map if (value != null && fieldType.getType() == WikittyTypes.WIKITTY) { if (fieldType.isCollection()) { - for ( Object o : (Collection<?>) value ) { - Wikitty w = WikittyUtil.getWikitty(o); - addPreloaded(w); + if (value instanceof Collection) { + for ( Object o : (Collection<?>) value ) { + Wikitty w = WikittyUtil.getWikitty(o); + addPreloaded(w); + } + } else { + // Array + for ( Object o : (Object[]) value ) { + Wikitty w = WikittyUtil.getWikitty(o); + addPreloaded(w); + } } } else { Wikitty w = WikittyUtil.getWikitty(value);

1 0

r1472 - in trunk: . wikitty-api wikitty-dto wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc wikitty-perf-test wikitty-solr wikitty-struts
by maven-release＠users.nuiton.org 06 Apr '12

06 Apr '12

Author: maven-release Date: 2012-04-06 17:17:07 +0200 (Fri, 06 Apr 2012) New Revision: 1472 Url: http://nuiton.org/repositories/revision/wikitty/1472 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-dto/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc/pom.xml trunk/wikitty-perf-test/pom.xml trunk/wikitty-solr/pom.xml trunk/wikitty-struts/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-06 15:17:05 UTC (rev 1471) +++ trunk/pom.xml 2012-04-06 15:17:07 UTC (rev 1472) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.6</version> + <version>3.7-SNAPSHOT</version> <modules> @@ -802,10 +802,10 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.6</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.6 + <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/tags/wikitty-3.6</url> + <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> </scm> <distributionManagement> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2012-04-06 15:17:05 UTC (rev 1471) +++ trunk/wikitty-api/pom.xml 2012-04-06 15:17:07 UTC (rev 1472) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.6</version> + <version>3.7-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2012-04-06 15:17:05 UTC (rev 1471) +++ trunk/wikitty-dto/pom.xml 2012-04-06 15:17:07 UTC (rev 1472) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.6</version> + <version>3.7-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2012-04-06 15:17:05 UTC (rev 1471) +++ trunk/wikitty-generators/pom.xml 2012-04-06 15:17:07 UTC (rev 1472) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.6</version> + <version>3.7-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2012-04-06 15:17:05 UTC (rev 1471) +++ trunk/wikitty-hessian-client/pom.xml 2012-04-06 15:17:07 UTC (rev 1472) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.6</version> + <version>3.7-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2012-04-06 15:17:05 UTC (rev 1471) +++ trunk/wikitty-hessian-server/pom.xml 2012-04-06 15:17:07 UTC (rev 1472) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.6</version> + <version>3.7-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2012-04-06 15:17:05 UTC (rev 1471) +++ trunk/wikitty-jdbc/pom.xml 2012-04-06 15:17:07 UTC (rev 1472) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.6</version> + <version>3.7-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2012-04-06 15:17:05 UTC (rev 1471) +++ trunk/wikitty-perf-test/pom.xml 2012-04-06 15:17:07 UTC (rev 1472) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.6</version> + <version>3.7-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2012-04-06 15:17:05 UTC (rev 1471) +++ trunk/wikitty-solr/pom.xml 2012-04-06 15:17:07 UTC (rev 1472) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.6</version> + <version>3.7-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-struts/pom.xml =================================================================== --- trunk/wikitty-struts/pom.xml 2012-04-06 15:17:05 UTC (rev 1471) +++ trunk/wikitty-struts/pom.xml 2012-04-06 15:17:07 UTC (rev 1472) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.6</version> + <version>3.7-SNAPSHOT</version> </parent>

1 0

r1471 - in tags: . wikitty-3.6
by maven-release＠users.nuiton.org 06 Apr '12

06 Apr '12

Author: maven-release Date: 2012-04-06 17:17:05 +0200 (Fri, 06 Apr 2012) New Revision: 1471 Url: http://nuiton.org/repositories/revision/wikitty/1471 Log: [maven-release-plugin] copy for tag wikitty-3.6 Added: tags/wikitty-3.6/ Property changes on: tags/wikitty-3.6 ___________________________________________________________________ Added: svn:ignore + .settings .project target *.iml *.ipr *.iws Added: svn:mergeinfo + /branches/2.0-eugene2:164-179

1 0

r1470 - in trunk: . wikitty-api wikitty-dto wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc wikitty-perf-test wikitty-solr wikitty-struts
by maven-release＠users.nuiton.org 06 Apr '12

06 Apr '12

Author: maven-release Date: 2012-04-06 17:17:03 +0200 (Fri, 06 Apr 2012) New Revision: 1470 Url: http://nuiton.org/repositories/revision/wikitty/1470 Log: [maven-release-plugin] prepare release wikitty-3.6 Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-dto/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc/pom.xml trunk/wikitty-perf-test/pom.xml trunk/wikitty-solr/pom.xml trunk/wikitty-struts/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-06 15:00:42 UTC (rev 1469) +++ trunk/pom.xml 2012-04-06 15:17:03 UTC (rev 1470) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.6-SNAPSHOT</version> + <version>3.6</version> <modules> @@ -802,10 +802,10 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk + <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.6</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.6 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> + <url>http://www.nuiton.org/repositories/browse/wikitty/tags/wikitty-3.6</url> </scm> <distributionManagement> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2012-04-06 15:00:42 UTC (rev 1469) +++ trunk/wikitty-api/pom.xml 2012-04-06 15:17:03 UTC (rev 1470) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.6-SNAPSHOT</version> + <version>3.6</version> </parent>  Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2012-04-06 15:00:42 UTC (rev 1469) +++ trunk/wikitty-dto/pom.xml 2012-04-06 15:17:03 UTC (rev 1470) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.6-SNAPSHOT</version> + <version>3.6</version> </parent>  Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2012-04-06 15:00:42 UTC (rev 1469) +++ trunk/wikitty-generators/pom.xml 2012-04-06 15:17:03 UTC (rev 1470) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.6-SNAPSHOT</version> + <version>3.6</version> </parent>  Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2012-04-06 15:00:42 UTC (rev 1469) +++ trunk/wikitty-hessian-client/pom.xml 2012-04-06 15:17:03 UTC (rev 1470) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.6-SNAPSHOT</version> + <version>3.6</version> </parent>  Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2012-04-06 15:00:42 UTC (rev 1469) +++ trunk/wikitty-hessian-server/pom.xml 2012-04-06 15:17:03 UTC (rev 1470) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.6-SNAPSHOT</version> + <version>3.6</version> </parent>  Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2012-04-06 15:00:42 UTC (rev 1469) +++ trunk/wikitty-jdbc/pom.xml 2012-04-06 15:17:03 UTC (rev 1470) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.6-SNAPSHOT</version> + <version>3.6</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2012-04-06 15:00:42 UTC (rev 1469) +++ trunk/wikitty-perf-test/pom.xml 2012-04-06 15:17:03 UTC (rev 1470) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.6-SNAPSHOT</version> + <version>3.6</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2012-04-06 15:00:42 UTC (rev 1469) +++ trunk/wikitty-solr/pom.xml 2012-04-06 15:17:03 UTC (rev 1470) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.6-SNAPSHOT</version> + <version>3.6</version> </parent>  Modified: trunk/wikitty-struts/pom.xml =================================================================== --- trunk/wikitty-struts/pom.xml 2012-04-06 15:00:42 UTC (rev 1469) +++ trunk/wikitty-struts/pom.xml 2012-04-06 15:17:03 UTC (rev 1470) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.6-SNAPSHOT</version> + <version>3.6</version> </parent>

1 0

r1469 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities
by bpoussin＠users.nuiton.org 06 Apr '12

06 Apr '12

Author: bpoussin Date: 2012-04-06 17:00:42 +0200 (Fri, 06 Apr 2012) New Revision: 1469 Url: http://nuiton.org/repositories/revision/wikitty/1469 Log: au lieu de retourner faux, retourne vrai pour l'instant si on a une contrainte allowed non verifier, et un message de warn est affiche a la place Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldTypeConstaintChecker.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldTypeConstaintChecker.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldTypeConstaintChecker.java 2012-04-06 10:00:12 UTC (rev 1468) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldTypeConstaintChecker.java 2012-04-06 15:00:42 UTC (rev 1469) @@ -35,6 +35,7 @@ import java.util.Set; import java.util.regex.Pattern; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections.ListUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.wikitty.WikittyClient; @@ -202,11 +203,10 @@ */ protected boolean isAllowedWikitty(String fqfield, FieldType field, Collection<String> ids, Collection<String> errors) { - boolean result = false; - if (CollectionUtils.isEmpty(ids)) { - // si la liste est vide, alors on sait que la valeur est autorisee - result = true; - } else { + boolean result = true; + // par defaut s'il n'y a rien a verifier le resultat est vrai + if (!CollectionUtils.isEmpty(ids)) { + // creation de la requete qui ramene tous les ids d'objets autorisé WikittyQuery q = null; if (field.hasAllowedQuery()) { // construire les requetes @@ -220,43 +220,89 @@ q = maker.end(); } - List<String> allowed = null; + List<String> unallowed = null; + // si il y a une requete qui contraint ... if (q != null) { - q.setOffset(0); - q.setLimit(WikittyQuery.MAX); + // ... on lui ajoute la liste des ids qu'a le champs comme valeur + // et le resultat doit etre identique a cette liste. + // sinon cela veut dire que certain id du champs ne sont pas + // dans les valeurs acceptables + WikittyQuery checkQuery = new WikittyQueryMaker().and() + .condition(q.getCondition()) + .containsOne(Element.ID, ids).end() + .setOffset(0).setLimit(WikittyQuery.MAX); + WikittyQueryResult<String> queryResult = + ws.findAllByQuery(token, Collections.singletonList(checkQuery)).get(0); + List<String> idResult = queryResult.getAll(); - WikittyQuery wq = new WikittyQueryMaker().containsOne(Element.ID, ids).end(); - wq.setOffset(0); - wq.setLimit(WikittyQuery.MAX); - - List<WikittyQueryResult<String>> queryResult = - ws.findAllByQuery(token, Arrays.asList(q, wq)); - allowed = queryResult.get(0).getAll(); - List<String> findedIds = queryResult.get(1).getAll(); - - // on ne check que sur les ids trouve dans la base et on espere - // que les autres sont bon :). En fait, lorsqu'on store plusieurs - // wikitties en meme temps donc un wikitty qui doit etre la valeur - // d'un champs d'un autre. Celui ci n'est pas retrouvable dans la - // base et donc on ne peut pas verifier facilement la contrainte. - // Pour l'instant on ne fait rien, car les solutions seraient trop - // couteuse (creeer un storage in memory y mettre les objets a - // checker, faire le check en requetant le vrai repo et le in memory - // si tout va bien faire le store reel sur le vrai repo. - result = allowed.containsAll(findedIds); - if (log.isDebugEnabled() && findedIds.size() != ids.size()) { + result = idResult.size() == ids.size(); + if (!result) { + unallowed = ListUtils.removeAll(ids, idResult); + } + if (log.isDebugEnabled() && !result) { log.debug(String.format( - "For field '%s' allowed contraint not checked for: %s", - fqfield, CollectionUtils.disjunction(findedIds, ids))); + "For field '%s' allowed contraint not checked for: %s (ids=%s, idResult=%s)(request=%s)", + fqfield, unallowed, ids, idResult, queryResult.getQueryString())); } + } + +// List<String> allowed = null; +// if (q != null) { +// q.setOffset(0); +// q.setLimit(WikittyQuery.MAX); +// +// WikittyQuery wq = new WikittyQueryMaker().containsOne(Element.ID, ids).end(); +// wq.setOffset(0); +// wq.setLimit(WikittyQuery.MAX); +// +// List<WikittyQueryResult<String>> queryResult = +// ws.findAllByQuery(token, Arrays.asList(q, wq)); +// allowed = queryResult.get(0).getAll(); +// List<String> findedIds = queryResult.get(1).getAll(); +// +// // on ne check que sur les ids trouve dans la base et on espere +// // que les autres sont bon :). En fait, lorsqu'on store plusieurs +// // wikitties en meme temps donc un wikitty qui doit etre la valeur +// // d'un champs d'un autre. Celui ci n'est pas retrouvable dans la +// // base et donc on ne peut pas verifier facilement la contrainte. +// // Pour l'instant on ne fait rien, car les solutions seraient trop +// // couteuse (creeer un storage in memory y mettre les objets a +// // checker, faire le check en requetant le vrai repo et le in memory +// // si tout va bien faire le store reel sur le vrai repo. +// result = allowed.containsAll(findedIds); +// if (log.isDebugEnabled() && findedIds.size() != ids.size()) { +// log.debug(String.format( +// "For field '%s' allowed contraint not checked for: %s", +// fqfield, CollectionUtils.disjunction(findedIds, ids))); +// } +// } + if (errors != null && !result) { errors.add(String.format( - "Field '%s' contains unallowed Wikitty values %s allowed %s", - fqfield, ids, allowed)); + "Field '%s' contains unallowed Wikitty values %s", + fqfield, unallowed)); } + + + // FIXME poussin 20120406: on ne peut pas garantir cette contrainte + // actuellement car l'objet qui est mis dan le champs a checker peut + // aussi etre un objet en cours de stockage. Donc pour l'instant on ne + // leve pas d'erreur, mais on mes un warn dans les logs. + // + // Une solution serait de creeer un storage in memory y mettre les + // objets a checker, faire le check en requetant le vrai repo et sur + // les ids en erreur refaire la meme requete sur le in memory + if (!result) { + result = true; + log.warn(String.format( + "Field '%s' contains unallowed Wikitty values %s", + fqfield, unallowed)); + } + // FIN du FIXME } + return result; }

1 0

r1468 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities
by bpoussin＠users.nuiton.org 06 Apr '12

06 Apr '12

Author: bpoussin Date: 2012-04-06 12:00:12 +0200 (Fri, 06 Apr 2012) New Revision: 1468 Url: http://nuiton.org/repositories/revision/wikitty/1468 Log: optimisation in isAllowedWikitty, if collection is empty don't do search, juste return true Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldTypeConstaintChecker.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldTypeConstaintChecker.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldTypeConstaintChecker.java 2012-04-06 09:47:10 UTC (rev 1467) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldTypeConstaintChecker.java 2012-04-06 10:00:12 UTC (rev 1468) @@ -203,55 +203,59 @@ protected boolean isAllowedWikitty(String fqfield, FieldType field, Collection<String> ids, Collection<String> errors) { boolean result = false; + if (CollectionUtils.isEmpty(ids)) { + // si la liste est vide, alors on sait que la valeur est autorisee + result = true; + } else { + WikittyQuery q = null; + if (field.hasAllowedQuery()) { + // construire les requetes + q = WikittyQueryParser.parse(field.getAllowedQuery()); - WikittyQuery q = null; - if (field.hasAllowedQuery()) { - // construire les requetes - q = WikittyQueryParser.parse(field.getAllowedQuery()); - - } else if (field.hasAllowed()) { - WikittyQueryMaker maker = new WikittyQueryMaker().or(); - for (String extName : field.getAllowedAsList()) { - maker.exteq(extName); + } else if (field.hasAllowed()) { + WikittyQueryMaker maker = new WikittyQueryMaker().or(); + for (String extName : field.getAllowedAsList()) { + maker.exteq(extName); + } + q = maker.end(); } - q = maker.end(); - } - List<String> allowed = null; - if (q != null) { - q.setOffset(0); - q.setLimit(WikittyQuery.MAX); + List<String> allowed = null; + if (q != null) { + q.setOffset(0); + q.setLimit(WikittyQuery.MAX); - WikittyQuery wq = new WikittyQueryMaker().containsOne(Element.ID, ids).end(); - wq.setOffset(0); - wq.setLimit(WikittyQuery.MAX); + WikittyQuery wq = new WikittyQueryMaker().containsOne(Element.ID, ids).end(); + wq.setOffset(0); + wq.setLimit(WikittyQuery.MAX); - List<WikittyQueryResult<String>> queryResult = - ws.findAllByQuery(token, Arrays.asList(q, wq)); - allowed = queryResult.get(0).getAll(); - List<String> findedIds = queryResult.get(1).getAll(); + List<WikittyQueryResult<String>> queryResult = + ws.findAllByQuery(token, Arrays.asList(q, wq)); + allowed = queryResult.get(0).getAll(); + List<String> findedIds = queryResult.get(1).getAll(); - // on ne check que sur les ids trouve dans la base et on espere - // que les autres sont bon :). En fait, lorsqu'on store plusieurs - // wikitties en meme temps donc un wikitty qui doit etre la valeur - // d'un champs d'un autre. Celui ci n'est pas retrouvable dans la - // base et donc on ne peut pas verifier facilement la contrainte. - // Pour l'instant on ne fait rien, car les solutions seraient trop - // couteuse (creeer un storage in memory y mettre les objets a - // checker, faire le check en requetant le vrai repo et le in memory - // si tout va bien faire le store reel sur le vrai repo. - result = allowed.containsAll(findedIds); - if (log.isDebugEnabled() && findedIds.size() != ids.size()) { - log.debug(String.format( - "For field '%s' allowed contraint not checked for: %s", - fqfield, CollectionUtils.disjunction(findedIds, ids))); + // on ne check que sur les ids trouve dans la base et on espere + // que les autres sont bon :). En fait, lorsqu'on store plusieurs + // wikitties en meme temps donc un wikitty qui doit etre la valeur + // d'un champs d'un autre. Celui ci n'est pas retrouvable dans la + // base et donc on ne peut pas verifier facilement la contrainte. + // Pour l'instant on ne fait rien, car les solutions seraient trop + // couteuse (creeer un storage in memory y mettre les objets a + // checker, faire le check en requetant le vrai repo et le in memory + // si tout va bien faire le store reel sur le vrai repo. + result = allowed.containsAll(findedIds); + if (log.isDebugEnabled() && findedIds.size() != ids.size()) { + log.debug(String.format( + "For field '%s' allowed contraint not checked for: %s", + fqfield, CollectionUtils.disjunction(findedIds, ids))); + } } - } - if (errors != null && !result) { - errors.add(String.format( - "Field '%s' contains unallowed Wikitty values %s allowed %s", - fqfield, ids, allowed)); + if (errors != null && !result) { + errors.add(String.format( + "Field '%s' contains unallowed Wikitty values %s allowed %s", + fqfield, ids, allowed)); + } } return result; }

1 0

r1467 - trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr
by bpoussin＠users.nuiton.org 06 Apr '12

06 Apr '12

Author: bpoussin Date: 2012-04-06 11:47:10 +0200 (Fri, 06 Apr 2012) New Revision: 1467 Url: http://nuiton.org/repositories/revision/wikitty/1467 Log: Anomalie fix #2053 Error when we try to search containsAll or containsOne with empty collection Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java 2012-04-05 16:11:56 UTC (rev 1466) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java 2012-04-06 09:47:10 UTC (rev 1467) @@ -318,17 +318,21 @@ @Override public boolean visitEnter(ContainsAll o) { - String element2solr = element2solr(o.getElement()); + List<String> values = evalConditionValueAsList(o.getValues()); + if (values.size() == 0) { + solrQuery += "( *:* - *:* )"; // false / rien + } else { + String element2solr = element2solr(o.getElement()); - solrQuery += element2solr + ":("; + solrQuery += element2solr + ":("; - String sep = ""; - for(String e : evalConditionValueAsList(o.getValues())) { - solrQuery += sep + fixSolrBug(element2solr, e); - sep = " AND "; + String sep = ""; + for(String e : values) { + solrQuery += sep + fixSolrBug(element2solr, e); + sep = " AND "; + } + solrQuery += ")"; } - solrQuery += ")"; - return false; } @@ -345,15 +349,20 @@ @Override public boolean visitEnter(ContainsOne o) { - String element2solr = element2solr(o.getElement()); - - solrQuery += element2solr + ":("; - String sep = ""; - for(String e : evalConditionValueAsList(o.getValues())) { - solrQuery += sep + fixSolrBug(element2solr, e); - sep = " OR "; + List<String> values = evalConditionValueAsList(o.getValues()); + if (values.size() == 0) { + solrQuery += "( *:* - *:* )"; // false / rien + } else { + String element2solr = element2solr(o.getElement()); + + solrQuery += element2solr + ":("; + String sep = ""; + for(String e : values) { + solrQuery += sep + fixSolrBug(element2solr, e); + sep = " OR "; + } + solrQuery += ")"; } - solrQuery += ")"; return false; }

1 0