Author: echatellier Date: 2012-07-17 16:03:22 +0200 (Tue, 17 Jul 2012) New Revision: 1017 Url: http://forge.codelutin.com/repositories/revision/coser/1017 Log: Update to struts 2.3.4 Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java trunk/coser-ui/src/main/java/fr/ifremer/coser/Coser.java trunk/pom.xml Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 2012-07-17 09:06:44 UTC (rev 1016) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 2012-07-17 14:03:22 UTC (rev 1017) @@ -47,11 +47,11 @@ import org.apache.commons.logging.LogFactory; import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.FileManager; import com.opensymphony.xwork2.ValidationAwareSupport; import com.opensymphony.xwork2.config.Configuration; import com.opensymphony.xwork2.config.ConfigurationManager; import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.util.FileManager; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStackFactory; import com.opensymphony.xwork2.validator.ActionValidatorManager; @@ -115,9 +115,8 @@ Container container = conf.getContainer(); // huge improve cache performance - //FileManager fileManager = container.getInstance(FileManager.class); - //fileManager.setReloadingConfigs(false); - FileManager.setReloadingConfigs(false); + FileManager fileManager = container.getInstance(FileManager.class); + fileManager.setReloadingConfigs(false); ValueStackFactory stackFactory = container.getInstance(ValueStackFactory.class); ValueStack vs = stackFactory.createValueStack(); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/Coser.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/Coser.java 2012-07-17 09:06:44 UTC (rev 1016) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/Coser.java 2012-07-17 14:03:22 UTC (rev 1017) @@ -34,6 +34,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; +import org.nuiton.i18n.init.ClassPathI18nInitializer; import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.util.ArgumentsParserException; import org.nuiton.widget.SwingSession; @@ -104,7 +105,12 @@ public static void launch(final CoserConfig coserConfig) { // to work in java webstart - I18n.init(new DefaultI18nInitializer("coser-ui-i18n"), coserConfig.getLocale()); + try { + I18n.init(new DefaultI18nInitializer("coser-ui-i18n"), coserConfig.getLocale()); + } catch (RuntimeException ex) { + // fallback for dev mode + I18n.init(new ClassPathI18nInitializer(), coserConfig.getLocale()); + } // launch UI SwingUtilities.invokeLater(new Runnable() { Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-17 09:06:44 UTC (rev 1016) +++ trunk/pom.xml 2012-07-17 14:03:22 UTC (rev 1017) @@ -117,13 +117,13 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>2.5.1</version> + <version>2.5.2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> - <version>2.5.1</version> + <version>2.5.2-SNAPSHOT</version> <scope>compile</scope> </dependency> @@ -153,12 +153,6 @@ <artifactId>jaxx-runtime</artifactId> <version>${jaxx.version}</version> <scope>compile</scope> - <exclusions> - <exclusion> - <artifactId>swingx-core</artifactId> - <groupId>org.swinglabs</groupId> - </exclusion> - </exclusions> </dependency> <dependency> @@ -173,12 +167,6 @@ <artifactId>jaxx-widgets</artifactId> <version>${jaxx.version}</version> <scope>compile</scope> - <exclusions> - <exclusion> - <artifactId>swingx-core</artifactId> - <groupId>org.swinglabs</groupId> - </exclusion> - </exclusions> </dependency> <dependency> @@ -358,10 +346,10 @@ <license.organizationName>Ifremer, Codelutin</license.organizationName> <!-- Versions --> - <jaxx.version>2.5.1</jaxx.version> + <jaxx.version>2.5.2-SNAPSHOT</jaxx.version> <i18n.version>2.4.1</i18n.version> <!-- 2.3.1.1 fails to validate fields in jnlp --> - <struts.version>2.3.3</struts.version> + <struts.version>2.3.4</struts.version> </properties> <scm>