January 2013 - Echobase-commits - mailman.cloud.codelutin.com

r796 - in trunk: . echobase-domain echobase-services echobase-tools echobase-ui
by maven-release＠users.forge.codelutin.com Jan. 15, 2013

Jan. 15, 2013

Author: maven-release Date: 2013-01-15 18:20:37 +0100 (Tue, 15 Jan 2013) New Revision: 796 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/796 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/echobase-domain/pom.xml trunk/echobase-services/pom.xml trunk/echobase-tools/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-domain/pom.xml =================================================================== --- trunk/echobase-domain/pom.xml 2013-01-15 17:20:29 UTC (rev 795) +++ trunk/echobase-domain/pom.xml 2013-01-15 17:20:37 UTC (rev 796) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2013-01-15 17:20:29 UTC (rev 795) +++ trunk/echobase-services/pom.xml 2013-01-15 17:20:37 UTC (rev 796) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2013-01-15 17:20:29 UTC (rev 795) +++ trunk/echobase-tools/pom.xml 2013-01-15 17:20:37 UTC (rev 796) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2013-01-15 17:20:29 UTC (rev 795) +++ trunk/echobase-ui/pom.xml 2013-01-15 17:20:37 UTC (rev 796) @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-01-15 17:20:29 UTC (rev 795) +++ trunk/pom.xml 2013-01-15 17:20:37 UTC (rev 796) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> <modules> <module>echobase-domain</module> @@ -77,12 +77,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/echobase/tags/echobase-2.0</url> + <url>http://svn.forge.codelutin.com/svn/echobase/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-2.0 + scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-2.0 + scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk </developerConnection> </scm>

1 0

r795 - tags
by maven-release＠users.forge.codelutin.com Jan. 15, 2013

Jan. 15, 2013

Author: maven-release Date: 2013-01-15 18:20:29 +0100 (Tue, 15 Jan 2013) New Revision: 795 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/795 Log: [maven-release-plugin] copy for tag echobase-2.0 Added: tags/echobase-2.0/

1 0

r794 - in trunk: . echobase-domain echobase-services echobase-tools echobase-ui
by maven-release＠users.forge.codelutin.com Jan. 15, 2013

Jan. 15, 2013

Author: maven-release Date: 2013-01-15 18:20:21 +0100 (Tue, 15 Jan 2013) New Revision: 794 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/794 Log: [maven-release-plugin] prepare release echobase-2.0 Modified: trunk/echobase-domain/pom.xml trunk/echobase-services/pom.xml trunk/echobase-tools/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-domain/pom.xml =================================================================== --- trunk/echobase-domain/pom.xml 2013-01-15 17:17:53 UTC (rev 793) +++ trunk/echobase-domain/pom.xml 2013-01-15 17:20:21 UTC (rev 794) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2013-01-15 17:17:53 UTC (rev 793) +++ trunk/echobase-services/pom.xml 2013-01-15 17:20:21 UTC (rev 794) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2013-01-15 17:17:53 UTC (rev 793) +++ trunk/echobase-tools/pom.xml 2013-01-15 17:20:21 UTC (rev 794) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2013-01-15 17:17:53 UTC (rev 793) +++ trunk/echobase-ui/pom.xml 2013-01-15 17:20:21 UTC (rev 794) @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-01-15 17:17:53 UTC (rev 793) +++ trunk/pom.xml 2013-01-15 17:20:21 UTC (rev 794) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> <modules> <module>echobase-domain</module> @@ -77,12 +77,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/echobase/trunk</url> + <url>http://svn.forge.codelutin.com/svn/echobase/tags/echobase-2.0</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk + scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-2.0 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk + scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-2.0 </developerConnection> </scm>

1 0

r793 - in trunk: echobase-domain/src/license echobase-services/src/license echobase-tools/src/license echobase-ui/src/license
by maven-release＠users.forge.codelutin.com Jan. 15, 2013

Jan. 15, 2013

Author: maven-release Date: 2013-01-15 18:17:53 +0100 (Tue, 15 Jan 2013) New Revision: 793 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/793 Log: optimize third-parties Modified: trunk/echobase-domain/src/license/THIRD-PARTY.properties trunk/echobase-services/src/license/THIRD-PARTY.properties trunk/echobase-tools/src/license/THIRD-PARTY.properties trunk/echobase-ui/src/license/THIRD-PARTY.properties Modified: trunk/echobase-domain/src/license/THIRD-PARTY.properties =================================================================== --- trunk/echobase-domain/src/license/THIRD-PARTY.properties 2013-01-15 10:57:53 UTC (rev 792) +++ trunk/echobase-domain/src/license/THIRD-PARTY.properties 2013-01-15 17:17:53 UTC (rev 793) @@ -19,8 +19,9 @@ # Please fill the missing licenses for dependencies : # # -#Tue Jan 15 11:41:27 CET 2013 +#Tue Jan 15 11:59:50 CET 2013 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +regexp--regexp--1.3=The Apache Software License, Version 2.0 Modified: trunk/echobase-services/src/license/THIRD-PARTY.properties =================================================================== --- trunk/echobase-services/src/license/THIRD-PARTY.properties 2013-01-15 10:57:53 UTC (rev 792) +++ trunk/echobase-services/src/license/THIRD-PARTY.properties 2013-01-15 17:17:53 UTC (rev 793) @@ -20,8 +20,9 @@ # Please fill the missing licenses for dependencies : # # -#Tue Jan 15 11:41:33 CET 2013 +#Tue Jan 15 11:59:55 CET 2013 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +regexp--regexp--1.3=The Apache Software License, Version 2.0 Modified: trunk/echobase-tools/src/license/THIRD-PARTY.properties =================================================================== --- trunk/echobase-tools/src/license/THIRD-PARTY.properties 2013-01-15 10:57:53 UTC (rev 792) +++ trunk/echobase-tools/src/license/THIRD-PARTY.properties 2013-01-15 17:17:53 UTC (rev 793) @@ -20,8 +20,9 @@ # Please fill the missing licenses for dependencies : # # -#Tue Jan 15 11:41:34 CET 2013 +#Tue Jan 15 11:59:56 CET 2013 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +regexp--regexp--1.3=The Apache Software License, Version 2.0 Modified: trunk/echobase-ui/src/license/THIRD-PARTY.properties =================================================================== --- trunk/echobase-ui/src/license/THIRD-PARTY.properties 2013-01-15 10:57:53 UTC (rev 792) +++ trunk/echobase-ui/src/license/THIRD-PARTY.properties 2013-01-15 17:17:53 UTC (rev 793) @@ -25,10 +25,11 @@ # Please fill the missing licenses for dependencies : # # -#Tue Jan 15 11:41:37 CET 2013 +#Tue Jan 15 11:59:59 CET 2013 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 oro--oro--2.0.8=The Apache Software License, Version 2.0 +regexp--regexp--1.3=The Apache Software License, Version 2.0

1 0

r792 - in trunk: . echobase-domain/src/license echobase-services/src/license echobase-tools/src/license echobase-ui/src/license
by maven-release＠users.forge.codelutin.com Jan. 15, 2013

Jan. 15, 2013

Author: maven-release Date: 2013-01-15 11:57:53 +0100 (Tue, 15 Jan 2013) New Revision: 792 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/792 Log: update dependencies and plugins Modified: trunk/echobase-domain/src/license/THIRD-PARTY.properties trunk/echobase-services/src/license/THIRD-PARTY.properties trunk/echobase-tools/src/license/THIRD-PARTY.properties trunk/echobase-ui/src/license/THIRD-PARTY.properties trunk/pom.xml Modified: trunk/echobase-domain/src/license/THIRD-PARTY.properties =================================================================== --- trunk/echobase-domain/src/license/THIRD-PARTY.properties 2013-01-15 10:34:05 UTC (rev 791) +++ trunk/echobase-domain/src/license/THIRD-PARTY.properties 2013-01-15 10:57:53 UTC (rev 792) @@ -19,9 +19,8 @@ # Please fill the missing licenses for dependencies : # # -#Tue Jan 15 11:09:19 CET 2013 +#Tue Jan 15 11:41:27 CET 2013 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -regexp--regexp--1.3=The Apache Software License, Version 2.0 Modified: trunk/echobase-services/src/license/THIRD-PARTY.properties =================================================================== --- trunk/echobase-services/src/license/THIRD-PARTY.properties 2013-01-15 10:34:05 UTC (rev 791) +++ trunk/echobase-services/src/license/THIRD-PARTY.properties 2013-01-15 10:57:53 UTC (rev 792) @@ -20,9 +20,8 @@ # Please fill the missing licenses for dependencies : # # -#Tue Jan 15 11:09:45 CET 2013 +#Tue Jan 15 11:41:33 CET 2013 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -regexp--regexp--1.3=The Apache Software License, Version 2.0 Modified: trunk/echobase-tools/src/license/THIRD-PARTY.properties =================================================================== --- trunk/echobase-tools/src/license/THIRD-PARTY.properties 2013-01-15 10:34:05 UTC (rev 791) +++ trunk/echobase-tools/src/license/THIRD-PARTY.properties 2013-01-15 10:57:53 UTC (rev 792) @@ -20,9 +20,8 @@ # Please fill the missing licenses for dependencies : # # -#Tue Jan 15 11:10:31 CET 2013 +#Tue Jan 15 11:41:34 CET 2013 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -regexp--regexp--1.3=The Apache Software License, Version 2.0 Modified: trunk/echobase-ui/src/license/THIRD-PARTY.properties =================================================================== --- trunk/echobase-ui/src/license/THIRD-PARTY.properties 2013-01-15 10:34:05 UTC (rev 791) +++ trunk/echobase-ui/src/license/THIRD-PARTY.properties 2013-01-15 10:57:53 UTC (rev 792) @@ -25,11 +25,10 @@ # Please fill the missing licenses for dependencies : # # -#Tue Jan 15 11:10:52 CET 2013 +#Tue Jan 15 11:41:37 CET 2013 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 oro--oro--2.0.8=The Apache Software License, Version 2.0 -regexp--regexp--1.3=The Apache Software License, Version 2.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-01-15 10:34:05 UTC (rev 791) +++ trunk/pom.xml 2013-01-15 10:57:53 UTC (rev 792) @@ -131,18 +131,18 @@  - <eugenePluginVersion>2.5.6.1</eugenePluginVersion> + <eugenePluginVersion>2.6.1</eugenePluginVersion> <topiaVersion>2.7.1</topiaVersion> - <nuitonUtilsVersion>2.6.4</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.6</nuitonUtilsVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> - <nuitonWebVersion>1.12-beta-1</nuitonWebVersion> + <nuitonWebVersion>1.12-beta-2</nuitonWebVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion> - <struts2Version>2.3.7</struts2Version> - <jqueryPluginVersion>3.4.0</jqueryPluginVersion> - <h2Version>1.3.168</h2Version> + <struts2Version>2.3.8</struts2Version> + <jqueryPluginVersion>3.5.0</jqueryPluginVersion> + <h2Version>1.3.170</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <slf4jVersion>1.7.2</slf4jVersion> - <jackcessVersion>1.2.7</jackcessVersion> + <jackcessVersion>1.2.9</jackcessVersion> <hibernateVersion>3.6.10.Final</hibernateVersion>

1 0

r791 - in trunk: echobase-domain/src/license echobase-services/src/license echobase-tools/src/license echobase-ui/src/license
by maven-release＠users.forge.codelutin.com Jan. 15, 2013

Jan. 15, 2013

Author: maven-release Date: 2013-01-15 11:34:05 +0100 (Tue, 15 Jan 2013) New Revision: 791 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/791 Log: update dependencies and plugins Modified: trunk/echobase-domain/src/license/THIRD-PARTY.properties trunk/echobase-services/src/license/THIRD-PARTY.properties trunk/echobase-tools/src/license/THIRD-PARTY.properties trunk/echobase-ui/src/license/THIRD-PARTY.properties Modified: trunk/echobase-domain/src/license/THIRD-PARTY.properties =================================================================== --- trunk/echobase-domain/src/license/THIRD-PARTY.properties 2013-01-13 11:56:02 UTC (rev 790) +++ trunk/echobase-domain/src/license/THIRD-PARTY.properties 2013-01-15 10:34:05 UTC (rev 791) @@ -2,15 +2,16 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License -# - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 +# - GNU Library or Lesser General Public License # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 +# - New BSD License # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 # - license.txt @@ -18,8 +19,9 @@ # Please fill the missing licenses for dependencies : # # -#Tue Nov 08 16:07:35 CET 2011 +#Tue Jan 15 11:09:19 CET 2013 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +regexp--regexp--1.3=The Apache Software License, Version 2.0 Modified: trunk/echobase-services/src/license/THIRD-PARTY.properties =================================================================== --- trunk/echobase-services/src/license/THIRD-PARTY.properties 2013-01-13 11:56:02 UTC (rev 790) +++ trunk/echobase-services/src/license/THIRD-PARTY.properties 2013-01-15 10:34:05 UTC (rev 791) @@ -3,15 +3,16 @@ # Already used licenses in project : # - Affero General Public License (AGPL) # - BSD License -# - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 +# - GNU Library or Lesser General Public License # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 +# - New BSD License # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 # - license.txt @@ -19,8 +20,9 @@ # Please fill the missing licenses for dependencies : # # -#Thu Nov 03 15:07:32 CET 2011 +#Tue Jan 15 11:09:45 CET 2013 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +regexp--regexp--1.3=The Apache Software License, Version 2.0 Modified: trunk/echobase-tools/src/license/THIRD-PARTY.properties =================================================================== --- trunk/echobase-tools/src/license/THIRD-PARTY.properties 2013-01-13 11:56:02 UTC (rev 790) +++ trunk/echobase-tools/src/license/THIRD-PARTY.properties 2013-01-15 10:34:05 UTC (rev 791) @@ -3,7 +3,6 @@ # Already used licenses in project : # - Affero General Public License (AGPL) # - BSD License -# - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - GNU Library or Lesser General Public License @@ -13,6 +12,7 @@ # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 +# - New BSD License # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 # - license.txt @@ -20,8 +20,9 @@ # Please fill the missing licenses for dependencies : # # -#Tue Dec 27 15:42:19 CET 2011 +#Tue Jan 15 11:10:31 CET 2013 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +regexp--regexp--1.3=The Apache Software License, Version 2.0 Modified: trunk/echobase-ui/src/license/THIRD-PARTY.properties =================================================================== --- trunk/echobase-ui/src/license/THIRD-PARTY.properties 2013-01-13 11:56:02 UTC (rev 790) +++ trunk/echobase-ui/src/license/THIRD-PARTY.properties 2013-01-15 10:34:05 UTC (rev 791) @@ -4,7 +4,6 @@ # - Affero General Public License (AGPL) # - Apache Software License - Version 2.0 # - BSD License -# - BSD style # - BSD-style license # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 @@ -17,6 +16,7 @@ # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 +# - New BSD License # - The Apache Software License, Version 1.1 # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 @@ -25,10 +25,11 @@ # Please fill the missing licenses for dependencies : # # -#Sun Sep 02 17:21:28 CEST 2012 +#Tue Jan 15 11:10:52 CET 2013 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 oro--oro--2.0.8=The Apache Software License, Version 2.0 +regexp--regexp--1.3=The Apache Software License, Version 2.0

1 0

r790 - trunk
by maven-release＠users.forge.codelutin.com Jan. 13, 2013

Jan. 13, 2013

Author: maven-release Date: 2013-01-13 12:56:02 +0100 (Sun, 13 Jan 2013) New Revision: 790 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/790 Log: updtae pom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-01-07 11:18:11 UTC (rev 789) +++ trunk/pom.xml 2013-01-13 11:56:02 UTC (rev 790) @@ -74,7 +74,6 @@ </roles> <timezone>Europe/Paris</timezone> </developer> - </developers> <scm>

1 0

r789 - in trunk/echobase-ui/src/main: java/fr/ifremer/echobase/ui resources
by tchemit＠users.forge.codelutin.com Jan. 7, 2013

Jan. 7, 2013

Author: tchemit Date: 2013-01-07 12:18:11 +0100 (Mon, 07 Jan 2013) New Revision: 789 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/789 Log: fixes #1906: Probl?\195?\168me d'encoding dans les fichiers javascripts Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseStaticContentLoader.java Modified: trunk/echobase-ui/src/main/resources/struts.xml Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseStaticContentLoader.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseStaticContentLoader.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseStaticContentLoader.java 2013-01-07 11:18:11 UTC (rev 789) @@ -0,0 +1,134 @@ +package fr.ifremer.echobase.ui; + +/* + * #%L + * EchoBase :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2013 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +import com.google.common.base.Charsets; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; +import org.apache.commons.io.IOUtils; +import org.apache.struts2.dispatcher.DefaultStaticContentLoader; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.Calendar; + + +/** + * To fix some javascript loading problem. + * <p/> + * Some javascript files have some strange first caracter (ckeditor for example) + + * problem while loading charsets for french translate files. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class EchoBaseStaticContentLoader extends DefaultStaticContentLoader { + + /** Logger. */ + private final Logger log = + LoggerFactory.getLogger(EchoBaseStaticContentLoader.class); + + @Override + protected void process(InputStream is, + String path, + HttpServletRequest request, + HttpServletResponse response) throws IOException { + if (is != null) { + Calendar cal = Calendar.getInstance(); + + // check for if-modified-since, prior to any other headers + long ifModifiedSince = 0; + try { + ifModifiedSince = request.getDateHeader("If-Modified-Since"); + } catch (Exception e) { + log.warn("Invalid If-Modified-Since header value: '" + + request.getHeader("If-Modified-Since") + "', ignoring"); + } + long lastModifiedMillis = lastModifiedCal.getTimeInMillis(); + long now = cal.getTimeInMillis(); + cal.add(Calendar.DAY_OF_MONTH, 1); + long expires = cal.getTimeInMillis(); + + if (ifModifiedSince > 0 && ifModifiedSince <= lastModifiedMillis) { + // not modified, content is not sent - only basic + // headers and status SC_NOT_MODIFIED + response.setDateHeader("Expires", expires); + response.setStatus(HttpServletResponse.SC_NOT_MODIFIED); + is.close(); + return; + } + + // set the content-type header + String contentType = getContentType(path); + if (contentType != null) { + response.setContentType(contentType); + } + + if (serveStaticBrowserCache) { + // set heading information for caching static content + response.setDateHeader("Date", now); + response.setDateHeader("Expires", expires); + response.setDateHeader("Retry-After", expires); + response.setHeader("Cache-Control", "public"); + response.setDateHeader("Last-Modified", lastModifiedMillis); + } else { + response.setHeader("Cache-Control", "no-cache"); + response.setHeader("Pragma", "no-cache"); + response.setHeader("Expires", "-1"); + } + + try { + copy(is, response.getOutputStream(), path); + + } finally { + is.close(); + } + } + } + + protected void copy(InputStream input, + OutputStream output, + String path) throws IOException { + + if (path.contains(".js")) { + String content = IOUtils.toString(input); + if (content.indexOf("/") == 1) { + // fix nasty first strange caracter for ckeditor (only on firefox :() + content = content.substring(1); + } + if (log.isDebugEnabled()) { + log.info("Content:\n" + content); + } + // always want to have file in IS0 (even if we serve UTF8 files) + IOUtils.write(content, output, Charsets.ISO_8859_1); + } else { + + // no special tratment for other files + IOUtils.copy(input, output); + } + } +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseStaticContentLoader.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/resources/struts.xml =================================================================== --- trunk/echobase-ui/src/main/resources/struts.xml 2012-12-29 13:13:55 UTC (rev 788) +++ trunk/echobase-ui/src/main/resources/struts.xml 2013-01-07 11:18:11 UTC (rev 789) @@ -30,6 +30,9 @@ <struts> + <bean type="org.apache.struts2.dispatcher.StaticContentLoader" + class="fr.ifremer.echobase.ui.EchoBaseStaticContentLoader" name="default" /> + <bean class="org.nuiton.web.struts2.I18nTextProvider" name="i18nTextProvider" type="com.opensymphony.xwork2.TextProvider"/>

1 0