Author: tchemit Date: 2012-05-28 15:37:38 +0200 (Mon, 28 May 2012) New Revision: 3391 Url: http://chorem.org/repositories/revision/pollen/3391 Log: use depedencies Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/PollenServletActionRedirectResult.java trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties trunk/pom.xml trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-05-28 13:36:48 UTC (rev 3390) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-05-28 13:37:38 UTC (rev 3391) @@ -29,6 +29,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; +import com.opensymphony.xwork2.inject.Inject; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -85,10 +86,11 @@ private List<PollResult> results; -// private List<PollResult> ranking; - private List<PollResult> topRanking; + @Inject(required = true) + private UrlHelper urlHelper; + @Override public PageSkin getSkin() { return PageSkin.RESULT; @@ -320,7 +322,7 @@ params.put("values", getChoices()); - UrlHelper.buildParametersString(params, url, "&"); + urlHelper.buildParametersString(params, url, "&"); String chartUrl = url.toString(); return chartUrl; @@ -346,7 +348,7 @@ params.put("values", choicesResults.get(choiceName)); params.put("subtitles", subtitles.get(choiceName)); - UrlHelper.buildParametersString(params, url, "&"); + urlHelper.buildParametersString(params, url, "&"); String chartUrl = url.toString(); return chartUrl; Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/PollenServletActionRedirectResult.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/PollenServletActionRedirectResult.java 2012-05-28 13:36:48 UTC (rev 3390) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/PollenServletActionRedirectResult.java 2012-05-28 13:37:38 UTC (rev 3391) @@ -47,6 +47,7 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.config.entities.ResultConfig; +import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.logging.Logger; import com.opensymphony.xwork2.util.logging.LoggerFactory; import org.apache.struts2.ServletActionContext; @@ -72,6 +73,9 @@ private static final Logger LOG = LoggerFactory.getLogger(PollenServletActionRedirectResult.class); + @Inject(value = "struts", required = true) + private UrlHelper urlHelper; + /** * Redirects to the location specified by calling * {@link HttpServletResponse#sendRedirect(String)}. @@ -121,7 +125,7 @@ } StringBuilder tmpLocation = new StringBuilder(finalLocation); - UrlHelper.buildParametersString(requestParameters, tmpLocation, "&"); + urlHelper.buildParametersString(requestParameters, tmpLocation, "&"); // add the anchor if (anchor != null) { Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-05-28 13:36:48 UTC (rev 3390) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-05-28 13:37:38 UTC (rev 3391) @@ -66,7 +66,9 @@ pollen.common.commentText=Comment pollen.common.comments=Comments about this poll pollen.common.csvImport=CSV import +pollen.common.datePattern= pollen.common.datePickerPattern=mm/dd/yy +pollen.common.dateTimePattern= pollen.common.description=Description pollen.common.displayType-group=Results by groups pollen.common.displayType-normal=Results Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-05-28 13:36:48 UTC (rev 3390) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-05-28 13:37:38 UTC (rev 3391) @@ -66,7 +66,9 @@ pollen.common.commentText=Commentaire pollen.common.comments=Commentaire à propos du sondage pollen.common.csvImport=Import CSV +pollen.common.datePattern= pollen.common.datePickerPattern=dd/mm/yy +pollen.common.dateTimePattern= pollen.common.description=Description pollen.common.displayType-group=Résultats par groupes pollen.common.displayType-normal=Résultats Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-28 13:36:48 UTC (rev 3390) +++ trunk/pom.xml 2012-05-28 13:37:38 UTC (rev 3391) @@ -176,16 +176,16 @@ <projectId>pollen</projectId> <!-- customized versions --> - <topiaVersion>2.6.9</topiaVersion> + <topiaVersion>2.6.10</topiaVersion> <eugenePluginVersion>2.4.2</eugenePluginVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonWebVersion>1.11</nuitonWebVersion> <nuitonUtilsVersion>2.4.8</nuitonUtilsVersion> - <h2Version>1.3.166</h2Version> + <h2Version>1.3.167</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> - <struts2Version>2.3.1.2</struts2Version> - <jqueryPluginVersion>3.3.0</jqueryPluginVersion> + <struts2Version>2.3.4</struts2Version> + <jqueryPluginVersion>3.3.1</jqueryPluginVersion> <shiroVersion>1.2.0</shiroVersion> <slf4jVersion>1.6.4</slf4jVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-05-28 13:36:48 UTC (rev 3390) +++ trunk/src/site/site_en.xml 2012-05-28 13:37:38 UTC (rev 3391) @@ -26,7 +26,7 @@ <project name="${project.name}"> <bannerLeft> - <src alt="Pollen">logo.jpg</src> + <src alt="Pollen">${project.url}/logo.jpg</src> <name>${project.name}</name> <href>index.html</href> </bannerLeft> @@ -117,7 +117,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.url}' + scm='${project.scm.connection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-05-28 13:36:48 UTC (rev 3390) +++ trunk/src/site/site_fr.xml 2012-05-28 13:37:38 UTC (rev 3391) @@ -26,7 +26,7 @@ <project name="${project.name}"> <bannerLeft> - <src alt="Pollen">logo.jpg</src> + <src alt="Pollen">${project.url}/logo.jpg</src> <name>${project.name}</name> <href>index.html</href> </bannerLeft> @@ -57,23 +57,23 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="images/logos/maven-feather.png"/> + img="${project.url}/images/logos/maven-feather.png"/> <logo href="http://struts.apache.org/" name="Struts 2" - img="images/logos/struts2-logo.png"/> + img="${project.url}/images/logos/struts2-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="images/logos/restructuredtext-logo.png"/> + img="${project.url}/images/logos/restructuredtext-logo.png"/> <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="images/logos/jrst-logo.png"/> + img="${project.url}/images/logos/jrst-logo.png"/> <logo href="http://maven-site.nuiton.org/topia" name="ToPIA" - img="images/logos/topia-logo.png"/> + img="${project.url}/images/logos/topia-logo.png"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="images/logos/argouml-logo.png"/> + img="${project.url}/images/logos/argouml-logo.png"/> </poweredBy> <body> @@ -118,7 +118,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.url}' + scm='${project.scm.connection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}'