Author: echatellier Date: 2012-07-13 15:17:30 +0200 (Fri, 13 Jul 2012) New Revision: 1005 Url: http://forge.codelutin.com/repositories/revision/coser/1005 Log: refs #1336, #1337, #1338, #1339, #1340, #1341, #1342, #1343, #1344 : mise ?\195?\160 jour des libs Modified: trunk/coser-business/pom.xml trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java trunk/coser-ui/pom.xml trunk/coser-web/pom.xml trunk/pom.xml Modified: trunk/coser-business/pom.xml =================================================================== --- trunk/coser-business/pom.xml 2012-05-04 08:21:29 UTC (rev 1004) +++ trunk/coser-business/pom.xml 2012-07-13 13:17:30 UTC (rev 1005) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.2.7-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> 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-05-04 08:21:29 UTC (rev 1004) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 2012-07-13 13:17:30 UTC (rev 1005) @@ -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; @@ -113,15 +113,17 @@ ConfigurationManager confManager = new ConfigurationManager(); Configuration conf = confManager.getConfiguration(); Container container = conf.getContainer(); + + // huge improve cache performance + FileManager fileManager = container.getInstance(FileManager.class); + fileManager.setReloadingConfigs(false); + ValueStackFactory stackFactory = container.getInstance(ValueStackFactory.class); ValueStack vs = stackFactory.createValueStack(); context = new ActionContext(vs.getContext()); ActionContext.setContext(context); - // huge improve cache performance - FileManager.setReloadingConfigs(false); - // init validator Container container2 = context.getContainer(); validator = container2.getInstance(ActionValidatorManager.class, "no-annotations"); Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2012-05-04 08:21:29 UTC (rev 1004) +++ trunk/coser-ui/pom.xml 2012-07-13 13:17:30 UTC (rev 1005) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.2.7-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> @@ -82,10 +82,10 @@ </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-widgets</artifactId> + <artifactId>jaxx-widgets</artifactId> </dependency> <dependency> - <groupId>org.swinglabs</groupId> + <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-core</artifactId> </dependency> <dependency> @@ -185,7 +185,7 @@ <plugins> <plugin> <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <addProjectClassPath>true</addProjectClassPath> <extraImportList>org.jdesktop.swingx.*,java.beans.*</extraImportList> Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2012-05-04 08:21:29 UTC (rev 1004) +++ trunk/coser-web/pom.xml 2012-07-13 13:17:30 UTC (rev 1005) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.2.7-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-04 08:21:29 UTC (rev 1004) +++ trunk/pom.xml 2012-07-13 13:17:30 UTC (rev 1005) @@ -6,12 +6,12 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3</version> + <version>3.3.4</version> </parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.2.7-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> <packaging>pom</packaging> <modules> @@ -40,7 +40,7 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.16</version> + <version>1.2.17</version> <scope>test</scope> </dependency> @@ -82,7 +82,7 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.1</version> + <version>2.4</version> <scope>compile</scope> </dependency> @@ -96,34 +96,34 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <version>4.1.4</version> + <version>4.2.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.1.2</version> + <version>4.2.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpmime</artifactId> - <version>4.1.2</version> + <version>4.2.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>2.4.1</version> + <version>2.5.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> - <version>2.4.1</version> + <version>2.5.1</version> <scope>compile</scope> </dependency> @@ -153,6 +153,12 @@ <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> @@ -167,12 +173,18 @@ <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> - <groupId>org.swinglabs</groupId> + <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-core</artifactId> - <version>1.6.2-2</version> + <version>1.6.3</version> <scope>compile</scope> </dependency> @@ -213,7 +225,7 @@ <dependency> <groupId>com.fifesoft</groupId> <artifactId>rsyntaxtextarea</artifactId> - <version>1.5.0</version> + <version>2.0.2</version> <scope>runtime</scope> </dependency> @@ -290,7 +302,7 @@ <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> - <version>2.3.18</version> + <version>2.3.19</version> <scope>compile</scope> </dependency> </dependencies> @@ -346,10 +358,10 @@ <license.organizationName>Ifremer, Codelutin</license.organizationName> <!-- Versions --> - <jaxx.version>2.4.2</jaxx.version> + <jaxx.version>2.5.1</jaxx.version> <i18n.version>2.4.1</i18n.version> <!-- 2.3.1.1 fails to validate fields in jnlp --> - <struts.version>2.2.3</struts.version> + <struts.version>2.3.4</struts.version> </properties> <scm> @@ -363,7 +375,7 @@ <plugins> <plugin> <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <version>${jaxx.version}</version> </plugin> <plugin> @@ -377,12 +389,12 @@ <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <version>7.5.4.v20111024</version> + <version>8.0.4.v20111024</version> </plugin> <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-jspc-maven-plugin</artifactId> - <version>7.5.4.v20111024</version> + <version>8.0.4.v20111024</version> </plugin> <plugin> <artifactId>maven-site-plugin</artifactId>