Author: tchemit Date: 2011-03-09 14:29:17 +0100 (Wed, 09 Mar 2011) New Revision: 231 Url: http://chorem.org/repositories/revision/bow/231 Log: Evolution #317: Updates to struts2 2.2.1.1 (remove all stuff related to oensymphony project) Add i18n keys Modified: trunk/bow-ui/pom.xml trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties trunk/pom.xml Modified: trunk/bow-ui/pom.xml =================================================================== --- trunk/bow-ui/pom.xml 2011-03-09 13:01:46 UTC (rev 230) +++ trunk/bow-ui/pom.xml 2011-03-09 13:29:17 UTC (rev 231) @@ -25,7 +25,8 @@ <i18n.bundles>fr_FR,en_GB</i18n.bundles> <i18n.silent>true</i18n.silent> <i18n.bundleOutputName>bow-i18n</i18n.bundleOutputName> - <i18n.bundleOutputDir>${basedir}/target/generated-sources/resources + <i18n.bundleOutputDir> + ${basedir}/target/generated-sources/resources </i18n.bundleOutputDir> <i18n.addBundleOuputDirParent>false</i18n.addBundleOuputDirParent> </properties> @@ -55,7 +56,7 @@ </dependency> <dependency> - <groupId>com.opensymphony</groupId> + <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> </dependency> Modified: trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties =================================================================== --- trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties 2011-03-09 13:01:46 UTC (rev 230) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties 2011-03-09 13:29:17 UTC (rev 231) @@ -109,14 +109,14 @@ bow.search.descclick=Desc. clicks nb bow.search.descdate=Desc. date bow.search.descname=Desc. name -bow.search.orderby=Order by -bow.search.results.deleted=Search results deleted successfully -bow.search.submit=Search -bow.search.title=Search bow.search.order.ascClick=Your search results have been sorted by ascendant clicks number bow.search.order.ascDate=Your search results have been sorted by ascendant date bow.search.order.ascName=Your search results have been sorted by ascendant name bow.search.order.descClick=Your search results have been sorted by descendant clicks number bow.search.order.descDate=Your search results have been sorted by descendant date bow.search.order.descName=Your search results have been sorted by descendant name +bow.search.orderby=Order by +bow.search.results.deleted=Search results deleted successfully +bow.search.submit=Search +bow.search.title=Search bow.token.generate.successful=The token has been regenerated successfully Modified: trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties =================================================================== --- trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties 2011-03-09 13:01:46 UTC (rev 230) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties 2011-03-09 13:29:17 UTC (rev 231) @@ -109,14 +109,14 @@ bow.search.descclick=Nb clics desc. bow.search.descdate=Date desc. bow.search.descname=Nom desc. -bow.search.orderby=Trier par -bow.search.results.deleted=Les r\u00E9sultats de la recherche ont \u00E9t\u00E9 supprim\u00E9s avec succ\u00E8s -bow.search.submit=Rechercher -bow.search.title=Recherche bow.search.order.ascClick=Les r\u00E9sultats de votre recherche ont \u00E9t\u00E9 tri\u00E9s par nombre de clics ascendants bow.search.order.ascDate=Les r\u00E9sultats de votre recherche ont \u00E9t\u00E9 tri\u00E9s par date ascendante bow.search.order.ascName=Les r\u00E9sultats de votre recherche ont \u00E9t\u00E9 tri\u00E9s par nom ascendant bow.search.order.descClick=Les r\u00E9sultats de votre recherche ont \u00E9t\u00E9 tri\u00E9s par nombre de clics descendants bow.search.order.descDate=Les r\u00E9sultats de votre recherche ont \u00E9t\u00E9 tri\u00E9s par date descendante bow.search.order.descName=Les r\u00E9sultats de votre recherche ont \u00E9t\u00E9 tri\u00E9s par nom descendant +bow.search.orderby=Trier par +bow.search.results.deleted=Les r\u00E9sultats de la recherche ont \u00E9t\u00E9 supprim\u00E9s avec succ\u00E8s +bow.search.submit=Rechercher +bow.search.title=Recherche bow.token.generate.successful=Le token a \u00E9t\u00E9 reg\u00E9n\u00E9r\u00E9 avec succ\u00E8s Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-09 13:01:46 UTC (rev 230) +++ trunk/pom.xml 2011-03-09 13:29:17 UTC (rev 231) @@ -56,7 +56,6 @@ <wikittyVersion>3.0.5-SNAPSHOT</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> <struts2Version>2.2.1.1</struts2Version> - <xWorkCoreVersion>2.1.6</xWorkCoreVersion> <htmlParserVersion>1.6</htmlParserVersion> <javaxMailVersion>1.4.3</javaxMailVersion> <servletApiVersion>2.5</servletApiVersion> @@ -98,9 +97,9 @@ </dependency> <dependency> - <groupId>com.opensymphony</groupId> + <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> - <version>${xWorkCoreVersion}</version> + <version>${struts2Version}</version> </dependency> <dependency>