March 2014 - Echobase-commits - mailman.cloud.codelutin.com

r984 - trunk/src/site/en/rst
by tchemit＠users.forge.codelutin.com March 17, 2014

March 17, 2014

Author: tchemit Date: 2014-03-17 18:22:57 +0100 (Mon, 17 Mar 2014) New Revision: 984 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/984 Log: fix site Modified: trunk/src/site/en/rst/model.rst Modified: trunk/src/site/en/rst/model.rst =================================================================== --- trunk/src/site/en/rst/model.rst 2014-03-17 17:08:48 UTC (rev 983) +++ trunk/src/site/en/rst/model.rst 2014-03-17 17:22:57 UTC (rev 984) @@ -45,7 +45,7 @@ - `Download model (freeMind format)`_. Modèle du référentiel ---------------------- +===================== - `Vue générale du référentiel`_ - `Référentiel AcousticInstrument`_ @@ -60,7 +60,7 @@ - `Référentiel Vessel`_ Modèle thématique ------------------ +================= Partie commune ~~~~~~~~~~~~~~

1 0

r983 - in trunk: . echobase-domain echobase-services echobase-ui
by maven-release＠users.forge.codelutin.com March 17, 2014

March 17, 2014

Author: maven-release Date: 2014-03-17 18:08:48 +0100 (Mon, 17 Mar 2014) New Revision: 983 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/983 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/echobase-domain/pom.xml trunk/echobase-services/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-domain/pom.xml =================================================================== --- trunk/echobase-domain/pom.xml 2014-03-17 17:08:38 UTC (rev 982) +++ trunk/echobase-domain/pom.xml 2014-03-17 17:08:48 UTC (rev 983) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.5.3</version> + <version>2.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2014-03-17 17:08:38 UTC (rev 982) +++ trunk/echobase-services/pom.xml 2014-03-17 17:08:48 UTC (rev 983) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.5.3</version> + <version>2.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2014-03-17 17:08:38 UTC (rev 982) +++ trunk/echobase-ui/pom.xml 2014-03-17 17:08:48 UTC (rev 983) @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.5.3</version> + <version>2.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-17 17:08:38 UTC (rev 982) +++ trunk/pom.xml 2014-03-17 17:08:48 UTC (rev 983) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.5.3</version> + <version>2.6-SNAPSHOT</version> <modules> <module>echobase-domain</module> @@ -84,12 +84,12 @@ </developers> <scm> - <url>https://svn.codelutin.com/repositories/browse/echobase/tags/echobase-2.5.3</url> + <url>https://svn.codelutin.com/repositories/browse/echobase/trunk</url> <connection> - scm:svn:https://svn.codelutin.com/echobase/tags/echobase-2.5.3 + scm:svn:https://svn.codelutin.com/echobase/trunk </connection> <developerConnection> - scm:svn:https://svn.codelutin.com/echobase/tags/echobase-2.5.3 + scm:svn:https://svn.codelutin.com/echobase/trunk </developerConnection> </scm>

1 0

r982 - tags
by maven-release＠users.forge.codelutin.com March 17, 2014

March 17, 2014

Author: maven-release Date: 2014-03-17 18:08:38 +0100 (Mon, 17 Mar 2014) New Revision: 982 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/982 Log: [maven-release-plugin] copy for tag echobase-2.5.3 Added: tags/echobase-2.5.3/

1 0

r981 - in trunk: . echobase-domain echobase-services echobase-ui
by maven-release＠users.forge.codelutin.com March 17, 2014

March 17, 2014

Author: maven-release Date: 2014-03-17 18:08:31 +0100 (Mon, 17 Mar 2014) New Revision: 981 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/981 Log: [maven-release-plugin] prepare release echobase-2.5.3 Modified: trunk/echobase-domain/pom.xml trunk/echobase-services/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-domain/pom.xml =================================================================== --- trunk/echobase-domain/pom.xml 2014-03-17 16:59:15 UTC (rev 980) +++ trunk/echobase-domain/pom.xml 2014-03-17 17:08:31 UTC (rev 981) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.5.3</version> </parent> <groupId>fr.ifremer.echobase</groupId> @@ -254,11 +254,7 @@ <configuration> <tasks> <echo message="copy echobase referential" /> - <copy verbose="true" - failonerror="false" - overwrite="true" - file="${project.basedir}/src/main/data/echobase-referentiel.echobase" - tofile="${project.build.directory}/echobase-referentiel-${project.version}.echobase"/> + <copy verbose="true" failonerror="false" overwrite="true" file="${project.basedir}/src/main/data/echobase-referentiel.echobase" tofile="${project.build.directory}/echobase-referentiel-${project.version}.echobase" /> </tasks> </configuration> <goals> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2014-03-17 16:59:15 UTC (rev 980) +++ trunk/echobase-services/pom.xml 2014-03-17 17:08:31 UTC (rev 981) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.5.3</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2014-03-17 16:59:15 UTC (rev 980) +++ trunk/echobase-ui/pom.xml 2014-03-17 17:08:31 UTC (rev 981) @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.5.3</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-17 16:59:15 UTC (rev 980) +++ trunk/pom.xml 2014-03-17 17:08:31 UTC (rev 981) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.5.3</version> <modules> <module>echobase-domain</module> @@ -84,12 +84,12 @@ </developers> <scm> - <url>https://svn.codelutin.com/repositories/browse/echobase/trunk</url> + <url>https://svn.codelutin.com/repositories/browse/echobase/tags/echobase-2.5.3</url> <connection> - scm:svn:https://svn.codelutin.com/echobase/trunk + scm:svn:https://svn.codelutin.com/echobase/tags/echobase-2.5.3 </connection> <developerConnection> - scm:svn:https://svn.codelutin.com/echobase/trunk + scm:svn:https://svn.codelutin.com/echobase/tags/echobase-2.5.3 </developerConnection> </scm> @@ -221,13 +221,13 @@ <dependency> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-struts2</artifactId> - <version>${nuitonWebVersion}</version> + <version>1.16</version> </dependency> <dependency> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web</artifactId> - <version>${nuitonWebVersion}</version> + <version>1.16</version> </dependency> <dependency>

1 0

Build failed in Jenkins: echobase-ci #21
by admin+ci-codelutin.com＠codelutin.com March 17, 2014

March 17, 2014

See <http://ci.codelutin.com/jenkins/job/echobase-ci/21/changes> Changes: [Tony CHEMIT] remove svn keywords in license header [Tony CHEMIT] refs-30 #2931 Do species export [Tony CHEMIT] revert struts version (some trouble with jquery plugins) ------------------------------------------ [...truncated 568 lines...] INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.echobase.entities.data.EchotypeTopiaDao], already found in class-path. [INFO] Add compile source root : <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-domain/ta…> [INFO] Add resource root :Resource {targetPath: null, filtering: false, FileSet {directory: <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-domain/ta…,> PatternSet [includes: {}, excludes: {**/*.java}]}} [INFO] [INFO] --- eugene-maven-plugin:2.7.4:generate (generate-internal-entities) @ echobase-domain --- [INFO] Process phase [model] for one entry. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:126) beforeReadFile - No properties provider filled, will instanciate a new default one INFO [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:270) loadModelProperties - 24 tag values were succesfull imported from <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-domain/ta…> [INFO] No file generated. [INFO] Apply generator JavaInterfaceTransformer [INFO] Apply generator JavaBeanTransformer [INFO] Apply generator TopiaMetaTransformer INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.echobase.entities.EchoBaseInternalPersistenceContext], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.echobase.entities.ExportQueryTopiaDao], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.echobase.entities.EchoBaseUserTopiaDao], already found in class-path. [INFO] [INFO] --- i18n-maven-plugin:3.0:parserJava (default) @ echobase-domain --- [INFO] [INFO] >>> i18n-maven-plugin:3.0:gen (default) @ echobase-domain >>> [INFO] [INFO] --- i18n-maven-plugin:3.0:get (get) @ echobase-domain --- [INFO] Copying echobase-domain.properties to <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-domain/ta…> [INFO] Copying echobase-domain.properties to <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-domain/ta…> [INFO] [INFO] <<< i18n-maven-plugin:3.0:gen (default) @ echobase-domain <<< [INFO] [INFO] --- i18n-maven-plugin:3.0:gen (default) @ echobase-domain --- [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ echobase-domain --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 12 resources [INFO] Copying 60 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ echobase-domain --- [INFO] Compiling 408 source files to <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-domain/ta…> [WARNING] bootstrap class path not set in conjunction with -source 1.6 [WARNING] <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-domain/sr…>:[26,36] org.nuiton.topia.persistence.TopiaPersistenceHelper in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-domain/sr…>:[35,51] org.nuiton.topia.persistence.TopiaPersistenceHelper in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-domain/sr…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-domain/sr…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ echobase-domain --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-domain/ta…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ echobase-domain --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 1 resource [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ echobase-domain --- [INFO] Compiling 2 source files to <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-domain/ta…> [WARNING] bootstrap class path not set in conjunction with -source 1.6 [INFO] [INFO] --- maven-surefire-plugin:2.16:test (default-test) @ echobase-domain --- [INFO] Surefire report directory: <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-domain/ta…> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running fr.ifremer.echobase.EchoBaseDateConverterTest Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.144 sec - in fr.ifremer.echobase.EchoBaseDateConverterTest Running fr.ifremer.echobase.persistence.EchoBaseDbMetaTest Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.164 sec - in fr.ifremer.echobase.persistence.EchoBaseDbMetaTest Results : Tests run: 4, Failures: 0, Errors: 0, Skipped: 0 [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ echobase-domain --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-domain/ta…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ echobase-domain --- [JENKINS] Archiving disabled [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building EchoBase :: Services 2.6-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/fr/ifremer/cos… [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/echobase-group/fr/ifremer/cos… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/fr/ifremer/cos… [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/echobase-group/fr/ifremer/cos… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/mat… [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/echobase-group/org/nuiton/mat… [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/coser-group/org/nuiton/matrix… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/mat… (2 KB at 30.8 KB/sec) [INFO] Downloaded: https://nexus.nuiton.org/nexus/content/groups/coser-group/org/nuiton/matrix… (2 KB at 27.9 KB/sec) [INFO] Downloaded: https://nexus.nuiton.org/nexus/content/groups/echobase-group/org/nuiton/mat… (2 KB at 7.1 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/mat… [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/echobase-group/org/nuiton/mat… [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/coser-group/org/nuiton/matrix… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/mat… (801 B at 27.9 KB/sec) [INFO] Downloaded: https://nexus.nuiton.org/nexus/content/groups/coser-group/org/nuiton/matrix… (801 B at 24.4 KB/sec) [INFO] Downloaded: https://nexus.nuiton.org/nexus/content/groups/echobase-group/org/nuiton/mat… (801 B at 4.8 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/com/ite… [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/echobase-group/com/itextpdf/i… [INFO] Downloaded: https://nexus.nuiton.org/nexus/content/groups/echobase-group/com/itextpdf/i… (6 KB at 88.5 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/com/itextpdf/itextpdf/5.3.0/itextpdf-5.… [INFO] Downloaded: http://repo.maven.apache.org/maven2/com/itextpdf/itextpdf/5.3.0/itextpdf-5.… (6 KB at 88.5 KB/sec) [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/coser-group/com/itextpdf/itex… [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ echobase-services --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-services/…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ echobase-services --- [INFO] [INFO] --- maven-dependency-plugin:2.8:copy-dependencies (default) @ echobase-services --- [INFO] Copying postgresql-9.3-1101-jdbc41.jar to <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-services/…> [INFO] Copying h2-1.3.175.jar to <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-services/…> [INFO] [INFO] --- i18n-maven-plugin:3.0:parserJava (default) @ echobase-services --- [INFO] [INFO] >>> i18n-maven-plugin:3.0:gen (default) @ echobase-services >>> [INFO] [INFO] --- i18n-maven-plugin:3.0:get (get) @ echobase-services --- [INFO] Copying echobase-services.properties to <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-services/…> [INFO] Copying echobase-services.properties to <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-services/…> [INFO] [INFO] <<< i18n-maven-plugin:3.0:gen (default) @ echobase-services <<< [INFO] [INFO] --- i18n-maven-plugin:3.0:gen (default) @ echobase-services --- [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ echobase-services --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 2 resources [INFO] Copying 0 resource [INFO] Copying 4 resources to embedded [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ echobase-services --- [INFO] Compiling 122 source files to <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-services/…> [INFO] ------------------------------------------------------------- [WARNING] COMPILATION WARNING : [INFO] ------------------------------------------------------------- [WARNING] bootstrap class path not set in conjunction with -source 1.6 [WARNING] <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-services/…>:[183,47] findContainsResult(fr.ifremer.echobase.entities.data.Result) in fr.ifremer.echobase.entities.data.GeneratedCellTopiaDao has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-services/…>:[304,83] findContainsCell(fr.ifremer.echobase.entities.data.Cell) in fr.ifremer.echobase.entities.data.GeneratedDataProcessingTopiaDao has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-services/…>:[452,73] findContainsSample(fr.ifremer.echobase.entities.data.Sample) in fr.ifremer.echobase.entities.data.GeneratedOperationTopiaDao has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-services/…>:[636,51] findContainsOperation(fr.ifremer.echobase.entities.data.Operation) in fr.ifremer.echobase.entities.data.GeneratedTransectTopiaDao has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-services/…>:[640,51] findContainsDataAcquisition(fr.ifremer.echobase.entities.data.DataAcquisition) in fr.ifremer.echobase.entities.data.GeneratedTransectTopiaDao has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-services/…>:[661,50] findContainsTransect(fr.ifremer.echobase.entities.data.Transect) in fr.ifremer.echobase.entities.data.GeneratedTransitTopiaDao has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-services/…>:[35,30] org.nuiton.topia.persistence.TopiaPersistenceHelper in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-services/…>:[217,39] org.nuiton.topia.persistence.TopiaPersistenceHelper in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-services/…>:[72,36] findByEmail(java.lang.String) in fr.ifremer.echobase.entities.GeneratedEchoBaseUserTopiaDao has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-services/…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-services/…>: Recompile with -Xlint:unchecked for details. [INFO] 12 warnings [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-services/…>:[25,29] cannot find symbol symbol: class EchoBaseProject location: package fr.ifremer.coser.bean [ERROR] <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-services/…>:[121,9] cannot find symbol symbol: class EchoBaseProject location: class fr.ifremer.echobase.services.service.exportMap.ExportMapService [ERROR] <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-services/…>:[121,44] cannot find symbol symbol: class EchoBaseProject location: class fr.ifremer.echobase.services.service.exportMap.ExportMapService [ERROR] <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-services/…>:[134,33] cannot find symbol symbol: variable EchoBaseProject location: class fr.ifremer.echobase.services.service.exportMap.ExportMapService [INFO] 4 errors [INFO] ------------------------------------------------------------- [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] EchoBase .......................................... SUCCESS [ 2.383 s] [INFO] EchoBase :: Domain ................................ SUCCESS [ 19.378 s] [INFO] EchoBase :: Services .............................. FAILURE [ 2.951 s] [INFO] EchoBase :: UI .................................... SKIPPED [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 26.650 s [INFO] Finished at: 2014-03-08T00:30:36+01:00 [INFO] Final Memory: 62M/1199M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project echobase-services: Compilation failure: Compilation failure: [ERROR] <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-services/…>:[25,29] cannot find symbol [ERROR] symbol: class EchoBaseProject [ERROR] location: package fr.ifremer.coser.bean [ERROR] <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-services/…>:[121,9] cannot find symbol [ERROR] symbol: class EchoBaseProject [ERROR] location: class fr.ifremer.echobase.services.service.exportMap.ExportMapService [ERROR] <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-services/…>:[121,44] cannot find symbol [ERROR] symbol: class EchoBaseProject [ERROR] location: class fr.ifremer.echobase.services.service.exportMap.ExportMapService [ERROR] <http://ci.codelutin.com/jenkins/job/echobase-ci/ws/trunk/echobase-services/…>:[134,33] cannot find symbol [ERROR] symbol: variable EchoBaseProject [ERROR] location: class fr.ifremer.echobase.services.service.exportMap.ExportMapService [ERROR] -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project echobase-services: Compilation failure at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:212) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:108) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:76) at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:51) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:116) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:361) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:155) at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238) at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at hudson.maven.Maven3Builder.call(Maven3Builder.java:134) at hudson.maven.Maven3Builder.call(Maven3Builder.java:69) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:328) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:744) Caused by: org.apache.maven.plugin.compiler.CompilationFailureException: Compilation failure at org.apache.maven.plugin.compiler.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:858) at org.apache.maven.plugin.compiler.CompilerMojo.execute(CompilerMojo.java:129) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:133) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 30 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <goals> -rf :echobase-services Sending e-mails to: echobase-commits(a)list.forge.codelutin.com chemit+codelutin-ci(a)codelutin.com channel stopped

1 10

Jenkins build is back to normal : echobase-ci » EchoBase :: UI #31
by admin+ci-codelutin.com＠codelutin.com March 17, 2014

March 17, 2014

See <http://ci.codelutin.com/jenkins/job/echobase-ci/fr.ifremer.echobase$echobas…>

1 0

Build failed in Jenkins: echobase-ci » EchoBase :: Services #21
by admin+ci-codelutin.com＠codelutin.com March 17, 2014

March 17, 2014

See <http://ci.codelutin.com/jenkins/job/echobase-ci/fr.ifremer.echobase$echobas…> Changes: [Tony CHEMIT] remove svn keywords in license header [Tony CHEMIT] refs-30 #2931 Do species export ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building EchoBase :: Services 2.6-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/fr/ifremer/cos… [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/echobase-group/fr/ifremer/cos… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/fr/ifremer/cos… [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/echobase-group/fr/ifremer/cos… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/mat… [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/echobase-group/org/nuiton/mat… [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/coser-group/org/nuiton/matrix… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/mat… (2 KB at 30.8 KB/sec) [INFO] Downloaded: https://nexus.nuiton.org/nexus/content/groups/coser-group/org/nuiton/matrix… (2 KB at 27.9 KB/sec) [INFO] Downloaded: https://nexus.nuiton.org/nexus/content/groups/echobase-group/org/nuiton/mat… (2 KB at 7.1 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/mat… [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/echobase-group/org/nuiton/mat… [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/coser-group/org/nuiton/matrix… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/mat… (801 B at 27.9 KB/sec) [INFO] Downloaded: https://nexus.nuiton.org/nexus/content/groups/coser-group/org/nuiton/matrix… (801 B at 24.4 KB/sec) [INFO] Downloaded: https://nexus.nuiton.org/nexus/content/groups/echobase-group/org/nuiton/mat… (801 B at 4.8 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/com/ite… [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/echobase-group/com/itextpdf/i… [INFO] Downloaded: https://nexus.nuiton.org/nexus/content/groups/echobase-group/com/itextpdf/i… (6 KB at 88.5 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/com/itextpdf/itextpdf/5.3.0/itextpdf-5.… [INFO] Downloaded: http://repo.maven.apache.org/maven2/com/itextpdf/itextpdf/5.3.0/itextpdf-5.… (6 KB at 88.5 KB/sec) [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/coser-group/com/itextpdf/itex… [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ echobase-services --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/echobase-ci/fr.ifremer.echobase$echobas…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ echobase-services --- [INFO] [INFO] --- maven-dependency-plugin:2.8:copy-dependencies (default) @ echobase-services --- [INFO] Copying postgresql-9.3-1101-jdbc41.jar to <http://ci.codelutin.com/jenkins/job/echobase-ci/fr.ifremer.echobase$echobas…> [INFO] Copying h2-1.3.175.jar to <http://ci.codelutin.com/jenkins/job/echobase-ci/fr.ifremer.echobase$echobas…> [INFO] [INFO] --- i18n-maven-plugin:3.0:parserJava (default) @ echobase-services --- [INFO] [INFO] >>> i18n-maven-plugin:3.0:gen (default) @ echobase-services >>> [INFO] [INFO] --- i18n-maven-plugin:3.0:get (get) @ echobase-services --- [INFO] Copying echobase-services.properties to <http://ci.codelutin.com/jenkins/job/echobase-ci/fr.ifremer.echobase$echobas…> [INFO] Copying echobase-services.properties to <http://ci.codelutin.com/jenkins/job/echobase-ci/fr.ifremer.echobase$echobas…> [INFO] [INFO] <<< i18n-maven-plugin:3.0:gen (default) @ echobase-services <<< [INFO] [INFO] --- i18n-maven-plugin:3.0:gen (default) @ echobase-services --- [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ echobase-services --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 2 resources [INFO] Copying 0 resource [INFO] Copying 4 resources to embedded [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ echobase-services --- [INFO] Compiling 122 source files to <http://ci.codelutin.com/jenkins/job/echobase-ci/fr.ifremer.echobase$echobas…> [INFO] ------------------------------------------------------------- [WARNING] COMPILATION WARNING : [INFO] ------------------------------------------------------------- [WARNING] bootstrap class path not set in conjunction with -source 1.6 [WARNING] <http://ci.codelutin.com/jenkins/job/echobase-ci/fr.ifremer.echobase$echobas…>:[183,47] findContainsResult(fr.ifremer.echobase.entities.data.Result) in fr.ifremer.echobase.entities.data.GeneratedCellTopiaDao has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/echobase-ci/fr.ifremer.echobase$echobas…>:[304,83] findContainsCell(fr.ifremer.echobase.entities.data.Cell) in fr.ifremer.echobase.entities.data.GeneratedDataProcessingTopiaDao has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/echobase-ci/fr.ifremer.echobase$echobas…>:[452,73] findContainsSample(fr.ifremer.echobase.entities.data.Sample) in fr.ifremer.echobase.entities.data.GeneratedOperationTopiaDao has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/echobase-ci/fr.ifremer.echobase$echobas…>:[636,51] findContainsOperation(fr.ifremer.echobase.entities.data.Operation) in fr.ifremer.echobase.entities.data.GeneratedTransectTopiaDao has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/echobase-ci/fr.ifremer.echobase$echobas…>:[640,51] findContainsDataAcquisition(fr.ifremer.echobase.entities.data.DataAcquisition) in fr.ifremer.echobase.entities.data.GeneratedTransectTopiaDao has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/echobase-ci/fr.ifremer.echobase$echobas…>:[661,50] findContainsTransect(fr.ifremer.echobase.entities.data.Transect) in fr.ifremer.echobase.entities.data.GeneratedTransitTopiaDao has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/echobase-ci/fr.ifremer.echobase$echobas…>:[35,30] org.nuiton.topia.persistence.TopiaPersistenceHelper in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/echobase-ci/fr.ifremer.echobase$echobas…>:[217,39] org.nuiton.topia.persistence.TopiaPersistenceHelper in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/echobase-ci/fr.ifremer.echobase$echobas…>:[72,36] findByEmail(java.lang.String) in fr.ifremer.echobase.entities.GeneratedEchoBaseUserTopiaDao has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/echobase-ci/fr.ifremer.echobase$echobas…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.codelutin.com/jenkins/job/echobase-ci/fr.ifremer.echobase$echobas…>: Recompile with -Xlint:unchecked for details. [INFO] 12 warnings [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.codelutin.com/jenkins/job/echobase-ci/fr.ifremer.echobase$echobas…>:[25,29] cannot find symbol symbol: class EchoBaseProject location: package fr.ifremer.coser.bean [ERROR] <http://ci.codelutin.com/jenkins/job/echobase-ci/fr.ifremer.echobase$echobas…>:[121,9] cannot find symbol symbol: class EchoBaseProject location: class fr.ifremer.echobase.services.service.exportMap.ExportMapService [ERROR] <http://ci.codelutin.com/jenkins/job/echobase-ci/fr.ifremer.echobase$echobas…>:[121,44] cannot find symbol symbol: class EchoBaseProject location: class fr.ifremer.echobase.services.service.exportMap.ExportMapService [ERROR] <http://ci.codelutin.com/jenkins/job/echobase-ci/fr.ifremer.echobase$echobas…>:[134,33] cannot find symbol symbol: variable EchoBaseProject location: class fr.ifremer.echobase.services.service.exportMap.ExportMapService [INFO] 4 errors [INFO] ------------------------------------------------------------- [JENKINS] Archiving disabled

1 10

r980 - trunk/echobase-ui
by maven-release＠users.forge.codelutin.com March 17, 2014

March 17, 2014

Author: maven-release Date: 2014-03-17 17:59:15 +0100 (Mon, 17 Mar 2014) New Revision: 980 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/980 Log: fix release (thanks to coser :() Modified: trunk/echobase-ui/pom.xml Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2014-03-17 16:28:58 UTC (rev 979) +++ trunk/echobase-ui/pom.xml 2014-03-17 16:59:15 UTC (rev 980) @@ -357,7 +357,8 @@ <devMode>false</devMode>  - <i18n.failsIfWarning>true</i18n.failsIfWarning> +  +  </properties> </profile>

1 0

r979 - trunk
by tchemit＠users.forge.codelutin.com March 17, 2014

March 17, 2014

Author: tchemit Date: 2014-03-17 17:28:58 +0100 (Mon, 17 Mar 2014) New Revision: 979 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/979 Log: use last release of Coser Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-17 15:32:28 UTC (rev 978) +++ trunk/pom.xml 2014-03-17 16:28:58 UTC (rev 979) @@ -183,7 +183,7 @@ <dependency> <groupId>fr.ifremer.coser</groupId> <artifactId>coser-business</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5-alpha-1</version> </dependency>

1 0

r978 - trunk/echobase-domain/src/main/data
by tchemit＠users.forge.codelutin.com March 17, 2014

March 17, 2014

Author: tchemit Date: 2014-03-17 16:32:28 +0100 (Mon, 17 Mar 2014) New Revision: 978 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/978 Log: fix referentiel zip Modified: trunk/echobase-domain/src/main/data/echobase-referentiel.echobase Modified: trunk/echobase-domain/src/main/data/echobase-referentiel.echobase =================================================================== (Binary files differ)

1 0

r977 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service
by tchemit＠users.forge.codelutin.com March 17, 2014

March 17, 2014

Author: tchemit Date: 2014-03-17 15:46:44 +0100 (Mon, 17 Mar 2014) New Revision: 977 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/977 Log: fixes #4676 Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java 2014-03-17 14:10:02 UTC (rev 976) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java 2014-03-17 14:46:44 UTC (rev 977) @@ -376,7 +376,35 @@ fName + " WHERE " + subQuery + ")"; } else { - throw new UnsupportedOperationException(); + // more than one property, headace time... + List<String> ruleFilters = Lists.newArrayList(); + for (String decoratorToken : decorator.getTokens()) { + String fName = "f_" + timestamp + (index++); + + // simple case one token + String token = fName + "." + decoratorToken; + + String subQuery = op.toHql(paramName, + token, + data, + filterParams); + + ruleFilters.add(propertyName + " IN ( FROM " + + columnMeta.getType().getName() + " " + + fName + " WHERE " + subQuery + ")"); + } + + String middleOp = "OR"; + switch (op) { + // With negate operand, we must match all !(a or b) = !a and !b + case ne: + case nc: + case en: + case bn: + middleOp = "AND"; + break; + } + ruleFilter = "( " + Joiner.on(" " + middleOp + " ").join(ruleFilters) + " )"; } } @@ -488,8 +516,9 @@ buffer.append("\n "); buffer.append( l(l, "echobase.info.modifiedProperty", propertyName, - sourceValue, - targetValue)); + sourceValue, + targetValue) + ); } } @@ -519,7 +548,8 @@ } catch (Exception eee) { throw new EchoBaseTechnicalException( "Could not obtain property [" + propertyName + - "] value from entity " + entity.getTopiaId(), eee); + "] value from entity " + entity.getTopiaId(), eee + ); } String formatedValue; try { @@ -528,7 +558,8 @@ throw new EchoBaseTechnicalException( "Could not format property [" + propertyName + "] from value [" + value + - "] from entity " + entity.getTopiaId(), eee); + "] from entity " + entity.getTopiaId(), eee + ); } row.put(propertyName, formatedValue);

1 0

r976 - in trunk: echobase-domain/src/main/java/fr/ifremer/echobase/io echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap echobase-services/src/main/resources/rscript echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap echobase-ui/src/main/resources/config echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportMap echobase-ui/src/main/resources/i18n echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication echobase-ui/src/main/webap
by tchemit＠users.forge.codelutin.com March 17, 2014

March 17, 2014

Author: tchemit Date: 2014-03-17 15:10:02 +0100 (Mon, 17 Mar 2014) New Revision: 976 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/976 Log: refs-80 #2931 (RAF sources) + improve long action download Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/CommandLineUtils.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/SpeciesExportModel.java trunk/echobase-services/src/main/resources/rscript/extractMap.r trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Configure.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Export.java trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml trunk/echobase-ui/src/main/resources/config/struts-exportMap.xml trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportMap/Configure-validation.xml trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/result.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/result.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/configure.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/result.jsp Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/CommandLineUtils.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/CommandLineUtils.java 2014-03-17 10:10:45 UTC (rev 975) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/CommandLineUtils.java 2014-03-17 14:10:02 UTC (rev 976) @@ -74,20 +74,24 @@ // invoke int exitValue; + String log = executorLog.getLog(); try { if (logger.isInfoEnabled()) { logger.info("Command line '" + commandLine.toString() + "' will be execute"); } exitValue = executor.execute(commandLine); } catch (IOException eee) { - throw new EchoBaseTechnicalException(errorMsg + "\n" + executorLog.getLog(), eee); + throw new EchoBaseTechnicalException(errorMsg + "\n" + log, eee); } if (logger.isInfoEnabled()) { logger.info("Command line end with exit with value : " + exitValue); } if (exitValue != 0) { - throw new EchoBaseTechnicalException(errorMsg + "\n" + executorLog.getLog()); + if (logger.isErrorEnabled()) { + logger.error("Command failed:\n"+ log); + } + throw new EchoBaseTechnicalException(errorMsg + "\n" + log.replaceAll("\\n","<br/>\n")); } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapConfiguration.java 2014-03-17 10:10:45 UTC (rev 975) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapConfiguration.java 2014-03-17 14:10:02 UTC (rev 976) @@ -33,18 +33,13 @@ * Created on 3/1/14. * * @author Tony Chemit <chemit(a)codelutin.com> - * @since XXX + * @since 2.6 */ public class ExportMapConfiguration extends AbstractEchobaseActionConfiguration { private static final long serialVersionUID = 1L; /** - * File of of export file. - */ - private String fileName; - - /** * Working directory. */ private File workingDirectory; @@ -59,6 +54,29 @@ */ private String missionId; + /** + * Name of the facade. + */ + private String facadeName; + + /** + * Name of the export zone. + */ + private String zoneName; + + /** + * Should we produce raw data? + */ + private boolean publishRawData; + + /** + * Name of user performing the action. + */ + private String userName; + + /** + * Database configuration. + */ private JdbcConfiguration dbConfiguration; public ExportMapConfiguration() { @@ -68,14 +86,6 @@ super(progressModel); } - public String getFileName() { - return fileName; - } - - public void setFileName(String fileName) { - this.fileName = fileName; - } - public File getWorkingDirectory() { return workingDirectory; } @@ -100,6 +110,22 @@ this.missionId = missionId; } + public String getFacadeName() { + return facadeName; + } + + public void setFacadeName(String facadeName) { + this.facadeName = facadeName; + } + + public String getZoneName() { + return zoneName; + } + + public void setZoneName(String zoneName) { + this.zoneName = zoneName; + } + public JdbcConfiguration getDbConfiguration() { return dbConfiguration; } @@ -108,6 +134,22 @@ this.dbConfiguration = dbConfiguration; } + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public boolean isPublishRawData() { + return publishRawData; + } + + public void setPublishRawData(boolean publishRawData) { + this.publishRawData = publishRawData; + } + @Override public void destroy() throws IOException { if (workingDirectory != null) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapService.java 2014-03-17 10:10:45 UTC (rev 975) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapService.java 2014-03-17 14:10:02 UTC (rev 976) @@ -43,7 +43,8 @@ import java.io.File; import java.io.FilenameFilter; import java.io.IOException; -import java.util.Map; +import java.util.Calendar; +import java.util.Date; /** * Created on 3/1/14. @@ -58,24 +59,21 @@ public static final TimeLog timeLog = new TimeLog(ExportMapService.class); + public static final String EXTRACT_MAP_R_SCRIPT = "extractMap.r"; + @Inject private UserDbPersistenceService persistenceService; public void doExport(ExportMapConfiguration model) throws IOException { Preconditions.checkNotNull(model); - Preconditions.checkNotNull(model.getFileName()); Preconditions.checkNotNull(model.getDbConfiguration()); + Preconditions.checkNotNull(model.getFacadeName()); + Preconditions.checkNotNull(model.getZoneName()); Preconditions.checkNotNull(model.getMissionId()); - // compute nb steps (invoke EchoR + extract souces + create archive tree + create archive) - int nbSteps = 4; + model.setNbSteps(7); - if (log.isInfoEnabled()) { - log.info("NB steps: " + nbSteps); - } - model.setNbSteps(nbSteps); - Mission mission = persistenceService.getMission(model.getMissionId()); Preconditions.checkNotNull(mission); @@ -83,66 +81,71 @@ File tempDirectory = model.getWorkingDirectory(); - // 1 - invoke EchoR - File echoRBaseDir = invokeEchoR(missionName, + File echRMapsDir = generateMaps(missionName, tempDirectory, model.getDbConfiguration()); - model.incrementsProgress(); - // 2 - Extract source files - + // 2 - create echobase project + EchoBaseProject echoBaseProject = createProject(tempDirectory, + model, + missionName); model.incrementsProgress(); - // 3 - create archive tree - File archiveBaseDir = new File(tempDirectory, "echobase"); - EchoBaseIOUtil.forceMkdir(archiveBaseDir); - if (log.isInfoEnabled()) { - log.info("Will store maps in " + archiveBaseDir); + // 3 - Extract source files + if (model.isPublishRawData()) { + extractRawData(echoBaseProject, model); } + model.incrementsProgress(); - createArchiveContent(archiveBaseDir, echoRBaseDir, missionName); + // 4 - Export species file + exportSpeciesFile(echoBaseProject); model.incrementsProgress(); - // 4 - create archive + // 5 - Copy maps + copyMaps(echoBaseProject, echRMapsDir); + model.incrementsProgress(); - String fileName = model.getFileName(); - File zipFile = new File(tempDirectory, fileName + ".zip"); + // 6 - create archive + String fileName = model.getZoneName() + "-" + missionName + "-" + echoBaseProject.getName() + ".zip"; + File zipFile = new File(tempDirectory, fileName); - if (log.isInfoEnabled()) { - log.info("Will export map to " + zipFile); - } model.setExportFile(zipFile); - EchoBaseIOUtil.compressZipFile(zipFile, archiveBaseDir); + EchoBaseIOUtil.compressZipFile(zipFile, echoBaseProject.getBasedir()); + model.incrementsProgress(); + + // 7 - delete archive + FileUtils.deleteDirectory(echoBaseProject.getBasedir()); + zipFile.deleteOnExit(); + model.incrementsProgress(); } - protected File invokeEchoR(String missionName, - File tempDirectory, - JdbcConfiguration dbConfiguration) throws IOException { - if (log.isInfoEnabled()) { - log.info("Will invoke EchoR on mission: " + missionName); - log.info("Will connect to db: " + dbConfiguration.getUrl()); - } - File workingDirectory = new File(tempDirectory, "r"); - EchoBaseIOUtil.forceMkdir(workingDirectory); - String scriptPrefixPath = new File(workingDirectory, "EchoR").getAbsolutePath(); + protected File generateMaps(String missionName, + File tempDirectory, + JdbcConfiguration dbConfiguration) throws IOException { File rExecutableFile = getConfiguration().getRscriptExecutablePath(); if (!EchoBaseIOUtil.isExecutableFile(rExecutableFile)) { throw new EchoBaseTechnicalException("Could not find R executable at: " + rExecutableFile); } - // copy script to temporary directory - File scriptFile = new File(tempDirectory, "extractMaps.r"); if (log.isInfoEnabled()) { - log.info("Copy R script to " + scriptFile); + log.info("Will invoke EchoR on mission: " + missionName); + log.info("Will connect to db: " + dbConfiguration.getUrl()); } - EchoBaseIOUtil.copyResource("rscript/extractMaps.r", scriptFile, true); + File workingDirectory = new File(tempDirectory, "r"); + EchoBaseIOUtil.forceMkdir(workingDirectory); + // copy script to temporary directory + String scriptPrefixPath = new File(workingDirectory, "EchoR").getAbsolutePath(); + File scriptFile = new File(tempDirectory, EXTRACT_MAP_R_SCRIPT); + EchoBaseIOUtil.copyResource("/rscript/" + EXTRACT_MAP_R_SCRIPT, scriptFile, true); + // Extract params from jdbcurl - //jdbc:postgresql://demo.codelutin.com:5433/echobase-latest-2011-2.6 + // example jdbc:postgresql://demo.codelutin.com/echobase-latest-2011-2.6 (port=5432) + // example jdbc:postgresql://demo.codelutin.com:5433/echobase-latest-2011-2.6 String url = StringUtils.substringAfter(dbConfiguration.getUrl(), "jdbc:postgresql://"); if (!url.contains("/")) { throw new CoserTechnicalException("Invalid jdbc url: " + url + " (should contains a /"); @@ -155,7 +158,6 @@ dbHost = StringUtils.substringBefore(dbHost, ":"); dbPort = StringUtils.substringAfter(dbHost, ":"); } - if (log.isInfoEnabled()) { log.info("mission: " + missionName); log.info("extractPath: " + scriptPrefixPath); @@ -166,11 +168,12 @@ CommandLine commandLine = CommandLineUtils.newCommand( rExecutableFile, + scriptFile, missionName, scriptPrefixPath, dbHost, + dbPort, dbName, - dbPort, dbConfiguration.getLogin(), dbConfiguration.getPassword()); @@ -180,44 +183,68 @@ return result; } - /** - * Execute R script passed in param and add args to call script - * - * @param workingDirectory working directory - * @param scriptFile script to execute - * @param args arguments to pass to script - */ - public void executeRScript(File workingDirectory, - File scriptFile, - Map<String, String> args) { + protected EchoBaseProject createProject(File tempDirectory, + ExportMapConfiguration model, + String missionName) throws IOException { - // launch R command - File rExecutableFile = getConfiguration().getRscriptExecutablePath(); - if (!EchoBaseIOUtil.isExecutableFile(rExecutableFile)) { - throw new EchoBaseTechnicalException("Could not find R executable at: " + rExecutableFile); + // Get current Year + Date currentDate = serviceContext.newDate(); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(currentDate); + int currentYear = calendar.get(Calendar.YEAR); + + // create project directory + File projectDirectory = new File(tempDirectory, missionName + "-" + currentYear); + EchoBaseIOUtil.forceMkdir(projectDirectory); + + // create project + EchoBaseProject project = new EchoBaseProject(projectDirectory); + + project.setFacadeName(model.getFacadeName()); + project.setZoneName(model.getZoneName()); + project.setSurveyName(missionName); + project.setAuthor("EchoBase user: " + model.getUserName()); + project.setCreationDate(serviceContext.newDate()); + project.setComment("Created by Echobase application (db: " + getUserDbUrl() + ")"); + project.setPubliableResult(model.isPublishRawData()); + + project.save(); + + if (log.isInfoEnabled()) { + log.info("Project created at: " + project.getBasedir() + " with name: " + project.getName()); } - CommandLine commandLine = CommandLineUtils.newCommand(rExecutableFile, args); - - CommandLineUtils.invokeCommandeLine(log, commandLine, "Failed to launch R script: " + scriptFile, workingDirectory); + return project; } - protected void createArchiveContent(File archiveBaseDir, File mapsDirectory, String missionName) throws IOException { + protected void extractRawData(EchoBaseProject project, + ExportMapConfiguration model) throws IOException { + //TODO Do this + if (log.isInfoEnabled()) { + log.info("Extract raw data for mission: " + model.getMissionId() + + " to : " + project.getRawDataDirectory()); + } - EchoBaseProject coserProject = new EchoBaseProject(archiveBaseDir); + FileUtils.write(new File(project.getRawDataDirectory(), "TODO.txt"), "TODO"); + } - coserProject.setSurveyName(missionName); - coserProject.setFacadeName("atlantique"); - coserProject.setZoneName("gdgciem8"); - coserProject.setAuthor("EchoBase"); - coserProject.setComment("Created by Echobase application (db: " + getUserDbUrl() + ")"); + protected void exportSpeciesFile(EchoBaseProject coserProject) { + File speciesFile = coserProject.getSpeciesDefinitionFile(); + SpeciesExportModel speciesExportModel = new SpeciesExportModel(getCsvSeparator()); + try { + Export.exportToFile(speciesExportModel, persistenceService.getSpecies(), speciesFile); + } catch (Exception e) { + throw new EchoBaseTechnicalException("Could not export species list to " + speciesFile, e); + } + } - coserProject.save(); + protected void copyMaps(EchoBaseProject coserProject, File mapsDirectory) throws IOException { File mapDir = coserProject.getMapsDirectory(); EchoBaseIOUtil.forceMkdir(mapDir); - FilenameFilter filter = EchoBaseProject.newMapSpeciesFilenameFilter(missionName); + FilenameFilter filter = + EchoBaseProject.newMapSpeciesFilenameFilter(coserProject.getSurveyName()); // copy all of them in mapDir File[] files = mapsDirectory.listFiles(filter); @@ -226,14 +253,5 @@ FileUtils.copyFileToDirectory(file, mapDir); } } - - // create species.csv - File speciesFile = coserProject.getSpeciesDefinitionFile(); - SpeciesExportModel speciesExportModel = new SpeciesExportModel(getCsvSeparator()); - try { - Export.exportToFile(speciesExportModel, persistenceService.getSpecies(), speciesFile); - } catch (Exception e) { - throw new EchoBaseTechnicalException("Could not export species list to " + speciesFile, e); - } } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/SpeciesExportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/SpeciesExportModel.java 2014-03-17 10:10:45 UTC (rev 975) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/SpeciesExportModel.java 2014-03-17 14:10:02 UTC (rev 976) @@ -34,14 +34,14 @@ public SpeciesExportModel(char separator) { super(separator); - newColumnForExport(Species.PROPERTY_TAXON_CODE, "C_Perm"); - newColumnForExport(Species.PROPERTY_TAXON_SYSTEMATIC_ORDER, "NumSys"); - newColumnForExport(Species.PROPERTY_TAXON_SYSTEMATIC_LEVEL, "NivSys"); - newColumnForExport(Species.PROPERTY_CODE_MEMO, "C_VALIDE"); - newColumnForExport(Species.PROPERTY_GENUS_SPECIES, "L_VALIDE"); - newColumnForExport(Species.PROPERTY_AUTHOR_REFERENCE, "AA_VALIDE"); - newColumnForExport(Species.PROPERTY_TAXON_FATHER_MEMOCODE, "C_TxPère"); - newColumnForExport("taxaCode", "Taxa"); + newColumnForExport("C_Perm", Species.PROPERTY_TAXON_CODE); + newColumnForExport("NumSys", Species.PROPERTY_TAXON_SYSTEMATIC_ORDER); + newColumnForExport("NivSys", Species.PROPERTY_TAXON_SYSTEMATIC_LEVEL); + newColumnForExport("C_VALIDE", Species.PROPERTY_CODE_MEMO); + newColumnForExport("L_VALIDE", Species.PROPERTY_GENUS_SPECIES); + newColumnForExport("AA_VALIDE", Species.PROPERTY_AUTHOR_REFERENCE); + newColumnForExport("C_TxPère", Species.PROPERTY_TAXON_FATHER_MEMOCODE); + newColumnForExport("Taxa", "taxaCode"); } } Modified: trunk/echobase-services/src/main/resources/rscript/extractMap.r =================================================================== --- trunk/echobase-services/src/main/resources/rscript/extractMap.r 2014-03-17 10:10:45 UTC (rev 975) +++ trunk/echobase-services/src/main/resources/rscript/extractMap.r 2014-03-17 14:10:02 UTC (rev 976) @@ -3,26 +3,26 @@ ## missionName ## exportPrefixPath ## dbHost +## dbPort ## dbName ## dbUser ## dbPwd -## dbPort args <- commandArgs(TRUE) missionName <- args[1] exportPrefixPath <- args[2] dbHost <- args[3] -dbName <- args[4] -dbUser <- args[5] -dbPwd <- args[6] -dbPort <- args[7] +dbPort <- args[4] +dbName <- args[5] +dbUser <- args[6] +dbPwd <- args[7] library('EchoR'); GridMaps4Echobase(mission=missionName, voyage='%', path.export=exportPrefixPath, host=dbHost, + port=dbPort, dbname=dbName, user=dbUser, - password=dbPwd, - port=dbPort); \ No newline at end of file + password=dbPwd); \ No newline at end of file Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Configure.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Configure.java 2014-03-17 10:10:45 UTC (rev 975) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Configure.java 2014-03-17 14:10:02 UTC (rev 976) @@ -59,18 +59,37 @@ return missions; } - public void setFileName(String fileName) { - getModel().setFileName(fileName); + + public String getFacadeName() { + return getModel().getFacadeName(); } + public void setFacadeName(String facadeName) { + getModel().setFacadeName(facadeName); + } + + public String getZoneName() { + return getModel().getZoneName(); + } + + public void setZoneName(String zoneName) { + getModel().setZoneName(zoneName); + } + + public String getMissionId() { + return getModel().getMissionId(); + } + @Override protected ExportMapConfiguration createModel() { ExportMapConfiguration result = new ExportMapConfiguration(); - result.setFileName("echobase"); + result.setFacadeName("atlantique"); + result.setZoneName("gdgciem8"); EchoBaseSession userSession = getEchoBaseSession(); JdbcConfiguration workingDbConfiguration = userSession.getWorkingDbConfiguration(); result.setDbConfiguration(workingDbConfiguration); + result.setUserName(userSession.getUser().getEmail()); return result; } @@ -86,7 +105,8 @@ File tempDirectory = FileUtils.getTempDirectory(); File dataDirectory = new File(tempDirectory, "echobase-exportMap-" + - System.currentTimeMillis()); + System.currentTimeMillis() + ); FileUtil.createDirectoryIfNecessary(dataDirectory); model.setWorkingDirectory(dataDirectory); if (log.isInfoEnabled()) { Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Export.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Export.java 2014-03-17 10:10:45 UTC (rev 975) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Export.java 2014-03-17 14:10:02 UTC (rev 976) @@ -48,7 +48,7 @@ protected void startAction(ExportMapService service, ExportMapConfiguration model) throws Exception { if (log.isInfoEnabled()) { - log.info("Start export map to file " + model.getFileName()); + log.info("Start export map for mission" + model.getMissionId()); } service.doExport(model); } @@ -71,7 +71,7 @@ @Override protected String getResultMessage(ExportMapConfiguration model) { String result = t("echobase.message.exportMap.result", - model.getFileName(), + model.getExportFile().getName(), model.getActionTime()); if (log.isInfoEnabled()) { Modified: trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2014-03-17 10:10:45 UTC (rev 975) +++ trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2014-03-17 14:10:02 UTC (rev 976) @@ -85,7 +85,7 @@ <result type="stream"> <param name="contentType">${contentType}</param> <param name="contentLength">${contentLength}</param> - <param name="contentDisposition">filename="${exportFileName}"</param> + <param name="contentDisposition">attachment; filename="${exportFileName}"</param> </result> </action> Modified: trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml 2014-03-17 10:10:45 UTC (rev 975) +++ trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml 2014-03-17 14:10:02 UTC (rev 976) @@ -65,7 +65,7 @@ <result type="stream"> <param name="contentType">${contentType}</param> <param name="contentLength">${contentLength}</param> - <param name="contentDisposition">filename="${fileName}"</param> + <param name="contentDisposition">attachment; filename="${fileName}"</param> </result> </action> Modified: trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml 2014-03-17 10:10:45 UTC (rev 975) +++ trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml 2014-03-17 14:10:02 UTC (rev 976) @@ -67,7 +67,7 @@ <result type="stream"> <param name="contentType">${contentType}</param> <param name="contentLength">${contentLength}</param> - <param name="contentDisposition">filename="${fileName}"</param> + <param name="contentDisposition">attachment; filename="${fileName}"</param> </result> </action> Modified: trunk/echobase-ui/src/main/resources/config/struts-exportMap.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-exportMap.xml 2014-03-17 10:10:45 UTC (rev 975) +++ trunk/echobase-ui/src/main/resources/config/struts-exportMap.xml 2014-03-17 14:10:02 UTC (rev 976) @@ -67,7 +67,7 @@ <result type="stream"> <param name="contentType">${contentType}</param> <param name="contentLength">${contentLength}</param> - <param name="contentDisposition">filename="${fileName}"</param> + <param name="contentDisposition">attachment; filename="${fileName}"</param> </result> </action> Modified: trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml 2014-03-17 10:10:45 UTC (rev 975) +++ trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml 2014-03-17 14:10:02 UTC (rev 976) @@ -125,7 +125,7 @@ <result type="stream"> <param name="contentType">${contentType}</param> <param name="contentLength">${contentLength}</param> - <param name="contentDisposition">filename="${fileName}"</param> + <param name="contentDisposition">attachment; filename="${fileName}"</param> </result> </action> Modified: trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml 2014-03-17 10:10:45 UTC (rev 975) +++ trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml 2014-03-17 14:10:02 UTC (rev 976) @@ -143,7 +143,7 @@ <result type="stream"> <param name="contentType">${contentType}</param> <param name="contentLength">${contentLength}</param> - <param name="contentDisposition">filename="${fileName}"</param> + <param name="contentDisposition">attachment; filename="${fileName}"</param> </result> </action> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportMap/Configure-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportMap/Configure-validation.xml 2014-03-17 10:10:45 UTC (rev 975) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportMap/Configure-validation.xml 2014-03-17 14:10:02 UTC (rev 976) @@ -26,10 +26,16 @@ </field-validator> </field> - <field name="model.fileName"> + <field name="model.facadeName"> <field-validator type="requiredstring"> - <message key="echobase.error.exportMap.filename.required"/> + <message key="echobase.error.exportMap.facadeName.required"/> </field-validator> </field> + <field name="model.zoneName"> + <field-validator type="requiredstring"> + <message key="echobase.error.exportMap.zoneName.required"/> + </field-validator> + </field> + </validators> Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2014-03-17 10:10:45 UTC (rev 975) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2014-03-17 14:10:02 UTC (rev 976) @@ -168,8 +168,10 @@ echobase.error.export.sqlQuery.forbidden.insert.word=La requète contient le mot 'INSERT', ce qui est interdit echobase.error.export.sqlQuery.forbidden.update.word=La requète contient le mot 'UPDATE', ce qui est interdit echobase.error.export.sqlQuery.requiredstring=La requète de l'export est obligatoire +echobase.error.exportMap.facadeName.required=Name of facade is mandatory echobase.error.exportMap.filename.required=Export filename required echobase.error.exportMap.mission.required=No mission selected +echobase.error.exportMap.zoneName.required=Name of zone is mandatory echobase.error.import.acousticDensityUnit.required=acousticDensityUnit non renseigné echobase.error.import.acquisitionSoftwareVersionER60.required=acquisitionSoftwareVersionER60 non renseigné echobase.error.import.acquisitionSoftwareVersionME70.required=acquisitionSoftwareVersionME70 non renseigné @@ -297,6 +299,9 @@ echobase.label.exportAsSeen=Export as displayed on the screen echobase.label.exportDbFileName=Name of export file echobase.label.exportFileName=Name of export file +echobase.label.exportMap.facadeName=Facade +echobase.label.exportMap.publishRawData=Publish raw data +echobase.label.exportMap.zoneName=Zone echobase.label.exportMapFileName=Name of export file echobase.label.importFile=File to export echobase.label.login=Connection Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2014-03-17 10:10:45 UTC (rev 975) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2014-03-17 14:10:02 UTC (rev 976) @@ -168,8 +168,10 @@ echobase.error.export.sqlQuery.forbidden.insert.word=La requète contient le mot 'INSERT', ce qui est interdit echobase.error.export.sqlQuery.forbidden.update.word=La requète contient le mot 'UPDATE', ce qui est interdit echobase.error.export.sqlQuery.requiredstring=La requète de l'export est obligatoire +echobase.error.exportMap.facadeName.required=Le nom de la facade est obligatoire echobase.error.exportMap.filename.required=Le nom d'un fichier d'export est obligatoire echobase.error.exportMap.mission.required=La sélection d'une série est obligatoire +echobase.error.exportMap.zoneName.required=Le nom de la zone est obligatoire echobase.error.import.acousticDensityUnit.required=acousticDensityUnit non renseigné echobase.error.import.acquisitionSoftwareVersionER60.required=acquisitionSoftwareVersionER60 non renseigné echobase.error.import.acquisitionSoftwareVersionME70.required=acquisitionSoftwareVersionME70 non renseigné @@ -297,6 +299,9 @@ echobase.label.exportAsSeen=Exporter "comme à l'écran" echobase.label.exportDbFileName=Nom du fichier d'export echobase.label.exportFileName=Nom du fichier d'export +echobase.label.exportMap.facadeName=Facade +echobase.label.exportMap.publishRawData=Publier les sources +echobase.label.exportMap.zoneName=Zone echobase.label.exportMapFileName=Nom du fichier d'export echobase.label.importFile=Fichier à importer echobase.label.login=Connexion Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/result.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/result.jsp 2014-03-17 10:10:45 UTC (rev 975) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/result.jsp 2014-03-17 14:10:02 UTC (rev 976) @@ -23,15 +23,17 @@ <s:url id="downloadUrl" namespace="/embeddedApplication" action="download"/> -<script type="text/javascript"> +<s:if test="error == null"> + <script type="text/javascript"> - jQuery(document).ready(function () { + jQuery(document).ready(function () { - // start to download by it-self the result of import - window.open("${downloadUrl}"); - }); + // start to download by it-self the result of import + window.location="${downloadUrl}"; + }); + </script> +</s:if> -</script> <title><s:text name="echobase.title.embeddedApplicationResult"/></title> <div class="cleanBoth help"> @@ -43,11 +45,11 @@ <br/> <%@ include file="/WEB-INF/includes/actionResult.jsp" %> - +<s:if test="error == null"> <div> <s:text name="echobase.message.download.link"/> <a href="${downloadUrl}"> <s:text name="echobase.action.downloadEmbeddedApplicationFile"/> </a> </div> - +</s:if> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/result.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/result.jsp 2014-03-17 10:10:45 UTC (rev 975) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/result.jsp 2014-03-17 14:10:02 UTC (rev 976) @@ -23,29 +23,28 @@ <s:url id="downloadUrl" namespace="/exportDb" action="download"/> -<script type="text/javascript"> +<s:if test="error == null"> + <script type="text/javascript"> - jQuery(document).ready(function () { + jQuery(document).ready(function () { - // start to download by it-self the result of import - window.open("${downloadUrl}"); - }); + // start to download by it-self the result of import + window.location="${downloadUrl}"; + }); + </script> +</s:if> -</script> <title><s:text name="echobase.title.exportDbResult"/></title> <%@ include file="/WEB-INF/includes/actionResult.jsp" %> -<div> - L'export de la base complête a réussi en <s:property value="model.actionTime"/>. -</div> - <br/> - +<s:if test="error == null"> <div> Si le téléchargement n'a pas démarré automatiquement, suivez ce lien : <a href="${downloadUrl}" target="download"> <s:text name="echobase.action.downloadExportDbFile"/> </a> </div> +</s:if> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/configure.jsp 2014-03-17 10:10:45 UTC (rev 975) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/configure.jsp 2014-03-17 14:10:02 UTC (rev 976) @@ -47,13 +47,14 @@ <div class="cleanBoth"></div> <br/> - <s:textfield key="model.fileName" requiredLabel="true" size="100" - label="%{getText('echobase.label.exportMapFileName')} (*)"/> - - <div class="cleanBoth"> - <br/> - (*) <s:text name="echobase.info.exportMap.archive"/> - </div> + <s:textfield key="model.facadeName" requiredLabel="true" size="100" + label="%{getText('echobase.label.exportMap.facadeName')}"/> + <br/> + <s:textfield key="model.zoneName" requiredLabel="true" size="100" + label="%{getText('echobase.label.exportMap.zoneName')}"/> + <s:checkbox key="model.publishRawData" + label="%{getText('echobase.label.exportMap.publishRawData')}"/> + <br/> </fieldset> <br/> <s:submit action="configure" value='%{getText("echobase.action.export")}'/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/result.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/result.jsp 2014-03-17 10:10:45 UTC (rev 975) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/result.jsp 2014-03-17 14:10:02 UTC (rev 976) @@ -21,29 +21,27 @@ <s:url id="downloadUrl" namespace="/exportMap" action="download"/> +<s:if test="error == null"> <script type="text/javascript"> jQuery(document).ready(function () { // start to download by it-self the result of import - window.open("${downloadUrl}"); + window.location="${downloadUrl}"; }); - </script> +</s:if> <title><s:text name="echobase.title.exportMapResult"/></title> <%@ include file="/WEB-INF/includes/actionResult.jsp" %> -<div> - L'export des cartes de la campagne a réussi en <s:property value="model.actionTime"/>. -</div> - +<s:if test="error == null"> <br/> - <div> Si le téléchargement n'a pas démarré automatiquement, suivez ce lien : - <a href="${downloadUrl}" target="download"> + <a href="${downloadUrl}" target="download" id="download"> <s:text name="echobase.action.downloadExportMapFile"/> </a> </div> +</s:if>

1 0

Build failed in Jenkins: echobase-ci » EchoBase :: UI #22
by admin+ci-codelutin.com＠codelutin.com March 17, 2014

March 17, 2014

See <http://ci.codelutin.com/jenkins/job/echobase-ci/fr.ifremer.echobase$echobas…> ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building EchoBase :: UI 2.6-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/echobase-group/org/nuiton/web… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/web… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/web… (2 KB at 28.7 KB/sec) [INFO] Downloaded: https://nexus.nuiton.org/nexus/content/groups/echobase-group/org/nuiton/web… (2 KB at 3.8 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/web… [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/echobase-group/org/nuiton/web… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/web… (822 B at 19.6 KB/sec) [INFO] Downloaded: https://nexus.nuiton.org/nexus/content/groups/echobase-group/org/nuiton/web… (822 B at 4.6 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/web… [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/echobase-group/org/nuiton/web… [INFO] Downloaded: https://nexus.nuiton.org/nexus/content/groups/echobase-group/org/nuiton/web… (2 KB at 4.2 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/web… (2 KB at 4.2 KB/sec) [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ echobase-ui --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/echobase-ci/fr.ifremer.echobase$echobas…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ echobase-ui --- [INFO] [INFO] --- i18n-maven-plugin:3.0:parserStruts2 (parseJsp) @ echobase-ui --- [INFO] [INFO] --- i18n-maven-plugin:3.0:parserValidation (parseOthersAndGen) @ echobase-ui --- [INFO] Load rules file validation.rules [INFO] Load rules file <http://ci.codelutin.com/jenkins/job/echobase-ci/fr.ifremer.echobase$echobas…> [INFO] [INFO] --- i18n-maven-plugin:3.0:parserJava (parseOthersAndGen) @ echobase-ui --- [INFO] [INFO] >>> i18n-maven-plugin:3.0:gen (parseOthersAndGen) @ echobase-ui >>> [INFO] [INFO] --- i18n-maven-plugin:3.0:get (get) @ echobase-ui --- [INFO] Copying echobase-ui.properties to <http://ci.codelutin.com/jenkins/job/echobase-ci/fr.ifremer.echobase$echobas…> [INFO] Copying echobase-ui.properties to <http://ci.codelutin.com/jenkins/job/echobase-ci/fr.ifremer.echobase$echobas…> [INFO] [INFO] <<< i18n-maven-plugin:3.0:gen (parseOthersAndGen) @ echobase-ui <<< [INFO] [INFO] --- i18n-maven-plugin:3.0:gen (parseOthersAndGen) @ echobase-ui --- [WARNING] bundle fr_FR contains 24/411 empty entries! (use -Di18n.showEmpty to see these entries) [WARNING] bundle en_GB contains 24/411 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] >>> i18n-maven-plugin:3.0:bundle (bundle) @ echobase-ui >>> [INFO] [INFO] --- i18n-maven-plugin:3.0:collect-i18n-artifacts (collect-i18n-artifacts) @ echobase-ui --- [JENKINS] Archiving disabled

1 4

r975 - in trunk: . echobase-domain echobase-domain/src/main/java/fr/ifremer/echobase/config echobase-domain/src/main/java/fr/ifremer/echobase/io echobase-domain/src/main/resources/i18n echobase-services echobase-services/src/main/java/fr/ifremer/echobase/services/service/embeddedapplication echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap echobase-services/src/main/resources echobase-services/src/main/resources/rscript echobase-ui
by tchemit＠users.forge.codelutin.com March 17, 2014

March 17, 2014

Author: tchemit Date: 2014-03-17 11:10:45 +0100 (Mon, 17 Mar 2014) New Revision: 975 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/975 Log: refs-60 #2931 Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/CommandLineUtils.java trunk/echobase-services/src/main/resources/rscript/ trunk/echobase-services/src/main/resources/rscript/extractMap.r Modified: trunk/echobase-domain/pom.xml trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties trunk/echobase-services/pom.xml trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapService.java trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-domain/pom.xml =================================================================== --- trunk/echobase-domain/pom.xml 2014-03-07 23:23:32 UTC (rev 974) +++ trunk/echobase-domain/pom.xml 2014-03-17 10:10:45 UTC (rev 975) @@ -160,6 +160,11 @@ </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-exec</artifactId> + </dependency> + + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java 2014-03-07 23:23:32 UTC (rev 974) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java 2014-03-17 10:10:45 UTC (rev 975) @@ -180,6 +180,13 @@ return file; } + public File getRscriptExecutablePath() { + File file = applicationConfig.getOptionAsFile( + EchoBaseConfigurationOption.RSCRIPT_EXECTUABLE_PATH.key); + Preconditions.checkNotNull(file); + return file; + } + public File getLogConfigFile() { File file = applicationConfig.getOptionAsFile( EchoBaseConfigurationOption.LOG_CONFIG_FILE.key); Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java 2014-03-07 23:23:32 UTC (rev 974) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java 2014-03-17 10:10:45 UTC (rev 975) @@ -49,6 +49,10 @@ "echobase.internal.db.directory", n("echobase.config.internal.db.directory.description"), "${echobase.data.directory}/internaldb", File.class), + RSCRIPT_EXECTUABLE_PATH( + "echobase.Rscript.executable.path", + n("echobase.config.Rscript.executable.path.description"), + "/usr/bin/Rscript", File.class), EMBEDDED("echobase.embedded", n("echobase.config.embedded.description"), "false", boolean.class), Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/CommandLineUtils.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/CommandLineUtils.java (rev 0) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/CommandLineUtils.java 2014-03-17 10:10:45 UTC (rev 975) @@ -0,0 +1,107 @@ +package fr.ifremer.echobase.io; + +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2014 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 fr.ifremer.echobase.EchoBaseTechnicalException; +import org.apache.commons.exec.CommandLine; +import org.apache.commons.exec.DefaultExecutor; +import org.apache.commons.exec.LogOutputStream; +import org.apache.commons.exec.PumpStreamHandler; +import org.apache.commons.logging.Log; + +import java.io.File; +import java.io.IOException; + +/** + * Utils method around a command line execution. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.8 + */ +public class CommandLineUtils { + + public static CommandLine newCommand(File exec, Object... args) { + return newCommand(exec.getAbsolutePath(), args); + } + + public static CommandLine newCommand(String exec, Object... args) { + CommandLine result = new CommandLine(exec); + + if (args != null) { + for (Object arg : args) { + String argument; + if (arg instanceof File) { + argument = ((File) arg).getAbsolutePath(); + } else { + argument = arg.toString(); + } + result.addArgument(argument); + } + } + return result; + } + + public static void invokeCommandeLine(Log logger, + CommandLine commandLine, + String errorMsg, + File workDir) { + DefaultExecutor executor = new DefaultExecutor(); + + ExecutorLog executorLog = new ExecutorLog(); + executor.setStreamHandler(new PumpStreamHandler(executorLog)); + + // set resource directory + executor.setWorkingDirectory(workDir); + + // invoke + int exitValue; + try { + if (logger.isInfoEnabled()) { + logger.info("Command line '" + commandLine.toString() + "' will be execute"); + } + exitValue = executor.execute(commandLine); + } catch (IOException eee) { + throw new EchoBaseTechnicalException(errorMsg + "\n" + executorLog.getLog(), eee); + } + + if (logger.isInfoEnabled()) { + logger.info("Command line end with exit with value : " + exitValue); + } + if (exitValue != 0) { + throw new EchoBaseTechnicalException(errorMsg + "\n" + executorLog.getLog()); + } + } + + protected static class ExecutorLog extends LogOutputStream { + + protected StringBuilder executorLog = new StringBuilder(); + + @Override + protected void processLine(String line, int level) { + executorLog.append(line); + } + + public String getLog() { + return executorLog.toString(); + } + } +} Property changes on: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/CommandLineUtils.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java 2014-03-07 23:23:32 UTC (rev 974) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java 2014-03-17 10:10:45 UTC (rev 975) @@ -35,11 +35,13 @@ import java.io.BufferedWriter; import java.io.File; import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.LineNumberReader; +import java.io.OutputStreamWriter; import java.util.Collection; import java.util.zip.GZIPInputStream; import java.util.zip.ZipEntry; @@ -239,6 +241,44 @@ return sql; } + public static boolean isExecutableFile(File file) { + boolean isExecutableFile = (file != null && file.exists() && file.canExecute() && !file.isDirectory()); + return isExecutableFile; + } + + public static void forceMkdir(File directory) { + try { + FileUtils.forceMkdir(directory); + } catch (IOException e) { + throw new EchoBaseTechnicalException("Could not create directory: " + directory, e); + } + } + + public static void copyResource(String resourcePath, + File outputFile, + boolean executable) throws IOException { + InputStream inputStream = EchoBaseIOUtil.class.getResourceAsStream(resourcePath); + Preconditions.checkNotNull(inputStream, + "could not find resource " + resourcePath); + try { + if (log.isInfoEnabled()) { + log.info("Copy configuration to " + resourcePath + " to " + outputFile); + } + OutputStreamWriter outputStream = new OutputStreamWriter( + new FileOutputStream(outputFile), Charsets.UTF_8); + try { + IOUtils.copy(inputStream, outputStream); + } finally { + outputStream.close(); + } + if (executable) { + outputFile.setExecutable(true); + } + } finally { + inputStream.close(); + } + } + protected EchoBaseIOUtil() { // no instance of helper class } Modified: trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties =================================================================== --- trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties 2014-03-07 23:23:32 UTC (rev 974) +++ trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties 2014-03-17 10:10:45 UTC (rev 975) @@ -26,6 +26,7 @@ echobase.common.importType.resultsVoyage.short=R Voyage echobase.common.importType.voyage=Voyage import echobase.common.importType.voyage.short=Complete voyage +echobase.config.Rscript.executable.path.description=Location of the R command echobase.config.csv.separator.description=Csv separator character echobase.config.data.directory.description=Path to application data echobase.config.documentationUrl.description=Where to find EchoBase online documentation Modified: trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties =================================================================== --- trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties 2014-03-07 23:23:32 UTC (rev 974) +++ trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties 2014-03-17 10:10:45 UTC (rev 975) @@ -26,6 +26,7 @@ echobase.common.importType.resultsVoyage.short=R Voyage echobase.common.importType.voyage=Import Campagne echobase.common.importType.voyage.short=Campagne complête +echobase.config.Rscript.executable.path.description=Chemin vers l'exécutable R echobase.config.csv.separator.description=Caractère séparateur pour les fichiers csv echobase.config.data.directory.description=Répertoire des données de l'application echobase.config.documentationUrl.description=Où trouver la documentation en ligne d'EchoBase Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2014-03-07 23:23:32 UTC (rev 974) +++ trunk/echobase-services/pom.xml 2014-03-17 10:10:45 UTC (rev 975) @@ -148,6 +148,11 @@ </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-exec</artifactId> + </dependency> + + <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationService.java 2014-03-07 23:23:32 UTC (rev 974) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationService.java 2014-03-17 10:10:45 UTC (rev 975) @@ -20,7 +20,6 @@ */ package fr.ifremer.echobase.services.service.embeddedapplication; -import com.google.common.base.Charsets; import com.google.common.base.Preconditions; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.EchoBaseInternalPersistenceContext; @@ -62,7 +61,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.OutputStreamWriter; import java.util.List; /** @@ -336,27 +334,29 @@ File targetDirectory, boolean executable) throws IOException { String resourcePath = EMBEDDED_PATH + resourceName; - InputStream inputStream = getClass().getResourceAsStream(resourcePath); - Preconditions.checkNotNull(inputStream, - "could not find resource " + resourcePath); - try { - File outputFile = new File(targetDirectory, resourceName); - if (log.isInfoEnabled()) { - log.info("Copy configuration to " + resourceName + " to " + outputFile); - } - OutputStreamWriter outputStream = new OutputStreamWriter( - new FileOutputStream(outputFile), Charsets.UTF_8); - try { - IOUtils.copy(inputStream, outputStream); - } finally { - outputStream.close(); - } - if (executable) { - outputFile.setExecutable(true); - } - } finally { - inputStream.close(); - } + File outputFile = new File(targetDirectory, resourceName); + EchoBaseIOUtil.copyResource(resourcePath, outputFile, executable); +// InputStream inputStream = getClass().getResourceAsStream(resourcePath); +// Preconditions.checkNotNull(inputStream, +// "could not find resource " + resourcePath); +// try { +// File outputFile = new File(targetDirectory, resourceName); +// if (log.isInfoEnabled()) { +// log.info("Copy configuration to " + resourceName + " to " + outputFile); +// } +// OutputStreamWriter outputStream = new OutputStreamWriter( +// new FileOutputStream(outputFile), Charsets.UTF_8); +// try { +// IOUtils.copy(inputStream, outputStream); +// } finally { +// outputStream.close(); +// } +// if (executable) { +// outputFile.setExecutable(true); +// } +// } finally { +// inputStream.close(); +// } } public static void copyEmbeddedBinaryFile(String resourceName, Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapService.java 2014-03-07 23:23:32 UTC (rev 974) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapService.java 2014-03-17 10:10:45 UTC (rev 975) @@ -22,24 +22,28 @@ */ import com.google.common.base.Preconditions; +import fr.ifremer.coser.CoserTechnicalException; import fr.ifremer.coser.bean.EchoBaseProject; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.references.Mission; +import fr.ifremer.echobase.io.CommandLineUtils; import fr.ifremer.echobase.io.EchoBaseIOUtil; import fr.ifremer.echobase.persistence.JdbcConfiguration; import fr.ifremer.echobase.services.EchoBaseServiceSupport; import fr.ifremer.echobase.services.service.UserDbPersistenceService; +import org.apache.commons.exec.CommandLine; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.csv.Export; -import org.nuiton.util.FileUtil; import org.nuiton.util.TimeLog; import javax.inject.Inject; import java.io.File; import java.io.FilenameFilter; import java.io.IOException; +import java.util.Map; /** * Created on 3/1/14. @@ -64,8 +68,8 @@ Preconditions.checkNotNull(model.getDbConfiguration()); Preconditions.checkNotNull(model.getMissionId()); - // compute nb steps (invoke EchoR + create archive tree + - int nbSteps = 3; + // compute nb steps (invoke EchoR + extract souces + create archive tree + create archive) + int nbSteps = 4; if (log.isInfoEnabled()) { log.info("NB steps: " + nbSteps); @@ -78,17 +82,22 @@ String missionName = mission.getName(); File tempDirectory = model.getWorkingDirectory(); - File echoRBaseDir = new File(tempDirectory, "EchoR"); - FileUtil.createDirectoryIfNecessary(echoRBaseDir); + // 1 - invoke EchoR - invokeEchoR(echoRBaseDir, model.getDbConfiguration(), missionName); + File echoRBaseDir = invokeEchoR(missionName, + tempDirectory, + model.getDbConfiguration()); model.incrementsProgress(); - // 2 - create archive tree + // 2 - Extract source files + + model.incrementsProgress(); + + // 3 - create archive tree File archiveBaseDir = new File(tempDirectory, "echobase"); - FileUtil.createDirectoryIfNecessary(archiveBaseDir); + EchoBaseIOUtil.forceMkdir(archiveBaseDir); if (log.isInfoEnabled()) { log.info("Will store maps in " + archiveBaseDir); } @@ -97,7 +106,7 @@ model.incrementsProgress(); - // 3 - create archive + // 4 - create archive String fileName = model.getFileName(); File zipFile = new File(tempDirectory, fileName + ".zip"); @@ -109,18 +118,95 @@ EchoBaseIOUtil.compressZipFile(zipFile, archiveBaseDir); } - protected void invokeEchoR(File dir, JdbcConfiguration dbConfiguration, String missionName) { + protected File invokeEchoR(String missionName, + File tempDirectory, + JdbcConfiguration dbConfiguration) throws IOException { if (log.isInfoEnabled()) { log.info("Will invoke EchoR on mission: " + missionName); log.info("Will connect to db: " + dbConfiguration.getUrl()); } + File workingDirectory = new File(tempDirectory, "r"); + EchoBaseIOUtil.forceMkdir(workingDirectory); + String scriptPrefixPath = new File(workingDirectory, "EchoR").getAbsolutePath(); + + File rExecutableFile = getConfiguration().getRscriptExecutablePath(); + if (!EchoBaseIOUtil.isExecutableFile(rExecutableFile)) { + throw new EchoBaseTechnicalException("Could not find R executable at: " + rExecutableFile); + } + + // copy script to temporary directory + File scriptFile = new File(tempDirectory, "extractMaps.r"); + if (log.isInfoEnabled()) { + log.info("Copy R script to " + scriptFile); + } + EchoBaseIOUtil.copyResource("rscript/extractMaps.r", scriptFile, true); + + // Extract params from jdbcurl + //jdbc:postgresql://demo.codelutin.com:5433/echobase-latest-2011-2.6 + String url = StringUtils.substringAfter(dbConfiguration.getUrl(), "jdbc:postgresql://"); + if (!url.contains("/")) { + throw new CoserTechnicalException("Invalid jdbc url: " + url + " (should contains a /"); + } + String dbHost = StringUtils.substringBefore(url, "/"); + String dbName = StringUtils.substringAfter(url, "/"); + String dbPort = "5432"; + if (dbHost.contains(":")) { + // a port is given + dbHost = StringUtils.substringBefore(dbHost, ":"); + dbPort = StringUtils.substringAfter(dbHost, ":"); + } + + if (log.isInfoEnabled()) { + log.info("mission: " + missionName); + log.info("extractPath: " + scriptPrefixPath); + log.info("dbHost: " + dbHost); + log.info("dbPort: " + dbPort); + log.info("dbName: " + dbName); + } + + CommandLine commandLine = CommandLineUtils.newCommand( + rExecutableFile, + missionName, + scriptPrefixPath, + dbHost, + dbName, + dbPort, + dbConfiguration.getLogin(), + dbConfiguration.getPassword()); + + CommandLineUtils.invokeCommandeLine(log, commandLine, "Failed to launch R script: " + scriptFile, workingDirectory); + + File result = new File(scriptPrefixPath + "meanMaps"); + return result; } - protected void createArchiveContent(File archiveBaseDir, File echoRBaseDir, String missionName) throws IOException { + /** + * Execute R script passed in param and add args to call script + * + * @param workingDirectory working directory + * @param scriptFile script to execute + * @param args arguments to pass to script + */ + public void executeRScript(File workingDirectory, + File scriptFile, + Map<String, String> args) { + // launch R command + File rExecutableFile = getConfiguration().getRscriptExecutablePath(); + if (!EchoBaseIOUtil.isExecutableFile(rExecutableFile)) { + throw new EchoBaseTechnicalException("Could not find R executable at: " + rExecutableFile); + } + CommandLine commandLine = CommandLineUtils.newCommand(rExecutableFile, args); + + CommandLineUtils.invokeCommandeLine(log, commandLine, "Failed to launch R script: " + scriptFile, workingDirectory); + } + + protected void createArchiveContent(File archiveBaseDir, File mapsDirectory, String missionName) throws IOException { + EchoBaseProject coserProject = new EchoBaseProject(archiveBaseDir); - coserProject.setFacadeName("Atlantique"); + coserProject.setSurveyName(missionName); + coserProject.setFacadeName("atlantique"); coserProject.setZoneName("gdgciem8"); coserProject.setAuthor("EchoBase"); coserProject.setComment("Created by Echobase application (db: " + getUserDbUrl() + ")"); @@ -129,15 +215,16 @@ File mapDir = coserProject.getMapsDirectory(); - FileUtil.createDirectoryIfNecessary(mapDir); + EchoBaseIOUtil.forceMkdir(mapDir); FilenameFilter filter = EchoBaseProject.newMapSpeciesFilenameFilter(missionName); - // files are in echoRBaseDir-meanMaps // copy all of them in mapDir - File[] files = new File(echoRBaseDir, "invoke-meanMaps").listFiles(filter); - for (File file : files) { - FileUtils.copyFileToDirectory(file, mapDir); + File[] files = mapsDirectory.listFiles(filter); + if (files != null) { + for (File file : files) { + FileUtils.copyFileToDirectory(file, mapDir); + } } // create species.csv Added: trunk/echobase-services/src/main/resources/rscript/extractMap.r =================================================================== --- trunk/echobase-services/src/main/resources/rscript/extractMap.r (rev 0) +++ trunk/echobase-services/src/main/resources/rscript/extractMap.r 2014-03-17 10:10:45 UTC (rev 975) @@ -0,0 +1,28 @@ +## To extract maps from EchoR +## Args are +## missionName +## exportPrefixPath +## dbHost +## dbName +## dbUser +## dbPwd +## dbPort + +args <- commandArgs(TRUE) +missionName <- args[1] +exportPrefixPath <- args[2] +dbHost <- args[3] +dbName <- args[4] +dbUser <- args[5] +dbPwd <- args[6] +dbPort <- args[7] + +library('EchoR'); +GridMaps4Echobase(mission=missionName, + voyage='%', + path.export=exportPrefixPath, + host=dbHost, + dbname=dbName, + user=dbUser, + password=dbPwd, + port=dbPort); \ No newline at end of file Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2014-03-07 23:23:32 UTC (rev 974) +++ trunk/echobase-ui/pom.xml 2014-03-17 10:10:45 UTC (rev 975) @@ -33,10 +33,6 @@ ${project.build.directory}/${embeddedWarName}.zip </redmine.releaseFiles> - <deployFiles> - ${project.build.directory}/${fullWarName}.war - </deployFiles> -  <skipPostRelease>false</skipPostRelease> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-07 23:23:32 UTC (rev 974) +++ trunk/pom.xml 2014-03-17 10:10:45 UTC (rev 975) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0.1-SNAPSHOT</version> + <version>5.0.1</version> </parent> <groupId>fr.ifremer</groupId> @@ -267,6 +267,13 @@ <version>4.2.10.Final</version> </dependency> +  + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-exec</artifactId> + <version>1.1</version> + </dependency> +  <dependency> <groupId>org.postgresql</groupId>

1 0

March 7, 2014

Author: tchemit Date: 2014-03-08 00:23:32 +0100 (Sat, 08 Mar 2014) New Revision: 974 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/974 Log: remove svn keywords in license header Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseDateConverter.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBasePredicates.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseTechnicalException.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/I18nAble.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseApplicationConfigProvider.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/converter/FloatConverter.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/CellValueParser.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ChainValueParser.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/EchoBaseCsvUtil.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ResultValueParser.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/AbstractEchoBaseDao.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/DriverType.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseInternalPersistenceContext.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserPersistenceContext.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaDao.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaPersistenceContext.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueries.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueryTopiaDao.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CategoryImpl.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CategoryTopiaDao.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CellImpl.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CellTopiaDao.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/EchotypeTopiaDao.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/OperationImpl.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/ResultTopiaDao.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/TransitImpl.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellTypeImpl.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DataMetadataImpl.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SampleDataTypeImpl.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SampleTypeImpl.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesCategoryImpl.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesImpl.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/spatial/SpatialConfiguration.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/InputFile.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseDbMeta.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaApplicationContexts.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/JdbcConfiguration.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/EchoBaseMigrationCallBackResolver.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion2_2.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallback.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_2.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5_1.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallback.java trunk/echobase-domain/src/main/resources/echobase-internaldb.properties trunk/echobase-domain/src/main/resources/echobase-workingdb.properties trunk/echobase-domain/src/main/resources/migration/postgis-structure-2.5.1.sql trunk/echobase-domain/src/main/resources/migration/postgis-view-2.5.1.sql trunk/echobase-domain/src/main/resources/migration/postgis-view-2.6.sql trunk/echobase-domain/src/main/resources/postgis-structure.sql trunk/echobase-domain/src/main/resources/postgis-view.sql trunk/echobase-domain/src/main/xmi/echobase-internal.properties trunk/echobase-domain/src/main/xmi/echobase.properties trunk/echobase-domain/src/test/java/fr/ifremer/echobase/EchoBaseDateConverterTest.java trunk/echobase-domain/src/test/java/fr/ifremer/echobase/persistence/EchoBaseDbMetaTest.java trunk/echobase-domain/src/test/resources/log4j.properties trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractEchobaseActionConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DefaultEchoBaseServiceContext.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceContext.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchobaseAieOC.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ProgressModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ServiceEchobaseAieOC.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/SpeciesExportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbMode.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryCsvModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryInvalidNameException.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryNameAlreadyExistException.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryNotFoundException.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/GenericSQLQuery.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CellPositionReference.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonAllImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransitImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/EchoBaseCsvFileImportResult.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportException.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MissionNameAlreadyExistException.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/OperationImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/OperationImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/BiometrySampleImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/BiometrySampleImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EchotypeImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EchotypeImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/GearMetadataValueImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/GearMetadataValueImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthAgeKeyImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthAgeKeyImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthWeightKeyImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthWeightKeyImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MapCellImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MapCellImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationMetadataValueImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationMetadataValueImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellAssociationImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellAssociationImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellResultImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellResultImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/SubSampleImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/SubSampleImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TotalSampleImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TotalSampleImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransectImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransectImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransitImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransitImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/EchoBaseImportModelFactory.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbMode.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/AbstractImportDbStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/EchoBaseImportStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/FreeImportDbStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/ReferentialImportDbStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AbstractRemoveDataStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AcousticRemoveDataStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CatchesRemoveDataStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonAllRemoveDataStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransectRemoveDataStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransitRemoveDataStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonVoyageRemoveDataStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/LegacyVoyageRemoveDataStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/OperationRemoveDataStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultEsduRemoveDataStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapFishRemoveDataStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapOtherRemoveDataStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultRegionRemoveDataStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultVoyageRemoveDataStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationAlreadyExistException.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationNotFoundException.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationService.java trunk/echobase-services/src/main/resources/embedded/echobase.properties trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseServiceFixtures.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FixCellsIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/DecoratorServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportdb/ExportDbServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AcousticImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonAllImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonTransitImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/OperationImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdb/ImportDbServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AcousticRemoveDataServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CatchesRemoveDataServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonAllRemoveDataServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonTransectRemoveDataServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonTransitRemoveDataServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonVoyageRemoveDataServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/OperationRemoveDataServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultEsduRemoveDataServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultMapRemoveFishDataServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultMapRemoveOtherDataServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultRegionRemoveDataServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultVoyageRemoveDataServiceTest.java trunk/echobase-services/src/test/resources/log4j.properties trunk/echobase-ui/src/main/assembly/dist/echobase.properties trunk/echobase-ui/src/main/assembly/embedded-zip.xml trunk/echobase-ui/src/main/assembly/full-war.xml trunk/echobase-ui/src/main/env/jetty-context.xml trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSessionListener.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseStaticContentLoader.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseUserDbTransactionFilter.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractConfigureAction.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractWaitAndExecAction.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/Home.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ExportTable.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntity.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetForeignEntities.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Build.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Download.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Configure.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Download.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Export.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Configure.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Download.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Export.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/AbstractEditExportQuery.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/CloneExportQuery.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/ConfirmDeleteExportQuery.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/CreateNewExportQuery.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/DeleteExportQuery.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/DownloadExportQueryResult.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/EditExportQuery.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/ExportQueryResult.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/GetExportQueryResult.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/NewLibreOfficeQuery.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/SaveExportQuery.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/ShowExportQuery.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractConfigureImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureOperationImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/CreateMission.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/GetDataProcessingsForVoyage.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/GetVesselsForVoyage.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMode.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAcousticImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchOperationImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchResultsImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/SelectImportType.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/Delete.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ImportLogs.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/RefreshSpatialViews.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/Show.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowMap.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowSpatialModel.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Create.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/GetUsers.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Login.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Logout.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/AbstractWorkingDbAction.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/AddSpatial.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Connect.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Create.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/CreatePostgresDb.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Delete.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Disconnect.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DownloadDriver.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetImportLogDetail.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetVoyage.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Information.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/ShowList.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/AbstractCheckInterceptor.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckUserIsAdmin.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/EchoBaseInjectInterceptor.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/EchoBaseFieldValidatorSupport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/LoginValidator.java trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml trunk/echobase-ui/src/main/resources/config/struts-exportMap.xml trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml trunk/echobase-ui/src/main/resources/config/struts-importData.xml trunk/echobase-ui/src/main/resources/config/struts-importDb.xml trunk/echobase-ui/src/main/resources/config/struts-removeData.xml trunk/echobase-ui/src/main/resources/config/struts-spatial.xml trunk/echobase-ui/src/main/resources/config/struts-user.xml trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml trunk/echobase-ui/src/main/resources/echobase.properties trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable-doImport-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportMap/Configure-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportQuery/CloneExportQuery-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportQuery/SaveExportQuery-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticImport-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesImport-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeAll-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeTransect-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeTransit-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeVoyage-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureOperationImport-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeEsdu-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeMapFish-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeMapOther-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeRegion-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeVoyage-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/CreateMission-createMission-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/Login-login-validation.xml trunk/echobase-ui/src/main/resources/log4j.properties trunk/echobase-ui/src/main/resources/struts.xml trunk/echobase-ui/src/main/resources/template/css_xhtml/checkbox.ftl trunk/echobase-ui/src/main/resources/template/css_xhtml/controlheader-core.ftl trunk/echobase-ui/src/main/resources/template/css_xhtml/label_with_no_space.ftl trunk/echobase-ui/src/main/resources/template/css_xhtml/myradiomap.ftl trunk/echobase-ui/src/main/resources/template/simple/myradiomap.ftl trunk/echobase-ui/src/main/resources/template/themes/echobase-theme/jquery-ui.css trunk/echobase-ui/src/main/resources/validators.xml trunk/echobase-ui/src/main/webapp/WEB-INF/decorators.xml trunk/echobase-ui/src/main/webapp/WEB-INF/decorators/layout-default.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/includes/actionResult.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/includes/i18n.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/includes/metas.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/csvImportResult.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/foreignEntities.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/configure.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/progress.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/result.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/progress.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/result.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/configure.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/progress.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/result.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/confirmDelete.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQuery.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQueryResult.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/newLibreOfficeQuery.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/createMission.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAcousticImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressOperationImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressResultsImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAcousticImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCommonImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultOperationImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultResultsImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/selectImportType.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/progress.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/result.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/confirmDelete.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/deleteProgress.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/deleteResult.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/importLogs.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/show.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/showMap.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Create.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Delete.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Update.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/confirmDelete.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/information.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/manage.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/modifications.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/web.xml trunk/echobase-ui/src/main/webapp/css/screen.css trunk/echobase-ui/src/main/webapp/index.jsp trunk/echobase-ui/src/main/webapp/js/gridHelper.js trunk/echobase-ui/src/main/webapp/js/leaflet-src.js trunk/echobase-ui/src/main/webapp/js/spatial.js trunk/echobase-ui/src/main/webapp/js/test.js trunk/src/site/en/resources/echobase.properties trunk/src/site/en/rst/db.rst trunk/src/site/en/rst/embedded.rst trunk/src/site/en/rst/exportData.rst trunk/src/site/en/rst/exportDb.rst trunk/src/site/en/rst/importData.rst trunk/src/site/en/rst/importDb.rst trunk/src/site/en/rst/index.rst trunk/src/site/en/rst/install.rst trunk/src/site/en/rst/model.rst trunk/src/site/en/rst/modifyData.rst trunk/src/site/en/rst/removeData.rst trunk/src/site/resources/echobase.properties trunk/src/site/rst/db.rst trunk/src/site/rst/embedded.rst trunk/src/site/rst/exportData.rst trunk/src/site/rst/exportDb.rst trunk/src/site/rst/importData.rst trunk/src/site/rst/importDb.rst trunk/src/site/rst/index.rst trunk/src/site/rst/model.rst trunk/src/site/rst/modifyData.rst trunk/src/site/rst/removeData.rst trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseDateConverter.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseDateConverter.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseDateConverter.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBasePredicates.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBasePredicates.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBasePredicates.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseTechnicalException.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseTechnicalException.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseTechnicalException.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/I18nAble.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/I18nAble.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/I18nAble.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseApplicationConfigProvider.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseApplicationConfigProvider.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseApplicationConfigProvider.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/converter/FloatConverter.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/converter/FloatConverter.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/converter/FloatConverter.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/CellValueParser.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/CellValueParser.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/CellValueParser.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ChainValueParser.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ChainValueParser.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ChainValueParser.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/EchoBaseCsvUtil.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/EchoBaseCsvUtil.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/EchoBaseCsvUtil.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ResultValueParser.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ResultValueParser.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ResultValueParser.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/AbstractEchoBaseDao.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/AbstractEchoBaseDao.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/AbstractEchoBaseDao.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/DriverType.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/DriverType.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/DriverType.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseInternalPersistenceContext.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseInternalPersistenceContext.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseInternalPersistenceContext.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 Ifremer, Codelutin * %% @@ -33,4 +31,4 @@ */ public interface EchoBaseInternalPersistenceContext extends TopiaPersistenceContext, EchoBaseInternalTopiaDaoSupplier{ -} \ No newline at end of file +} Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserPersistenceContext.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserPersistenceContext.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserPersistenceContext.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaDao.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaDao.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaDao.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaPersistenceContext.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaPersistenceContext.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaPersistenceContext.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueries.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueries.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueries.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueryTopiaDao.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueryTopiaDao.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueryTopiaDao.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CategoryImpl.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CategoryImpl.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CategoryImpl.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CategoryTopiaDao.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CategoryTopiaDao.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CategoryTopiaDao.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CellImpl.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CellImpl.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CellImpl.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CellTopiaDao.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CellTopiaDao.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CellTopiaDao.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/EchotypeTopiaDao.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/EchotypeTopiaDao.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/EchotypeTopiaDao.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/OperationImpl.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/OperationImpl.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/OperationImpl.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/ResultTopiaDao.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/ResultTopiaDao.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/ResultTopiaDao.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/TransitImpl.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/TransitImpl.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/TransitImpl.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellTypeImpl.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellTypeImpl.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellTypeImpl.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DataMetadataImpl.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DataMetadataImpl.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DataMetadataImpl.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SampleDataTypeImpl.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SampleDataTypeImpl.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SampleDataTypeImpl.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SampleTypeImpl.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SampleTypeImpl.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SampleTypeImpl.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesCategoryImpl.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesCategoryImpl.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesCategoryImpl.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesImpl.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesImpl.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesImpl.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.references; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2014 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% + */ + public class SpeciesImpl extends SpeciesAbstract { private static final long serialVersionUID = 1L; Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/spatial/SpatialConfiguration.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/spatial/SpatialConfiguration.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/spatial/SpatialConfiguration.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% @@ -172,4 +170,4 @@ public void setShowCellMapResultLayer(boolean showCellMapResultLayer) { this.showCellMapResultLayer = showCellMapResultLayer; } -} \ No newline at end of file +} Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/InputFile.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/InputFile.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/InputFile.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseDbMeta.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseDbMeta.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseDbMeta.java 2014-03-07 23:23:32 UTC (rev 974) @@ -2,8 +2,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaApplicationContexts.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaApplicationContexts.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaApplicationContexts.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/JdbcConfiguration.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/JdbcConfiguration.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/JdbcConfiguration.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2012 IRD, Codelutin, Tony Chemit * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/EchoBaseMigrationCallBackResolver.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/EchoBaseMigrationCallBackResolver.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/EchoBaseMigrationCallBackResolver.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -76,4 +74,4 @@ return versionMigrationMapping.keySet(); } -} \ No newline at end of file +} Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion2_2.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion2_2.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion2_2.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallback.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallback.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallback.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_2.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_2.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_2.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% @@ -90,4 +88,4 @@ tx.rollback(); } } -} \ No newline at end of file +} Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5_1.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5_1.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5_1.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 Ifremer, Codelutin * %% @@ -116,4 +114,4 @@ return set.getString(1); } } -} \ No newline at end of file +} Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallback.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallback.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallback.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/main/resources/echobase-internaldb.properties =================================================================== --- trunk/echobase-domain/src/main/resources/echobase-internaldb.properties 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/resources/echobase-internaldb.properties 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ ### # #%L # EchoBase :: Domain -# $Id$ -# $HeadURL$ # %% # Copyright (C) 2010 - 2012 IRD, Codelutin, Tony Chemit # %% Modified: trunk/echobase-domain/src/main/resources/echobase-workingdb.properties =================================================================== --- trunk/echobase-domain/src/main/resources/echobase-workingdb.properties 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/resources/echobase-workingdb.properties 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ ### # #%L # EchoBase :: Domain -# $Id$ -# $HeadURL$ # %% # Copyright (C) 2010 - 2012 IRD, Codelutin, Tony Chemit # %% Modified: trunk/echobase-domain/src/main/resources/migration/postgis-structure-2.5.1.sql =================================================================== --- trunk/echobase-domain/src/main/resources/migration/postgis-structure-2.5.1.sql 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/resources/migration/postgis-structure-2.5.1.sql 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ --- -- #%L --- EchoBase :: UI --- $Id$ --- $HeadURL$ +-- EchoBase :: Domain -- %% -- Copyright (C) 2011 - 2013 Ifremer, Codelutin -- %% @@ -1215,4 +1213,4 @@ -- Compute all data SELECT echobase_compute_all_cell_spatial_data(); -SELECT echobase_compute_all_operation_spatial_data(); \ No newline at end of file +SELECT echobase_compute_all_operation_spatial_data(); Modified: trunk/echobase-domain/src/main/resources/migration/postgis-view-2.5.1.sql =================================================================== --- trunk/echobase-domain/src/main/resources/migration/postgis-view-2.5.1.sql 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/resources/migration/postgis-view-2.5.1.sql 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ --- -- #%L --- EchoBase :: Services --- $Id$ --- $HeadURL$ +-- EchoBase :: Domain -- %% -- Copyright (C) 2011 - 2013 Ifremer, Codelutin -- %% @@ -288,4 +286,4 @@ AND result.category = category.topiaid AND category.speciescategory = speciescategory.topiaid AND speciescategory.species = species.topiaid - AND echobase_cell_spatial.celltypename = 'Map cell'; \ No newline at end of file + AND echobase_cell_spatial.celltypename = 'Map cell'; Modified: trunk/echobase-domain/src/main/resources/migration/postgis-view-2.6.sql =================================================================== --- trunk/echobase-domain/src/main/resources/migration/postgis-view-2.6.sql 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/resources/migration/postgis-view-2.6.sql 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ --- -- #%L -- EchoBase :: Domain --- $Id$ --- $HeadURL$ -- %% -- Copyright (C) 2011 - 2014 Ifremer, Codelutin -- %% @@ -439,4 +437,4 @@ (SELECT SUM(t.sampleweight) FROM totalsamplescomsco t WHERE t.operation_id = e.operationname) AS TotalCatchSCOMSCO, (SELECT SUM(t.sampleweight) FROM totalsampletractru t WHERE t.operation_id = e.operationname) AS TotalCatchTRACTRU, e.operationid as id - FROM echobase_operation_spatial e; \ No newline at end of file + FROM echobase_operation_spatial e; Modified: trunk/echobase-domain/src/main/resources/postgis-structure.sql =================================================================== --- trunk/echobase-domain/src/main/resources/postgis-structure.sql 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/resources/postgis-structure.sql 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ --- -- #%L -- EchoBase :: Domain --- $Id$ --- $HeadURL$ -- %% -- Copyright (C) 2011 - 2014 Ifremer, Codelutin -- %% @@ -1216,4 +1214,4 @@ -- Compute all data SELECT echobase_compute_all_cell_spatial_data(); -SELECT echobase_compute_all_operation_spatial_data(); \ No newline at end of file +SELECT echobase_compute_all_operation_spatial_data(); Modified: trunk/echobase-domain/src/main/resources/postgis-view.sql =================================================================== --- trunk/echobase-domain/src/main/resources/postgis-view.sql 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/resources/postgis-view.sql 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ --- -- #%L -- EchoBase :: Domain --- $Id$ --- $HeadURL$ -- %% -- Copyright (C) 2011 - 2014 Ifremer, Codelutin -- %% @@ -439,4 +437,4 @@ (SELECT SUM(t.sampleweight) FROM totalsamplescomsco t WHERE t.operation_id = e.operationname) AS TotalCatchSCOMSCO, (SELECT SUM(t.sampleweight) FROM totalsampletractru t WHERE t.operation_id = e.operationname) AS TotalCatchTRACTRU, e.operationid as id - FROM echobase_operation_spatial e; \ No newline at end of file + FROM echobase_operation_spatial e; Modified: trunk/echobase-domain/src/main/xmi/echobase-internal.properties =================================================================== --- trunk/echobase-domain/src/main/xmi/echobase-internal.properties 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/xmi/echobase-internal.properties 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ ### # #%L # EchoBase :: Domain -# $Id$ -# $HeadURL$ # %% # Copyright (C) 2011 Ifremer, Codelutin # %% Modified: trunk/echobase-domain/src/main/xmi/echobase.properties =================================================================== --- trunk/echobase-domain/src/main/xmi/echobase.properties 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/main/xmi/echobase.properties 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ ### # #%L # EchoBase :: Domain -# $Id$ -# $HeadURL$ # %% # Copyright (C) 2011 Ifremer, Codelutin # %% @@ -351,4 +349,4 @@ fr.ifremer.echobase.entities.data.Voyage.attribute.endPort.tagValue.notNull=true fr.ifremer.echobase.entities.data.Voyage.attribute.description.tagValue.notNull=true fr.ifremer.echobase.entities.data.Voyage.attribute.mission.tagValue.notNull=true -fr.ifremer.echobase.entities.data.Voyage.attribute.datum.tagValue.notNull=true \ No newline at end of file +fr.ifremer.echobase.entities.data.Voyage.attribute.datum.tagValue.notNull=true Modified: trunk/echobase-domain/src/test/java/fr/ifremer/echobase/EchoBaseDateConverterTest.java =================================================================== --- trunk/echobase-domain/src/test/java/fr/ifremer/echobase/EchoBaseDateConverterTest.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/test/java/fr/ifremer/echobase/EchoBaseDateConverterTest.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/test/java/fr/ifremer/echobase/persistence/EchoBaseDbMetaTest.java =================================================================== --- trunk/echobase-domain/src/test/java/fr/ifremer/echobase/persistence/EchoBaseDbMetaTest.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/test/java/fr/ifremer/echobase/persistence/EchoBaseDbMetaTest.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L * EchoBase :: Domain - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-domain/src/test/resources/log4j.properties =================================================================== --- trunk/echobase-domain/src/test/resources/log4j.properties 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-domain/src/test/resources/log4j.properties 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ ### # #%L # EchoBase :: Domain -# $Id$ -# $HeadURL$ # %% # Copyright (C) 2011 Ifremer, Codelutin # %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractEchobaseActionConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractEchobaseActionConfiguration.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractEchobaseActionConfiguration.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L - * EchoBase :: Domain - * $Id$ - * $HeadURL$ + * EchoBase :: Services * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DefaultEchoBaseServiceContext.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DefaultEchoBaseServiceContext.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DefaultEchoBaseServiceContext.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L - * EchoBase :: Domain - * $Id$ - * $HeadURL$ + * EchoBase :: Services * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseService.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseService.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L - * EchoBase :: Domain - * $Id$ - * $HeadURL$ + * EchoBase :: Services * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceContext.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceContext.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceContext.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L - * EchoBase :: Domain - * $Id$ - * $HeadURL$ + * EchoBase :: Services * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L - * EchoBase :: Domain - * $Id$ - * $HeadURL$ + * EchoBase :: Services * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchobaseAieOC.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchobaseAieOC.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchobaseAieOC.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ProgressModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ProgressModel.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ProgressModel.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L - * EchoBase :: Domain - * $Id$ - * $HeadURL$ + * EchoBase :: Services * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ServiceEchobaseAieOC.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ServiceEchobaseAieOC.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ServiceEchobaseAieOC.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserService.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserService.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationConfiguration.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationConfiguration.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -102,4 +99,4 @@ FileUtils.deleteDirectory(workingDirectory); } } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationService.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationService.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapConfiguration.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapConfiguration.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapService.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapService.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/SpeciesExportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/SpeciesExportModel.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/SpeciesExportModel.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,5 +1,26 @@ package fr.ifremer.echobase.services.service.exportMap; +/* + * #%L + * EchoBase :: Services + * %% + * Copyright (C) 2011 - 2014 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 fr.ifremer.echobase.entities.references.Species; import org.nuiton.csv.ext.AbstractExportModel; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbConfiguration.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbConfiguration.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% @@ -116,4 +113,4 @@ } } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbMode.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbMode.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbMode.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -68,4 +66,4 @@ public boolean isExportData() { return exportData; } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbService.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbService.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportService.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportService.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryCsvModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryCsvModel.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryCsvModel.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryInvalidNameException.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryInvalidNameException.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryInvalidNameException.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -32,4 +30,4 @@ public class ExportQueryInvalidNameException extends Exception { private static final long serialVersionUID = 1L; -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryNameAlreadyExistException.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryNameAlreadyExistException.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryNameAlreadyExistException.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryNotFoundException.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryNotFoundException.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryNotFoundException.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -32,4 +30,4 @@ public class ExportQueryNotFoundException extends Exception { private static final long serialVersionUID = 1L; -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryService.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryService.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/GenericSQLQuery.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/GenericSQLQuery.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/GenericSQLQuery.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportConfiguration.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportConfiguration.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportConfiguration.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportConfiguration.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportService.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportService.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportConfiguration.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportConfiguration.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportService.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportService.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CellPositionReference.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CellPositionReference.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CellPositionReference.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -71,4 +68,4 @@ } public abstract String getMetadataNameSuffix(); -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonAllImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonAllImportService.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonAllImportService.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonImportConfiguration.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonImportConfiguration.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonImportService.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonImportService.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportService.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportService.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransitImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransitImportService.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransitImportService.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% @@ -122,4 +120,4 @@ closeReader(reader, inputFile); } } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportService.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportService.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% @@ -132,4 +130,4 @@ closeReader(reader, inputFile); } } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/EchoBaseCsvFileImportResult.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/EchoBaseCsvFileImportResult.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/EchoBaseCsvFileImportResult.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportException.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportException.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportException.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MissionNameAlreadyExistException.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MissionNameAlreadyExistException.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MissionNameAlreadyExistException.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/OperationImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/OperationImportConfiguration.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/OperationImportConfiguration.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/OperationImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/OperationImportService.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/OperationImportService.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportService.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportService.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportConfiguration.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportConfiguration.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportService.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportService.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportService.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportService.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportService.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportService.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% @@ -201,4 +199,4 @@ } } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportService.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportService.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportService.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportService.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportModel.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportModel.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -136,4 +133,4 @@ public AcousticImportRow newEmptyInstance() { return new AcousticImportRow(); } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportRow.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportRow.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/BiometrySampleImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/BiometrySampleImportModel.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/BiometrySampleImportModel.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -60,4 +57,4 @@ public BiometrySampleImportRow newEmptyInstance() { return new BiometrySampleImportRow(); } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/BiometrySampleImportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/BiometrySampleImportRow.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/BiometrySampleImportRow.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EchotypeImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EchotypeImportModel.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EchotypeImportModel.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -58,4 +55,4 @@ public EchotypeImportRow newEmptyInstance() { return new EchotypeImportRow(); } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EchotypeImportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EchotypeImportRow.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EchotypeImportRow.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -78,4 +75,4 @@ public void setSpecies(Species species) { echotype.addSpecies(species); } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -88,4 +85,4 @@ return new EsduResultByEchotypeAndSpeciesCategoryImportRow(); } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportRow.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportRow.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeImportModel.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeImportModel.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -79,4 +76,4 @@ return new EsduResultByEchotypeImportRow(); } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeImportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeImportRow.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeImportRow.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -83,4 +80,4 @@ return new EsduResultBySpeciesAndAgeCategoryImportRow(); } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportRow.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportRow.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -120,4 +117,4 @@ public void setDataQuality(DataQuality dataQuality) { this.dataQuality = dataQuality; } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -83,4 +80,4 @@ return new EsduResultBySpeciesAndSizeCategoryImportRow(); } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportRow.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportRow.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -120,4 +117,4 @@ public void setDataQuality(DataQuality dataQuality) { this.dataQuality = dataQuality; } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/GearMetadataValueImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/GearMetadataValueImportModel.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/GearMetadataValueImportModel.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/GearMetadataValueImportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/GearMetadataValueImportRow.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/GearMetadataValueImportRow.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthAgeKeyImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthAgeKeyImportModel.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthAgeKeyImportModel.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -60,4 +57,4 @@ public LengthAgeKeyImportRow newEmptyInstance() { return new LengthAgeKeyImportRow(); } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthAgeKeyImportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthAgeKeyImportRow.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthAgeKeyImportRow.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -86,4 +83,4 @@ public void setSpecies(Species species) { lengthAgeKey.setSpecies(species); } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthWeightKeyImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthWeightKeyImportModel.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthWeightKeyImportModel.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -60,4 +57,4 @@ public LengthWeightKeyImportRow newEmptyInstance() { return new LengthWeightKeyImportRow(); } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthWeightKeyImportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthWeightKeyImportRow.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthWeightKeyImportRow.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -99,4 +96,4 @@ public void setStrata(Strata strata) { lengthWeightKey.setStrata(strata); } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MapCellImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MapCellImportModel.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MapCellImportModel.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -126,4 +123,4 @@ MapCellImportRow row = new MapCellImportRow(cellType); return row; } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MapCellImportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MapCellImportRow.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MapCellImportRow.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -206,4 +203,4 @@ public void setDataQuality(DataQuality dataQuality) { this.dataQuality = dataQuality; } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationImportModel.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationImportModel.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationImportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationImportRow.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationImportRow.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationMetadataValueImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationMetadataValueImportModel.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationMetadataValueImportModel.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationMetadataValueImportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationMetadataValueImportRow.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationMetadataValueImportRow.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellAssociationImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellAssociationImportModel.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellAssociationImportModel.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellAssociationImportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellAssociationImportRow.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellAssociationImportRow.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportModel.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportModel.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportRow.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportRow.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellResultImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellResultImportModel.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellResultImportModel.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -84,4 +81,4 @@ public RegionCellResultImportRow newEmptyInstance() { return new RegionCellResultImportRow(); } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellResultImportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellResultImportRow.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellResultImportRow.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/SubSampleImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/SubSampleImportModel.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/SubSampleImportModel.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/SubSampleImportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/SubSampleImportRow.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/SubSampleImportRow.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TotalSampleImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TotalSampleImportModel.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TotalSampleImportModel.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TotalSampleImportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TotalSampleImportRow.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TotalSampleImportRow.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransectImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransectImportModel.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransectImportModel.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransectImportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransectImportRow.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransectImportRow.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransitImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransitImportModel.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransitImportModel.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransitImportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransitImportRow.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransitImportRow.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageImportModel.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageImportModel.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/EchoBaseImportModelFactory.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/EchoBaseImportModelFactory.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/EchoBaseImportModelFactory.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbConfiguration.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbConfiguration.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbMode.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbMode.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbMode.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbService.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbService.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportService.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportService.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/AbstractImportDbStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/AbstractImportDbStrategy.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/AbstractImportDbStrategy.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/EchoBaseImportStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/EchoBaseImportStrategy.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/EchoBaseImportStrategy.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/FreeImportDbStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/FreeImportDbStrategy.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/FreeImportDbStrategy.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/ReferentialImportDbStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/ReferentialImportDbStrategy.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/ReferentialImportDbStrategy.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataConfiguration.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataConfiguration.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataService.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataService.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AbstractRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AbstractRemoveDataStrategy.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AbstractRemoveDataStrategy.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AcousticRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AcousticRemoveDataStrategy.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AcousticRemoveDataStrategy.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CatchesRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CatchesRemoveDataStrategy.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CatchesRemoveDataStrategy.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonAllRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonAllRemoveDataStrategy.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonAllRemoveDataStrategy.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransectRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransectRemoveDataStrategy.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransectRemoveDataStrategy.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransitRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransitRemoveDataStrategy.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransitRemoveDataStrategy.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% @@ -118,4 +116,4 @@ ImportType.RESULT_REGION); return result; } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonVoyageRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonVoyageRemoveDataStrategy.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonVoyageRemoveDataStrategy.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% @@ -101,4 +99,4 @@ ImportType.RESULT_REGION); return result; } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/LegacyVoyageRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/LegacyVoyageRemoveDataStrategy.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/LegacyVoyageRemoveDataStrategy.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/OperationRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/OperationRemoveDataStrategy.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/OperationRemoveDataStrategy.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultEsduRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultEsduRemoveDataStrategy.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultEsduRemoveDataStrategy.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapFishRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapFishRemoveDataStrategy.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapFishRemoveDataStrategy.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapOtherRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapOtherRemoveDataStrategy.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapOtherRemoveDataStrategy.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultRegionRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultRegionRemoveDataStrategy.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultRegionRemoveDataStrategy.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultVoyageRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultVoyageRemoveDataStrategy.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultVoyageRemoveDataStrategy.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationAlreadyExistException.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationAlreadyExistException.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationAlreadyExistException.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -32,4 +30,4 @@ public class WorkingDbConfigurationAlreadyExistException extends Exception { private static final long serialVersionUID = 1L; -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationNotFoundException.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationNotFoundException.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationNotFoundException.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -32,4 +30,4 @@ public class WorkingDbConfigurationNotFoundException extends Exception { private static final long serialVersionUID = 1L; -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationService.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationService.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -193,4 +191,4 @@ protected WorkingDbConfigurationTopiaDao getDao() { return echoBaseInternalPersistenceContext.getWorkingDbConfigurationDao(); } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/main/resources/embedded/echobase.properties =================================================================== --- trunk/echobase-services/src/main/resources/embedded/echobase.properties 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/main/resources/embedded/echobase.properties 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ ### # #%L # EchoBase :: Services -# -# $Id$ -# $HeadURL$ # %% # Copyright (C) 2011 Ifremer, Codelutin # %% Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseServiceFixtures.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseServiceFixtures.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseServiceFixtures.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FixCellsIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FixCellsIT.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FixCellsIT.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/DecoratorServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/DecoratorServiceTest.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/DecoratorServiceTest.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L - * EchoBase :: Entities - * - * $Id$ - * $HeadURL$ + * EchoBase :: Services * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationServiceIT.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationServiceIT.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportdb/ExportDbServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportdb/ExportDbServiceTest.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportdb/ExportDbServiceTest.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryServiceTest.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryServiceTest.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataServiceIT.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataServiceIT.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AcousticImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AcousticImportServiceIT.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AcousticImportServiceIT.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceIT.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceIT.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonAllImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonAllImportServiceIT.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonAllImportServiceIT.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportServiceIT.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportServiceIT.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonTransitImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonTransitImportServiceIT.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonTransitImportServiceIT.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% @@ -86,4 +84,4 @@ assertNbEntities(Transect.class, 0); } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportServiceIT.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportServiceIT.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% @@ -82,4 +80,4 @@ assertNbEntities(Transect.class, 0); } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/OperationImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/OperationImportServiceIT.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/OperationImportServiceIT.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportServiceIT.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportServiceIT.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -191,4 +188,4 @@ assertCsvImportResult(result, 0, SpeciesCategory.class, 14, 0, 470); } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportServiceIT.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportServiceIT.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -80,4 +77,4 @@ assertCsvImportResult(result, 0, Category.class, 1); } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportServiceIT.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportServiceIT.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportServiceIT.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportServiceIT.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -92,4 +89,4 @@ assertCsvImportResult(result, 2, SpeciesCategory.class, 1, 0, 457); } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportServiceIT.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportServiceIT.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -162,4 +159,4 @@ assertCsvImportResult(result, 0, Echotype.class, fixtures.NB_ECHOTYPE()); } -} \ No newline at end of file +} Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdb/ImportDbServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdb/ImportDbServiceTest.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdb/ImportDbServiceTest.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: Services - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AcousticRemoveDataServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AcousticRemoveDataServiceTest.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AcousticRemoveDataServiceTest.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CatchesRemoveDataServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CatchesRemoveDataServiceTest.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CatchesRemoveDataServiceTest.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonAllRemoveDataServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonAllRemoveDataServiceTest.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonAllRemoveDataServiceTest.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonTransectRemoveDataServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonTransectRemoveDataServiceTest.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonTransectRemoveDataServiceTest.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonTransitRemoveDataServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonTransitRemoveDataServiceTest.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonTransitRemoveDataServiceTest.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonVoyageRemoveDataServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonVoyageRemoveDataServiceTest.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonVoyageRemoveDataServiceTest.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/OperationRemoveDataServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/OperationRemoveDataServiceTest.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/OperationRemoveDataServiceTest.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultEsduRemoveDataServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultEsduRemoveDataServiceTest.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultEsduRemoveDataServiceTest.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultMapRemoveFishDataServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultMapRemoveFishDataServiceTest.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultMapRemoveFishDataServiceTest.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultMapRemoveOtherDataServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultMapRemoveOtherDataServiceTest.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultMapRemoveOtherDataServiceTest.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultRegionRemoveDataServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultRegionRemoveDataServiceTest.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultRegionRemoveDataServiceTest.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultVoyageRemoveDataServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultVoyageRemoveDataServiceTest.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultVoyageRemoveDataServiceTest.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: Services - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-services/src/test/resources/log4j.properties =================================================================== --- trunk/echobase-services/src/test/resources/log4j.properties 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-services/src/test/resources/log4j.properties 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ ### # #%L # EchoBase :: Services -# -# $Id$ -# $HeadURL$ # %% # Copyright (C) 2011 Ifremer, Codelutin # %% Modified: trunk/echobase-ui/src/main/assembly/dist/echobase.properties =================================================================== --- trunk/echobase-ui/src/main/assembly/dist/echobase.properties 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/assembly/dist/echobase.properties 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ ### # #%L # EchoBase :: UI -# $Id$ -# $HeadURL$ # %% # Copyright (C) 2011 - 2012 Ifremer, Codelutin # %% Modified: trunk/echobase-ui/src/main/assembly/embedded-zip.xml =================================================================== --- trunk/echobase-ui/src/main/assembly/embedded-zip.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/assembly/embedded-zip.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ <!-- #%L EchoBase :: UI - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2012 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/assembly/full-war.xml =================================================================== --- trunk/echobase-ui/src/main/assembly/full-war.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/assembly/full-war.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ <!-- #%L EchoBase :: UI - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2012 Ifremer, Codelutin %% @@ -10,12 +8,10 @@ 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% Modified: trunk/echobase-ui/src/main/env/jetty-context.xml =================================================================== --- trunk/echobase-ui/src/main/env/jetty-context.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/env/jetty-context.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <!-- #%L - Pollen :: UI (struts2) - $Id$ - $HeadURL$ + EchoBase :: UI %% Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% @@ -29,4 +27,4 @@ <Arg>org.eclipse.jetty.server.webapp.WebInfIncludeJarPattern</Arg> <Arg>.*/.*jsp-api-[^/]\.jar$|./.*jsp-[^/]\.jar$|./.*taglibs[^/]*\.jar$</Arg> </Call> -</Configure> \ No newline at end of file +</Configure> Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSessionListener.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSessionListener.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSessionListener.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L - * T3 :: Web - * - * $Id$ - * $HeadURL$ + * EchoBase :: UI * %% * Copyright (C) 2010 - 2012 IRD, Codelutin, Tony Chemit * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseStaticContentLoader.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseStaticContentLoader.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseStaticContentLoader.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseUserDbTransactionFilter.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseUserDbTransactionFilter.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseUserDbTransactionFilter.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -86,4 +84,4 @@ return transaction; } -} \ No newline at end of file +} Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractConfigureAction.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractConfigureAction.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractConfigureAction.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractWaitAndExecAction.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractWaitAndExecAction.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractWaitAndExecAction.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% @@ -188,4 +185,4 @@ getEchoBaseSession().removeActionConfiguration(modelType); } } -} \ No newline at end of file +} Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/Home.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/Home.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/Home.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ExportTable.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ExportTable.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ExportTable.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntity.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntity.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntity.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetForeignEntities.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetForeignEntities.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetForeignEntities.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Build.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Build.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Build.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -80,4 +77,4 @@ service.createEmbeddedApplication(model); } -} \ No newline at end of file +} Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -109,4 +106,4 @@ File warLocation = getEchoBaseApplicationContext().getConfiguration().getWarLocation(); model.setWarLocation(warLocation); } -} \ No newline at end of file +} Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Download.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Download.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Download.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Configure.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Configure.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Configure.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% @@ -114,4 +111,4 @@ model.setVoyageIds(ids.toArray(new String[ids.size()])); } } -} \ No newline at end of file +} Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Download.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Download.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Download.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% @@ -93,4 +90,4 @@ return SUCCESS; } -} \ No newline at end of file +} Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Export.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Export.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Export.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% @@ -87,4 +84,4 @@ return result; } -} \ No newline at end of file +} Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Configure.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Configure.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Configure.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Download.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Download.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Download.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Export.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Export.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Export.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 Ifremer, Codelutin * %% @@ -82,4 +80,4 @@ return result; } -} \ No newline at end of file +} Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/AbstractEditExportQuery.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/AbstractEditExportQuery.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/AbstractEditExportQuery.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/CloneExportQuery.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/CloneExportQuery.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/CloneExportQuery.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/ConfirmDeleteExportQuery.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/ConfirmDeleteExportQuery.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/ConfirmDeleteExportQuery.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/CreateNewExportQuery.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/CreateNewExportQuery.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/CreateNewExportQuery.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% @@ -96,4 +93,4 @@ @Inject protected transient ExportQueryService exportQueryService; -} \ No newline at end of file +} Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/DeleteExportQuery.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/DeleteExportQuery.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/DeleteExportQuery.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/DownloadExportQueryResult.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/DownloadExportQueryResult.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/DownloadExportQueryResult.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/EditExportQuery.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/EditExportQuery.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/EditExportQuery.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% @@ -133,4 +130,4 @@ @Inject protected transient ExportQueryService exportQueryService; -} \ No newline at end of file +} Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/ExportQueryResult.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/ExportQueryResult.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/ExportQueryResult.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/GetExportQueryResult.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/GetExportQueryResult.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/GetExportQueryResult.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/NewLibreOfficeQuery.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/NewLibreOfficeQuery.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/NewLibreOfficeQuery.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/SaveExportQuery.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/SaveExportQuery.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/SaveExportQuery.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/ShowExportQuery.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/ShowExportQuery.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/ShowExportQuery.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% @@ -99,4 +96,4 @@ @Inject protected transient ExportQueryService exportQueryService; -} \ No newline at end of file +} Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractConfigureImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractConfigureImport.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractConfigureImport.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticImport.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticImport.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesImport.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesImport.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureOperationImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureOperationImport.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureOperationImport.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -95,4 +92,4 @@ public void setGearMetadataFileFileName(String fileName) { getModel().getGearMetadataFile().setFileName(fileName); } -} \ No newline at end of file +} Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/CreateMission.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/CreateMission.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/CreateMission.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/GetDataProcessingsForVoyage.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/GetDataProcessingsForVoyage.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/GetDataProcessingsForVoyage.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -85,4 +82,4 @@ protected transient UserDbPersistenceService userDbPersistenceService; @Inject protected transient ResultsImportService resultsImportService; -} \ No newline at end of file +} Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/GetVesselsForVoyage.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/GetVesselsForVoyage.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/GetVesselsForVoyage.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -100,4 +97,4 @@ @Inject protected transient DecoratorService decoratorService; -} \ No newline at end of file +} Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMode.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMode.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMode.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L - * EchoBase :: Services - * - * $Id$ - * $HeadURL$ + * EchoBase :: UI * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAcousticImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAcousticImport.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAcousticImport.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesImport.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesImport.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonImport.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonImport.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchOperationImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchOperationImport.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchOperationImport.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -40,4 +37,4 @@ super(OperationImportConfiguration.class, OperationImportService.class); } -} \ No newline at end of file +} Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchResultsImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchResultsImport.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchResultsImport.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/SelectImportType.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/SelectImportType.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/SelectImportType.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% @@ -101,4 +98,4 @@ protected void closeAction(ImportDbConfiguration model) throws Exception { destroyModel(model); } -} \ No newline at end of file +} Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -100,4 +98,4 @@ } } -} \ No newline at end of file +} Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/Delete.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/Delete.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/Delete.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ImportLogs.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ImportLogs.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ImportLogs.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/RefreshSpatialViews.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/RefreshSpatialViews.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/RefreshSpatialViews.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/Show.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/Show.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/Show.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowMap.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowMap.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowMap.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowSpatialModel.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowSpatialModel.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowSpatialModel.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Create.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Create.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Create.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -116,4 +113,4 @@ @Inject protected transient UserService userService; -} \ No newline at end of file +} Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -102,4 +99,4 @@ @Inject protected transient UserService userService; -} \ No newline at end of file +} Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/GetUsers.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/GetUsers.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/GetUsers.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Login.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Login.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Login.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Logout.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Logout.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Logout.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -101,4 +98,4 @@ @Inject protected transient UserService userService; -} \ No newline at end of file +} Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/AbstractWorkingDbAction.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/AbstractWorkingDbAction.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/AbstractWorkingDbAction.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/AddSpatial.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/AddSpatial.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/AddSpatial.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Connect.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Connect.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Connect.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Create.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Create.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Create.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/CreatePostgresDb.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/CreatePostgresDb.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/CreatePostgresDb.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -91,4 +89,4 @@ return title; } } -} \ No newline at end of file +} Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Delete.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Delete.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Delete.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Disconnect.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Disconnect.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Disconnect.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DownloadDriver.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DownloadDriver.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DownloadDriver.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetImportLogDetail.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetImportLogDetail.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetImportLogDetail.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -87,4 +85,4 @@ protected transient DbEditorService dbEditorService; @Inject protected transient DecoratorService decoratorService; -} \ No newline at end of file +} Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetVoyage.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetVoyage.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetVoyage.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -86,4 +84,4 @@ protected transient DecoratorService decoratorService; @Inject protected transient DbEditorService dbEditorService; -} \ No newline at end of file +} Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Information.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Information.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Information.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/ShowList.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/ShowList.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/ShowList.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/AbstractCheckInterceptor.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/AbstractCheckInterceptor.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/AbstractCheckInterceptor.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckUserIsAdmin.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckUserIsAdmin.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckUserIsAdmin.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/EchoBaseInjectInterceptor.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/EchoBaseInjectInterceptor.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/EchoBaseInjectInterceptor.java 2014-03-07 23:23:32 UTC (rev 974) @@ -3,8 +3,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/EchoBaseFieldValidatorSupport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/EchoBaseFieldValidatorSupport.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/EchoBaseFieldValidatorSupport.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/LoginValidator.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/LoginValidator.java 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/LoginValidator.java 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -2,9 +2,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -2,9 +2,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -12,12 +9,10 @@ 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% Modified: trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -2,9 +2,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -12,12 +9,10 @@ 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% Modified: trunk/echobase-ui/src/main/resources/config/struts-exportMap.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-exportMap.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/config/struts-exportMap.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -2,9 +2,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -12,12 +9,10 @@ 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% Modified: trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -2,9 +2,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -12,12 +9,10 @@ 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% Modified: trunk/echobase-ui/src/main/resources/config/struts-importData.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-importData.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/config/struts-importData.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -2,9 +2,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/resources/config/struts-importDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-importDb.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/config/struts-importDb.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -2,9 +2,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -12,12 +9,10 @@ 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% Modified: trunk/echobase-ui/src/main/resources/config/struts-removeData.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-removeData.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/config/struts-removeData.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ <!-- #%L EchoBase :: UI - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2012 Ifremer, Codelutin %% @@ -10,12 +8,10 @@ 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% Modified: trunk/echobase-ui/src/main/resources/config/struts-spatial.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-spatial.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/config/struts-spatial.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -2,9 +2,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -12,12 +9,10 @@ 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% Modified: trunk/echobase-ui/src/main/resources/config/struts-user.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-user.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/config/struts-user.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -2,9 +2,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ <!-- #%L EchoBase :: UI - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2012 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/resources/echobase.properties =================================================================== --- trunk/echobase-ui/src/main/resources/echobase.properties 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/echobase.properties 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ ### # #%L # EchoBase :: UI -# -# $Id$ -# $HeadURL$ # %% # Copyright (C) 2011 Ifremer, Codelutin # %% Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable-doImport-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable-doImport-validation.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable-doImport-validation.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -33,4 +30,4 @@ </field> -</validators> \ No newline at end of file +</validators> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportMap/Configure-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportMap/Configure-validation.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportMap/Configure-validation.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -11,12 +8,10 @@ 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% @@ -37,4 +32,4 @@ </field-validator> </field> -</validators> \ No newline at end of file +</validators> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportQuery/CloneExportQuery-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportQuery/CloneExportQuery-validation.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportQuery/CloneExportQuery-validation.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -76,4 +73,4 @@ </field-validator> </field> -</validators> \ No newline at end of file +</validators> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportQuery/SaveExportQuery-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportQuery/SaveExportQuery-validation.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportQuery/SaveExportQuery-validation.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -77,4 +74,4 @@ </field> -</validators> \ No newline at end of file +</validators> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticImport-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticImport-validation.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticImport-validation.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -11,12 +8,10 @@ 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% @@ -134,4 +129,4 @@ </field-validator> </field> -</validators> \ No newline at end of file +</validators> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesImport-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesImport-validation.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesImport-validation.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -11,12 +8,10 @@ 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% @@ -38,4 +33,4 @@ </field-validator> </field> -</validators> \ No newline at end of file +</validators> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeAll-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeAll-validation.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeAll-validation.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -11,12 +8,10 @@ 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% @@ -95,4 +90,4 @@ </field-validator> </field> -</validators> \ No newline at end of file +</validators> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeTransect-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeTransect-validation.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeTransect-validation.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -11,12 +8,10 @@ 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% @@ -63,4 +58,4 @@ </field-validator> </field> -</validators> \ No newline at end of file +</validators> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeTransit-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeTransit-validation.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeTransit-validation.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -11,12 +8,10 @@ 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% @@ -44,4 +39,4 @@ </field-validator> </field> -</validators> \ No newline at end of file +</validators> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeVoyage-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeVoyage-validation.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeVoyage-validation.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -11,12 +8,10 @@ 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% @@ -56,4 +51,4 @@ </field-validator> </field> -</validators> \ No newline at end of file +</validators> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureOperationImport-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureOperationImport-validation.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureOperationImport-validation.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -2,9 +2,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2012 Ifremer, Codelutin %% @@ -56,4 +53,4 @@ </field-validator> </field> -</validators> \ No newline at end of file +</validators> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeEsdu-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeEsdu-validation.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeEsdu-validation.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -11,12 +8,10 @@ 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% @@ -50,4 +45,4 @@ </field-validator> </field> -</validators> \ No newline at end of file +</validators> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeMapFish-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeMapFish-validation.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeMapFish-validation.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -11,12 +8,10 @@ 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% @@ -44,4 +39,4 @@ </field-validator> </field> -</validators> \ No newline at end of file +</validators> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeMapOther-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeMapOther-validation.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeMapOther-validation.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -11,12 +8,10 @@ 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% @@ -44,4 +39,4 @@ </field-validator> </field> -</validators> \ No newline at end of file +</validators> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeRegion-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeRegion-validation.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeRegion-validation.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -11,12 +8,10 @@ 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% @@ -58,4 +53,4 @@ </field-validator> </field> -</validators> \ No newline at end of file +</validators> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeVoyage-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeVoyage-validation.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeVoyage-validation.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -11,12 +8,10 @@ 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% @@ -38,4 +33,4 @@ </field-validator> </field> -</validators> \ No newline at end of file +</validators> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/CreateMission-createMission-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/CreateMission-createMission-validation.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/CreateMission-createMission-validation.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -2,9 +2,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2012 Ifremer, Codelutin %% @@ -41,4 +38,4 @@ </field-validator> </field> -</validators> \ No newline at end of file +</validators> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-validation.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-validation.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -11,12 +8,10 @@ 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% @@ -36,4 +31,4 @@ </field-validator> </field> -</validators> \ No newline at end of file +</validators> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/Login-login-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/Login-login-validation.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/Login-login-validation.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/resources/log4j.properties =================================================================== --- trunk/echobase-ui/src/main/resources/log4j.properties 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/log4j.properties 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ ### # #%L # EchoBase :: UI -# $Id$ -# $HeadURL$ # %% # Copyright (C) 2011 - 2013 Ifremer, Codelutin # %% Modified: trunk/echobase-ui/src/main/resources/struts.xml =================================================================== --- trunk/echobase-ui/src/main/resources/struts.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/struts.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -2,9 +2,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/resources/template/css_xhtml/checkbox.ftl =================================================================== --- trunk/echobase-ui/src/main/resources/template/css_xhtml/checkbox.ftl 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/template/css_xhtml/checkbox.ftl 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <#-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/resources/template/css_xhtml/controlheader-core.ftl =================================================================== --- trunk/echobase-ui/src/main/resources/template/css_xhtml/controlheader-core.ftl 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/template/css_xhtml/controlheader-core.ftl 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <#-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/resources/template/css_xhtml/label_with_no_space.ftl =================================================================== --- trunk/echobase-ui/src/main/resources/template/css_xhtml/label_with_no_space.ftl 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/template/css_xhtml/label_with_no_space.ftl 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ <#-- #%L EchoBase :: UI - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2013 Ifremer, Codelutin, Tony Chemit %% @@ -42,4 +40,4 @@ <@s.property value="parameters.nameValue"/><#t/> </#if> </label> -<#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" /> \ No newline at end of file +<#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" /> Modified: trunk/echobase-ui/src/main/resources/template/css_xhtml/myradiomap.ftl =================================================================== --- trunk/echobase-ui/src/main/resources/template/css_xhtml/myradiomap.ftl 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/template/css_xhtml/myradiomap.ftl 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <#-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2012 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/resources/template/simple/myradiomap.ftl =================================================================== --- trunk/echobase-ui/src/main/resources/template/simple/myradiomap.ftl 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/template/simple/myradiomap.ftl 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <#-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2012 Ifremer, Codelutin %% @@ -96,4 +93,4 @@ </label> </li> </(a)s.iterator> -</ul> \ No newline at end of file +</ul> Modified: trunk/echobase-ui/src/main/resources/template/themes/echobase-theme/jquery-ui.css =================================================================== --- trunk/echobase-ui/src/main/resources/template/themes/echobase-theme/jquery-ui.css 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/template/themes/echobase-theme/jquery-ui.css 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/resources/validators.xml =================================================================== --- trunk/echobase-ui/src/main/resources/validators.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/resources/validators.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -2,9 +2,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/decorators/layout-default.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/decorators.xml =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/decorators.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/decorators.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/actionResult.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/actionResult.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/actionResult.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/i18n.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/i18n.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/i18n.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/metas.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/metas.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/metas.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/csvImportResult.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/csvImportResult.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/csvImportResult.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ <%-- #%L EchoBase :: UI - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -401,4 +399,4 @@ $('.showAtLoad').removeClass('showAtLoad').removeClass('hidden').show(); }); -</script> \ No newline at end of file +</script> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/foreignEntities.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/foreignEntities.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/foreignEntities.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -22,4 +19,4 @@ #L% --%> <%@ taglib prefix="s" uri="/struts-tags" %> -<s:select list="entities" theme="simple"/> \ No newline at end of file +<s:select list="entities" theme="simple"/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/configure.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/configure.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/progress.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/progress.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/progress.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -38,4 +35,4 @@ <div> <sj:progressbar value="%{model.progress}"/> -</div> \ No newline at end of file +</div> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/result.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/result.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/result.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/progress.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/progress.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/progress.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -37,4 +34,4 @@ <div> <sj:progressbar value="%{model.progress}"/> -</div> \ No newline at end of file +</div> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/result.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/result.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/result.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/configure.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/configure.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -11,12 +8,10 @@ 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% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/progress.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/progress.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/progress.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -11,12 +8,10 @@ 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% @@ -36,4 +31,4 @@ <div> <sj:progressbar value="%{model.progress}"/> -</div> \ No newline at end of file +</div> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/result.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/result.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/result.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -11,12 +8,10 @@ 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% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/confirmDelete.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/confirmDelete.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/confirmDelete.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2012 Ifremer, Codelutin %% @@ -72,4 +69,4 @@ </s:form> </fieldset> -</div> \ No newline at end of file +</div> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQuery.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQuery.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQuery.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQueryResult.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQueryResult.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQueryResult.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/newLibreOfficeQuery.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/newLibreOfficeQuery.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/newLibreOfficeQuery.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -11,12 +8,10 @@ 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% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -54,4 +51,4 @@ </li> </ul> </fieldset> -</div> \ No newline at end of file +</div> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -76,4 +73,4 @@ <s:submit action="configureCatches-execute" key='echobase.action.import'/> -</s:form> \ No newline at end of file +</s:form> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -250,4 +247,4 @@ <s:submit action="configureCommon-modeTransect" key='echobase.action.import'/> -</s:form> \ No newline at end of file +</s:form> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -67,4 +64,4 @@ <br/> <s:submit action="configureOperation-execute" key='echobase.action.import'/> -</s:form> \ No newline at end of file +</s:form> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -256,4 +253,4 @@ </fieldset> <br/> <s:submit action="configureResults-modeMapOther" key='echobase.action.import'/> -</s:form> \ No newline at end of file +</s:form> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/createMission.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/createMission.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/createMission.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -90,4 +87,4 @@ <s:submit action="createMission" key='echobase.action.createMission'/> -</s:form> \ No newline at end of file +</s:form> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAcousticImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAcousticImport.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAcousticImport.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2012 Ifremer, Codelutin %% @@ -40,4 +37,4 @@ <div> <sj:progressbar value="%{model.progress}"/> -</div> \ No newline at end of file +</div> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesImport.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesImport.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2012 Ifremer, Codelutin %% @@ -40,4 +37,4 @@ <div> <sj:progressbar value="%{model.progress}"/> -</div> \ No newline at end of file +</div> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonImport.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonImport.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2012 Ifremer, Codelutin %% @@ -40,4 +37,4 @@ <div> <sj:progressbar value="%{model.progress}"/> -</div> \ No newline at end of file +</div> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressOperationImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressOperationImport.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressOperationImport.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2012 Ifremer, Codelutin %% @@ -40,4 +37,4 @@ <div> <sj:progressbar value="%{model.progress}"/> -</div> \ No newline at end of file +</div> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressResultsImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressResultsImport.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressResultsImport.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2012 Ifremer, Codelutin %% @@ -40,4 +37,4 @@ <div> <sj:progressbar value="%{model.progress}"/> -</div> \ No newline at end of file +</div> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAcousticImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAcousticImport.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAcousticImport.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesImport.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesImport.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCommonImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCommonImport.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCommonImport.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -28,4 +25,4 @@ <s:text name="echobase.common.importType.common"/> </title> -<%@ include file="/WEB-INF/includes/actionResult.jsp" %> \ No newline at end of file +<%@ include file="/WEB-INF/includes/actionResult.jsp" %> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultOperationImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultOperationImport.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultOperationImport.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultResultsImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultResultsImport.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultResultsImport.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/selectImportType.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/selectImportType.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/selectImportType.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -59,4 +56,4 @@ <s:submit action="selectImportType" key='echobase.action.configureImport' align="right"/> -</s:form> \ No newline at end of file +</s:form> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/progress.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/progress.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/progress.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -37,4 +34,4 @@ <div> <sj:progressbar value="%{model.progress}"/> -</div> \ No newline at end of file +</div> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/result.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/result.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/result.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/confirmDelete.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/confirmDelete.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/confirmDelete.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ <%-- #%L EchoBase :: UI - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2012 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/deleteProgress.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/deleteProgress.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/deleteProgress.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -37,4 +34,4 @@ <div> <sj:progressbar value="%{model.progress}"/> -</div> \ No newline at end of file +</div> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/deleteResult.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/deleteResult.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/deleteResult.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/importLogs.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/importLogs.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/importLogs.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ <%-- #%L EchoBase :: UI - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -105,4 +103,4 @@ onclick="return checkOneRowSelected();" key="echobase.action.delete.selectedImport"/> -</s:form> \ No newline at end of file +</s:form> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/show.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/show.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/show.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ <%-- #%L EchoBase :: UI - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2013 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/showMap.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/showMap.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/showMap.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ <%-- #%L EchoBase :: UI - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2013 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Create.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Create.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Create.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Delete.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Delete.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Delete.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Update.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Update.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Update.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ <%-- #%L EchoBase :: UI - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/confirmDelete.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/confirmDelete.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/confirmDelete.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ <%-- #%L EchoBase :: UI - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2012 Ifremer, Codelutin %% @@ -67,4 +65,4 @@ </s:form> </fieldset> -</div> \ No newline at end of file +</div> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ <%-- #%L EchoBase :: UI - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/information.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/information.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/information.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ <%-- #%L EchoBase :: UI - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/manage.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/manage.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/manage.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ <%-- #%L EchoBase :: UI - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2012 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/modifications.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/modifications.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/modifications.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ <%-- #%L EchoBase :: UI - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/web.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/web.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -2,9 +2,6 @@ <!-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/css/screen.css =================================================================== --- trunk/echobase-ui/src/main/webapp/css/screen.css 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/css/screen.css 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% @@ -765,4 +762,4 @@ border: 2px solid white; } -#errorStack { padding:5px; width:80%; overflow:auto; } \ No newline at end of file +#errorStack { padding:5px; width:80%; overflow:auto; } Modified: trunk/echobase-ui/src/main/webapp/index.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/index.jsp 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/index.jsp 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ <%-- #%L EchoBase :: UI - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/echobase-ui/src/main/webapp/js/gridHelper.js =================================================================== --- trunk/echobase-ui/src/main/webapp/js/gridHelper.js 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/js/gridHelper.js 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ /* * #%L * EchoBase :: UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/webapp/js/leaflet-src.js =================================================================== --- trunk/echobase-ui/src/main/webapp/js/leaflet-src.js 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/js/leaflet-src.js 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/webapp/js/spatial.js =================================================================== --- trunk/echobase-ui/src/main/webapp/js/spatial.js 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/js/spatial.js 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/webapp/js/test.js =================================================================== --- trunk/echobase-ui/src/main/webapp/js/test.js 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/echobase-ui/src/main/webapp/js/test.js 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ /* * #%L * EchoBase :: UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 Ifremer, Codelutin * %% @@ -64,4 +62,4 @@ [-87.359296, 35.00118] ] ]}} - ]}; \ No newline at end of file + ]}; Modified: trunk/src/site/en/resources/echobase.properties =================================================================== --- trunk/src/site/en/resources/echobase.properties 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/src/site/en/resources/echobase.properties 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ ### # #%L # EchoBase -# -# $Id$ -# $HeadURL$ # %% # Copyright (C) 2011 Ifremer, Codelutin # %% Modified: trunk/src/site/en/rst/db.rst =================================================================== --- trunk/src/site/en/rst/db.rst 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/src/site/en/rst/db.rst 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ .. - .. * #%L .. * EchoBase -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 - 2012 Ifremer, Codelutin .. * %% Modified: trunk/src/site/en/rst/embedded.rst =================================================================== --- trunk/src/site/en/rst/embedded.rst 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/src/site/en/rst/embedded.rst 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ .. - .. * #%L .. * EchoBase -.. * -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 Ifremer, Codelutin .. * %% @@ -11,12 +8,12 @@ .. * 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% Modified: trunk/src/site/en/rst/exportData.rst =================================================================== --- trunk/src/site/en/rst/exportData.rst 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/src/site/en/rst/exportData.rst 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ .. - .. * #%L .. * EchoBase -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 - 2012 Ifremer, Codelutin .. * %% @@ -56,4 +54,4 @@ Pour ce faire il faut utiliser l'action Importer depuis Libre Office et y coller le code SQL généré dans Libre Office. -Le code SQL sera processé et mis à jour dans votre requête SQL EchoBase. \ No newline at end of file +Le code SQL sera processé et mis à jour dans votre requête SQL EchoBase. Modified: trunk/src/site/en/rst/exportDb.rst =================================================================== --- trunk/src/site/en/rst/exportDb.rst 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/src/site/en/rst/exportDb.rst 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ .. - .. * #%L .. * EchoBase -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 - 2012 Ifremer, Codelutin .. * %% Modified: trunk/src/site/en/rst/importData.rst =================================================================== --- trunk/src/site/en/rst/importData.rst 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/src/site/en/rst/importData.rst 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ .. - .. * #%L .. * EchoBase -.. * -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 - 2012 Ifremer, Codelutin .. * %% Modified: trunk/src/site/en/rst/importDb.rst =================================================================== --- trunk/src/site/en/rst/importDb.rst 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/src/site/en/rst/importDb.rst 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ .. - .. * #%L .. * EchoBase -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 - 2012 Ifremer, Codelutin .. * %% Modified: trunk/src/site/en/rst/index.rst =================================================================== --- trunk/src/site/en/rst/index.rst 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/src/site/en/rst/index.rst 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ .. - .. * #%L .. * EchoBase -.. * -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 Ifremer, Codelutin .. * %% Modified: trunk/src/site/en/rst/install.rst =================================================================== --- trunk/src/site/en/rst/install.rst 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/src/site/en/rst/install.rst 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ .. - .. * #%L .. * EchoBase -.. * -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 Ifremer, Codelutin .. * %% Modified: trunk/src/site/en/rst/model.rst =================================================================== --- trunk/src/site/en/rst/model.rst 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/src/site/en/rst/model.rst 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ .. - .. * #%L -.. * echobase -.. * -.. * $Id$ -.. * $HeadURL$ +.. * EchoBase .. * %% .. * Copyright (C) 2011 Ifremer, Codelutin .. * %% Modified: trunk/src/site/en/rst/modifyData.rst =================================================================== --- trunk/src/site/en/rst/modifyData.rst 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/src/site/en/rst/modifyData.rst 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ .. - .. * #%L .. * EchoBase -.. * -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 - 2012 Ifremer, Codelutin .. * %% Modified: trunk/src/site/en/rst/removeData.rst =================================================================== --- trunk/src/site/en/rst/removeData.rst 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/src/site/en/rst/removeData.rst 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ .. - .. * #%L .. * EchoBase -.. * -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 - 2012 Ifremer, Codelutin .. * %% @@ -11,12 +8,12 @@ .. * 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% @@ -228,4 +225,4 @@ Imports à retirer ~~~~~~~~~~~~~~~~~ -Aucun sous import possible à retirer. \ No newline at end of file +Aucun sous import possible à retirer. Modified: trunk/src/site/resources/echobase.properties =================================================================== --- trunk/src/site/resources/echobase.properties 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/src/site/resources/echobase.properties 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ ### # #%L # EchoBase -# -# $Id$ -# $HeadURL$ # %% # Copyright (C) 2011 Ifremer, Codelutin # %% Modified: trunk/src/site/rst/db.rst =================================================================== --- trunk/src/site/rst/db.rst 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/src/site/rst/db.rst 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ .. - .. * #%L .. * EchoBase -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 - 2012 Ifremer, Codelutin .. * %% Modified: trunk/src/site/rst/embedded.rst =================================================================== --- trunk/src/site/rst/embedded.rst 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/src/site/rst/embedded.rst 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ .. - .. * #%L .. * EchoBase -.. * -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 Ifremer, Codelutin .. * %% @@ -11,12 +8,12 @@ .. * 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% Modified: trunk/src/site/rst/exportData.rst =================================================================== --- trunk/src/site/rst/exportData.rst 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/src/site/rst/exportData.rst 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ .. - .. * #%L .. * EchoBase -.. * -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 - 2012 Ifremer, Codelutin .. * %% @@ -56,4 +53,4 @@ Pour ce faire il faut utiliser l'action Importer depuis Libre Office et y coller le code SQL généré dans Libre Office. -Le code SQL sera processé et mis à jour dans votre requête SQL EchoBase. \ No newline at end of file +Le code SQL sera processé et mis à jour dans votre requête SQL EchoBase. Modified: trunk/src/site/rst/exportDb.rst =================================================================== --- trunk/src/site/rst/exportDb.rst 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/src/site/rst/exportDb.rst 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ .. - .. * #%L .. * EchoBase -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 - 2012 Ifremer, Codelutin .. * %% Modified: trunk/src/site/rst/importData.rst =================================================================== --- trunk/src/site/rst/importData.rst 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/src/site/rst/importData.rst 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ .. - .. * #%L .. * EchoBase -.. * -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 | 2012 |Ifremer, Codelutin| .. * %% @@ -1107,4 +1104,4 @@ :: voyage;name;gridCellLongitude;gridCellLatitude;gridCellDepth;gridLongitudeLag;gridLatitudeLag;gridDepthLag;KrigedXe;dataQuality - PELGAS2011;-6 43.5 0;-6;43.5;0;0.25;0.25;0;0;1 \ No newline at end of file + PELGAS2011;-6 43.5 0;-6;43.5;0;0.25;0.25;0;0;1 Modified: trunk/src/site/rst/importDb.rst =================================================================== --- trunk/src/site/rst/importDb.rst 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/src/site/rst/importDb.rst 2014-03-07 23:23:32 UTC (rev 974) @@ -1,8 +1,6 @@ .. - .. * #%L .. * EchoBase -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 - 2012 Ifremer, Codelutin .. * %% Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/src/site/rst/index.rst 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ .. - .. * #%L .. * EchoBase -.. * -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 Ifremer, Codelutin .. * %% Modified: trunk/src/site/rst/model.rst =================================================================== --- trunk/src/site/rst/model.rst 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/src/site/rst/model.rst 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ .. - .. * #%L -.. * echobase -.. * -.. * $Id$ -.. * $HeadURL$ +.. * EchoBase .. * %% .. * Copyright (C) 2011 Ifremer, Codelutin .. * %% Modified: trunk/src/site/rst/modifyData.rst =================================================================== --- trunk/src/site/rst/modifyData.rst 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/src/site/rst/modifyData.rst 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ .. - .. * #%L .. * EchoBase -.. * -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 - 2012 Ifremer, Codelutin .. * %% Modified: trunk/src/site/rst/removeData.rst =================================================================== --- trunk/src/site/rst/removeData.rst 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/src/site/rst/removeData.rst 2014-03-07 23:23:32 UTC (rev 974) @@ -1,9 +1,6 @@ .. - .. * #%L .. * EchoBase -.. * -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 - 2012 Ifremer, Codelutin .. * %% @@ -11,12 +8,12 @@ .. * 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% @@ -300,4 +297,4 @@ Imports à retirer ~~~~~~~~~~~~~~~~~ -Aucun sous import possible à retirer. \ No newline at end of file +Aucun sous import possible à retirer. Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/src/site/site_en.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -2,9 +2,6 @@ <!-- #%L EchoBase - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2014-03-07 23:16:42 UTC (rev 973) +++ trunk/src/site/site_fr.xml 2014-03-07 23:23:32 UTC (rev 974) @@ -2,9 +2,6 @@ <!-- #%L EchoBase - - $Id$ - $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %%

1 0

r973 - in trunk: echobase-domain/src/main/java/fr/ifremer/echobase/entities/references echobase-services echobase-services/src/main/java/fr/ifremer/echobase/services/service echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportMap echobase-ui/src/main/resources/i18n echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap
by tchemit＠users.forge.codelutin.com March 7, 2014

March 7, 2014

Author: tchemit Date: 2014-03-08 00:16:42 +0100 (Sat, 08 Mar 2014) New Revision: 973 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/973 Log: refs-30 #2931 Do species export Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesImpl.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/SpeciesExportModel.java Modified: trunk/echobase-services/pom.xml trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapService.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Configure.java trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportMap/Configure-validation.xml trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/configure.jsp Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesImpl.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesImpl.java (rev 0) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesImpl.java 2014-03-07 23:16:42 UTC (rev 973) @@ -0,0 +1,11 @@ +package fr.ifremer.echobase.entities.references; + +public class SpeciesImpl extends SpeciesAbstract { + + private static final long serialVersionUID = 1L; + + // used for coser species export + public String getTaxaCode() { + return ""; + } +} Property changes on: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2014-03-07 23:12:58 UTC (rev 972) +++ trunk/echobase-services/pom.xml 2014-03-07 23:16:42 UTC (rev 973) @@ -99,6 +99,11 @@ </dependency> <dependency> + <groupId>fr.ifremer.coser</groupId> + <artifactId>coser-business</artifactId> + </dependency> + + <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> </dependency> Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java 2014-03-07 23:12:58 UTC (rev 972) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java 2014-03-07 23:16:42 UTC (rev 973) @@ -582,9 +582,14 @@ } //------------------------------------------------------------------------// - //--- SpeciesCategory ----------------------------------------------------// + //--- Species ------------------------------------------------------------// //------------------------------------------------------------------------// + public List<Species> getSpecies() { + List<Species> species = persistenceContext.getSpeciesDao().findAll(); + return species; + } + public Optional<Species> getOptionalSpecies(String id) { Species species = persistenceContext.getSpeciesDao().findByTopiaId( id); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapConfiguration.java 2014-03-07 23:12:58 UTC (rev 972) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapConfiguration.java 2014-03-07 23:16:42 UTC (rev 973) @@ -59,7 +59,7 @@ /** * Id of voyage to export. */ - private String voyageId; + private String missionId; private JdbcConfiguration dbConfiguration; @@ -94,12 +94,12 @@ this.exportFile = exportFile; } - public String getVoyageId() { - return voyageId; + public String getMissionId() { + return missionId; } - public void setVoyageId(String voyageId) { - this.voyageId = voyageId; + public void setMissionId(String missionId) { + this.missionId = missionId; } public JdbcConfiguration getDbConfiguration() { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapService.java 2014-03-07 23:12:58 UTC (rev 972) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapService.java 2014-03-07 23:16:42 UTC (rev 973) @@ -23,15 +23,24 @@ * #L% */ +import com.google.common.base.Preconditions; +import fr.ifremer.coser.bean.EchoBaseProject; +import fr.ifremer.echobase.EchoBaseTechnicalException; +import fr.ifremer.echobase.entities.references.Mission; import fr.ifremer.echobase.io.EchoBaseIOUtil; import fr.ifremer.echobase.persistence.JdbcConfiguration; import fr.ifremer.echobase.services.EchoBaseServiceSupport; +import fr.ifremer.echobase.services.service.UserDbPersistenceService; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.csv.Export; import org.nuiton.util.FileUtil; import org.nuiton.util.TimeLog; +import javax.inject.Inject; import java.io.File; +import java.io.FilenameFilter; import java.io.IOException; /** @@ -47,41 +56,99 @@ public static final TimeLog timeLog = new TimeLog(ExportMapService.class); + @Inject + private UserDbPersistenceService persistenceService; + public void doExport(ExportMapConfiguration model) throws IOException { - String fileName = model.getFileName(); + Preconditions.checkNotNull(model); + Preconditions.checkNotNull(model.getFileName()); + Preconditions.checkNotNull(model.getDbConfiguration()); + Preconditions.checkNotNull(model.getMissionId()); + // compute nb steps (invoke EchoR + create archive tree + + int nbSteps = 3; + + if (log.isInfoEnabled()) { + log.info("NB steps: " + nbSteps); + } + model.setNbSteps(nbSteps); + + Mission mission = persistenceService.getMission(model.getMissionId()); + Preconditions.checkNotNull(mission); + + String missionName = mission.getName(); + File tempDirectory = model.getWorkingDirectory(); + File echoRBaseDir = new File(tempDirectory, "EchoR"); + FileUtil.createDirectoryIfNecessary(echoRBaseDir); - File zipFile = new File(tempDirectory, fileName + ".zip"); + // 1 - invoke EchoR + invokeEchoR(echoRBaseDir, model.getDbConfiguration(), missionName); + model.incrementsProgress(); + + // 2 - create archive tree + File archiveBaseDir = new File(tempDirectory, "echobase"); + FileUtil.createDirectoryIfNecessary(archiveBaseDir); if (log.isInfoEnabled()) { - log.info("Will export map to " + zipFile); + log.info("Will store maps in " + archiveBaseDir); } - model.setExportFile(zipFile); - File dir = new File(tempDirectory, "echobase"); + createArchiveContent(archiveBaseDir, echoRBaseDir, missionName); - FileUtil.createDirectoryIfNecessary(dir); + model.incrementsProgress(); + + // 3 - create archive + + String fileName = model.getFileName(); + File zipFile = new File(tempDirectory, fileName + ".zip"); + if (log.isInfoEnabled()) { - log.info("Will store maps in " + dir); + log.info("Will export map to " + zipFile); } + model.setExportFile(zipFile); + EchoBaseIOUtil.compressZipFile(zipFile, archiveBaseDir); + } - JdbcConfiguration dbConfiguration = model.getDbConfiguration(); + protected void invokeEchoR(File dir, JdbcConfiguration dbConfiguration, String missionName) { if (log.isInfoEnabled()) { + log.info("Will invoke EchoR on mission: " + missionName); log.info("Will connect to db: " + dbConfiguration.getUrl()); } + } - // compute nb steps - int nbSteps = 0; + protected void createArchiveContent(File archiveBaseDir, File echoRBaseDir, String missionName) throws IOException { - if (log.isInfoEnabled()) { - log.info("NB steps: " + nbSteps); + EchoBaseProject coserProject = new EchoBaseProject(archiveBaseDir); + + coserProject.setFacadeName("Atlantique"); + coserProject.setZoneName("gdgciem8"); + coserProject.setAuthor("EchoBase"); + coserProject.setComment("Created by Echobase application (db: " + getUserDbUrl() + ")"); + + coserProject.save(); + + File mapDir = coserProject.getMapsDirectory(); + + FileUtil.createDirectoryIfNecessary(mapDir); + + FilenameFilter filter = EchoBaseProject.newMapSpeciesFilenameFilter(missionName); + + // files are in echoRBaseDir-meanMaps + // copy all of them in mapDir + File[] files = new File(echoRBaseDir, "invoke-meanMaps").listFiles(filter); + for (File file : files) { + FileUtils.copyFileToDirectory(file, mapDir); } - model.setNbSteps(nbSteps); - // TODO Export - - EchoBaseIOUtil.compressZipFile(zipFile, dir); + // create species.csv + File speciesFile = coserProject.getSpeciesDefinitionFile(); + SpeciesExportModel speciesExportModel = new SpeciesExportModel(getCsvSeparator()); + try { + Export.exportToFile(speciesExportModel, persistenceService.getSpecies(), speciesFile); + } catch (Exception e) { + throw new EchoBaseTechnicalException("Could not export species list to " + speciesFile, e); + } } } Added: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/SpeciesExportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/SpeciesExportModel.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/SpeciesExportModel.java 2014-03-07 23:16:42 UTC (rev 973) @@ -0,0 +1,26 @@ +package fr.ifremer.echobase.services.service.exportMap; + +import fr.ifremer.echobase.entities.references.Species; +import org.nuiton.csv.ext.AbstractExportModel; + +/** + * Created on 3/5/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since XXX + */ +public class SpeciesExportModel extends AbstractExportModel<Species> { + + public SpeciesExportModel(char separator) { + super(separator); + newColumnForExport(Species.PROPERTY_TAXON_CODE, "C_Perm"); + newColumnForExport(Species.PROPERTY_TAXON_SYSTEMATIC_ORDER, "NumSys"); + newColumnForExport(Species.PROPERTY_TAXON_SYSTEMATIC_LEVEL, "NivSys"); + newColumnForExport(Species.PROPERTY_CODE_MEMO, "C_VALIDE"); + newColumnForExport(Species.PROPERTY_GENUS_SPECIES, "L_VALIDE"); + newColumnForExport(Species.PROPERTY_AUTHOR_REFERENCE, "AA_VALIDE"); + newColumnForExport(Species.PROPERTY_TAXON_FATHER_MEMOCODE, "C_TxPère"); + newColumnForExport("taxaCode", "Taxa"); + } + +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/SpeciesExportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Configure.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Configure.java 2014-03-07 23:12:58 UTC (rev 972) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Configure.java 2014-03-07 23:16:42 UTC (rev 973) @@ -23,7 +23,7 @@ * #L% */ -import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.Mission; import fr.ifremer.echobase.persistence.JdbcConfiguration; import fr.ifremer.echobase.services.service.exportMap.ExportMapConfiguration; import fr.ifremer.echobase.ui.EchoBaseSession; @@ -51,14 +51,14 @@ private static final Log log = LogFactory.getLog(Configure.class); /** Universe of voyages to export in db. */ - protected Map<String, String> voyages; + protected Map<String, String> missions; public Configure() { super(ExportMapConfiguration.class); } - public Map<String, String> getVoyages() { - return voyages; + public Map<String, String> getMissions() { + return missions; } public void setFileName(String fileName) { @@ -79,7 +79,7 @@ @Override protected void prepareInputAction(ExportMapConfiguration model) { - voyages = userDbPersistenceService.loadSortAndDecorate(Voyage.class); + missions = userDbPersistenceService.loadSortAndDecorate(Mission.class); } @Override @@ -95,6 +95,6 @@ log.info("Temporary directory to use : " + dataDirectory); } - voyages = userDbPersistenceService.loadSortAndDecorate(Voyage.class); + missions = userDbPersistenceService.loadSortAndDecorate(Mission.class); } } Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportMap/Configure-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportMap/Configure-validation.xml 2014-03-07 23:12:58 UTC (rev 972) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportMap/Configure-validation.xml 2014-03-07 23:16:42 UTC (rev 973) @@ -25,9 +25,9 @@ "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> - <field name="model.voyageId"> + <field name="model.missionId"> <field-validator type="requiredstring"> - <message key="echobase.error.exportMap.voyage.required"/> + <message key="echobase.error.exportMap.mission.required"/> </field-validator> </field> Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2014-03-07 23:12:58 UTC (rev 972) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2014-03-07 23:16:42 UTC (rev 973) @@ -169,7 +169,7 @@ echobase.error.export.sqlQuery.forbidden.update.word=La requète contient le mot 'UPDATE', ce qui est interdit echobase.error.export.sqlQuery.requiredstring=La requète de l'export est obligatoire echobase.error.exportMap.filename.required=Export filename required -echobase.error.exportMap.voyage.required=No voyage selected +echobase.error.exportMap.mission.required=No mission selected echobase.error.import.acousticDensityUnit.required=acousticDensityUnit non renseigné echobase.error.import.acquisitionSoftwareVersionER60.required=acquisitionSoftwareVersionER60 non renseigné echobase.error.import.acquisitionSoftwareVersionME70.required=acquisitionSoftwareVersionME70 non renseigné Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2014-03-07 23:12:58 UTC (rev 972) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2014-03-07 23:16:42 UTC (rev 973) @@ -169,7 +169,7 @@ echobase.error.export.sqlQuery.forbidden.update.word=La requète contient le mot 'UPDATE', ce qui est interdit echobase.error.export.sqlQuery.requiredstring=La requète de l'export est obligatoire echobase.error.exportMap.filename.required=Le nom d'un fichier d'export est obligatoire -echobase.error.exportMap.voyage.required=La sélection d'une campagne est obligatoire +echobase.error.exportMap.mission.required=La sélection d'une série est obligatoire echobase.error.import.acousticDensityUnit.required=acousticDensityUnit non renseigné echobase.error.import.acquisitionSoftwareVersionER60.required=acquisitionSoftwareVersionER60 non renseigné echobase.error.import.acquisitionSoftwareVersionME70.required=acquisitionSoftwareVersionME70 non renseigné @@ -321,7 +321,7 @@ echobase.legend.embeddedApplication.configuration=Configuration de l'application embarquée echobase.legend.exportDb.configuration.files=Configuration de l'export echobase.legend.exportDb.resume=Résumé de l'export de base -echobase.legend.exportMap.resume=Résumé de l'export des cartes d'une campagne +echobase.legend.exportMap.resume=Résumé de l'export des cartes echobase.legend.importData.configuration.selectImportType=Sélection du type d'import echobase.legend.importData.configure=Configurer l'import echobase.legend.importData.createMission=Caractéristiques de la mission @@ -343,7 +343,7 @@ echobase.menu.editData=Modifier les données echobase.menu.export=Exporter des données echobase.menu.exportDb=Exporter une base -echobase.menu.exportMap=Exporter les cartes d'une campagne +echobase.menu.exportMap=Exporter les cartes echobase.menu.importData=Importer des données echobase.menu.importDb=Importer une base echobase.menu.logs=Journal des modifications @@ -384,9 +384,9 @@ echobase.title.exportDb=Export complet de la base echobase.title.exportDbProgress=Export de la base de données en cours echobase.title.exportDbResult=Résultats de l'export de la base de données -echobase.title.exportMap=Export des cartes d'une campagne -echobase.title.exportMapProgress=Export des cartes d'une campagne en cours -echobase.title.exportMapResult=Résultats de l'export des cartes d'une campagne +echobase.title.exportMap=Export des cartes +echobase.title.exportMapProgress=Export des cartes en cours +echobase.title.exportMapResult=Résultats de l'export des cartes echobase.title.exportTable=Exporter une table echobase.title.importData.selectImportType=Sélection du type d'import echobase.title.importDb=Import d'une base Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/configure.jsp 2014-03-07 23:12:58 UTC (rev 972) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/configure.jsp 2014-03-07 23:16:42 UTC (rev 973) @@ -46,9 +46,9 @@ </div> <br/> - <s:select key="model.voyageId" requiredLabel="true" - label='%{getText("echobase.common.voyage")}' - list="voyages" headerKey="" headerValue=""/> + <s:select key="model.missionId" requiredLabel="true" + label='%{getText("echobase.common.mission")}' + list="missions" headerKey="" headerValue=""/> <div class="cleanBoth"></div> <br/>

1 0

r972 - trunk
by tchemit＠users.forge.codelutin.com March 7, 2014

March 7, 2014

Author: tchemit Date: 2014-03-08 00:12:58 +0100 (Sat, 08 Mar 2014) New Revision: 972 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/972 Log: revert struts version (some trouble with jquery plugins) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-04 08:24:07 UTC (rev 971) +++ trunk/pom.xml 2014-03-07 23:12:58 UTC (rev 972) @@ -143,7 +143,9 @@ <nuitonI18nVersion>3.0</nuitonI18nVersion> <nuitonWebVersion>1.15-SNAPSHOT</nuitonWebVersion> <struts2Version>2.3.16</struts2Version> + <struts2Version>2.3.15.3</struts2Version> <jqueryPluginVersion>3.7.0</jqueryPluginVersion> + <jqueryPluginVersion>3.6.1</jqueryPluginVersion> <h2Version>1.3.175</h2Version> <postgresqlVersion>9.3-1101-jdbc41</postgresqlVersion> <slf4jVersion>1.7.6</slf4jVersion> @@ -178,6 +180,12 @@ <dependencyManagement> <dependencies> + <dependency> + <groupId>fr.ifremer.coser</groupId> + <artifactId>coser-business</artifactId> + <version>1.5-SNAPSHOT</version> + </dependency> +  <dependency>

1 0

Build failed in Jenkins: echobase-nightly #12
by admin+ci-codelutin.com＠codelutin.com March 4, 2014

March 4, 2014

See <http://ci.codelutin.com/jenkins/job/echobase-nightly/12/changes> Changes: [Tony CHEMIT] refs #2931: Export de cartes au format image vers le site des indicateurs ------------------------------------------ [...truncated 2501 lines...] INSERT INTO datametadata (topiaId,topiaversion, topiacreatedate, addOffset, comment, fillValue, longName, name, scaleFactor, units, validMax, validMin) VALUES('fr.ifremer.echobase.entities.references.DataMetadata#4443610280597#0.9322615025965292', 0, '2014-02-27 17:01:48.355', 0.0, 'No. of data samples in a grid map cell in a block averaging procedure', 0, 'No. of samples in map cell', 'NsampleMapcell', 1.0, 'tons', 999999999, 0); -------------------------------------------------------------------------------- -------------------------------------------------------------------------------- 03 Mar 2014 00:07:26 INFO [main] (AbstractTopiaMigrationCallback.java:199) executeSQL - INSERT INTO datametadata (topiaId,topiaversion, topiacreatedate, addOffset, comment, fillValue, longName, name, scaleFactor, units, validMax, validMin) VALUES('fr.ifremer.echobase.entities.references.DataMetadata#4443610280597#0.9322615025965290', 0, '2014-02-27 17:01:48.355', 0.0, 'Mean biomass averaged in a grid map cell using a block averaging procedure', 0, 'Mean biomass in map cell', 'meanMapcellBiomass', 1.0, 'tons', 999999999, 0); 03 Mar 2014 00:07:26 INFO [main] (AbstractTopiaMigrationCallback.java:199) executeSQL - INSERT INTO datametadata (topiaId,topiaversion, topiacreatedate, addOffset, comment, fillValue, longName, name, scaleFactor, units, validMax, validMin) VALUES('fr.ifremer.echobase.entities.references.DataMetadata#4443610280597#0.9322615025965291', 0, '2014-02-27 17:01:48.355', 0.0, 'Biomass standard deviation in a grid map cell produced from a block averaging procedure', 0, 'Biomass standard deviation in map cell', 'stdevMapcellBiomass', 1.0, 'tons', 999999999, 0); 03 Mar 2014 00:07:26 INFO [main] (AbstractTopiaMigrationCallback.java:199) executeSQL - INSERT INTO datametadata (topiaId,topiaversion, topiacreatedate, addOffset, comment, fillValue, longName, name, scaleFactor, units, validMax, validMin) VALUES('fr.ifremer.echobase.entities.references.DataMetadata#4443610280597#0.9322615025965292', 0, '2014-02-27 17:01:48.355', 0.0, 'No. of data samples in a grid map cell in a block averaging procedure', 0, 'No. of samples in map cell', 'NsampleMapcell', 1.0, 'tons', 999999999, 0); 03 Mar 2014 00:07:26 INFO [main] (TopiaMigrationEngine.java:469) saveApplicationVersion - Saving new database version: 2.6 03 Mar 2014 00:07:26 INFO [main] (AbstractRemoveDataServiceTest.java:883) createImport - Created importdata COMMON_VOYAGE: fr.ifremer.echobase.entities.ImportLog#1393801646282#0.7508540402648546 03 Mar 2014 00:07:26 INFO [main] (AbstractRemoveDataServiceTest.java:883) createImport - Created importdata COMMON_TRANSIT: fr.ifremer.echobase.entities.ImportLog#1393801646285#0.9313201969689069 03 Mar 2014 00:07:26 INFO [main] (AbstractRemoveDataServiceTest.java:883) createImport - Created importdata COMMON_TRANSECT: fr.ifremer.echobase.entities.ImportLog#1393801646289#0.5741193309867241 03 Mar 2014 00:07:26 INFO [main] (AbstractRemoveDataServiceTest.java:883) createImport - Created importdata OPERATION: fr.ifremer.echobase.entities.ImportLog#1393801646299#0.8633093627989219 03 Mar 2014 00:07:26 INFO [main] (AbstractRemoveDataServiceTest.java:883) createImport - Created importdata CATCHES: fr.ifremer.echobase.entities.ImportLog#1393801646321#0.9112579888025033 03 Mar 2014 00:07:26 INFO [main] (AbstractRemoveDataServiceTest.java:883) createImport - Created importdata ACOUSTIC: fr.ifremer.echobase.entities.ImportLog#1393801646336#0.20193240138338275 03 Mar 2014 00:07:26 INFO [main] (AbstractRemoveDataServiceTest.java:883) createImport - Created importdata RESULT_VOYAGE: fr.ifremer.echobase.entities.ImportLog#1393801646353#0.4192487366509965 03 Mar 2014 00:07:26 INFO [main] (AbstractRemoveDataServiceTest.java:883) createImport - Created importdata RESULT_ESDU: fr.ifremer.echobase.entities.ImportLog#1393801646360#0.07650404829379032 03 Mar 2014 00:07:26 INFO [main] (AbstractRemoveDataServiceTest.java:883) createImport - Created importdata RESULT_REGION: fr.ifremer.echobase.entities.ImportLog#1393801646368#0.5562531039567211 03 Mar 2014 00:07:26 INFO [main] (AbstractRemoveDataServiceTest.java:883) createImport - Created importdata RESULT_MAP_FISH: fr.ifremer.echobase.entities.ImportLog#1393801646374#0.6206668482229808 03 Mar 2014 00:07:26 INFO [main] (AbstractRemoveDataServiceTest.java:883) createImport - Created importdata RESULT_MAP_OTHER: fr.ifremer.echobase.entities.ImportLog#1393801646380#0.9521371320114684 03 Mar 2014 00:07:26 INFO [main] (AbstractRemoveDataServiceTest.java:883) createImport - Created importdata COMMON_VOYAGE: fr.ifremer.echobase.entities.ImportLog#1393801646386#0.8588556634196041 03 Mar 2014 00:07:26 INFO [main] (AbstractRemoveDataServiceTest.java:883) createImport - Created importdata COMMON_TRANSIT: fr.ifremer.echobase.entities.ImportLog#1393801646391#0.8088234335022448 03 Mar 2014 00:07:26 INFO [main] (AbstractRemoveDataServiceTest.java:883) createImport - Created importdata COMMON_TRANSECT: fr.ifremer.echobase.entities.ImportLog#1393801646399#0.04704371259879003 03 Mar 2014 00:07:26 INFO [main] (RemoveDataService.java:138) removeImport - Nb steps for importLog fr.ifremer.echobase.entities.ImportLog#1393801646368#0.5562531039567211: 1 Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.534 sec - in fr.ifremer.echobase.ui.actions.removedata.ResultRegionRemoveDataServiceTest Results : Tests run: 23, Failures: 0, Errors: 0, Skipped: 0 [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ echobase-services --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-serv…> [INFO] [INFO] >>> maven-source-plugin:2.2.1:jar (attach-sources) @ echobase-services >>> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ echobase-services --- [INFO] [INFO] --- helper-maven-plugin:2.1:check-auto-container (check-central-safe) @ echobase-services --- [INFO] Will use repository http://repo1.maven.org/maven2/ [INFO] Will use repository https://nexus.nuiton.org/nexus/content/repositories/central-releases [INFO] Will use repository https://nexus.nuiton.org/nexus/content/repositories/other-releases [INFO] Skipping goal (runOnce flag is on and goal was already executed). [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ echobase-services --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ echobase-services --- [INFO] Skipping goal (runOnce flag is on and goal was already executed). [WARNING] Failed to getClass for org.apache.maven.plugin.source.SourceJarMojo [INFO] [INFO] <<< maven-source-plugin:2.2.1:jar (attach-sources) @ echobase-services <<< [INFO] [INFO] --- maven-source-plugin:2.2.1:jar (attach-sources) @ echobase-services --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-serv…> [INFO] [INFO] --- maven-javadoc-plugin:2.9.1:jar (attach-javadocs) @ echobase-services --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-serv…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ echobase-services --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-pgp-passphrase) @ echobase-services --- [INFO] Exporting server [gpg-signer] username in ${gpg.keyname} [INFO] Exporting server [gpg-signer] password in ${gpg.passphrase} [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-artifacts) @ echobase-services --- [INFO] Loaded <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/target/collec…> [INFO] Copying echobase-services-2.6-SNAPSHOT.jar to <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/target/collec…> [INFO] Copying THIRD-PARTY.properties to <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/target/collec…> [INFO] Copying echobase-services-2.6-SNAPSHOT-sources.jar to <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/target/collec…> [INFO] Copying echobase-services-2.6-SNAPSHOT-javadoc.jar to <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/target/collec…> [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-attachements) @ echobase-services --- [WARNING] Skipping goal (No file to collect). [INFO] [INFO] --- maven-gpg-plugin:1.4:sign (sign-artifacts) @ echobase-services --- [INFO] [INFO] --- maven-dependency-plugin:2.8:analyze-only (analyze) @ echobase-services --- [INFO] Used declared dependencies found: [INFO] fr.ifremer.echobase:echobase-domain:jar:2.6-SNAPSHOT:compile [INFO] javax.inject:javax.inject:jar:1:compile [INFO] org.nuiton:nuiton-utils:jar:3.0-rc-2:compile [INFO] org.nuiton:nuiton-csv:jar:3.0-alpha-3:compile [INFO] org.nuiton:nuiton-decorator:jar:3.0-alpha-3:compile [INFO] org.nuiton.i18n:nuiton-i18n:jar:3.0:compile [INFO] org.apache.commons:commons-lang3:jar:3.2.1:compile [INFO] commons-logging:commons-logging:jar:1.1.3:compile [INFO] org.apache.commons:commons-collections4:jar:4.0:compile [INFO] commons-io:commons-io:jar:2.4:compile [INFO] com.google.guava:guava:jar:16.0.1:compile [INFO] org.nuiton.topia:topia-persistence:jar:3.0-alpha-11:compile [INFO] org.nuiton.topia:topia-service-csv:jar:3.0-alpha-11:compile [INFO] org.hibernate:hibernate-core:jar:4.2.5.Final:compile [INFO] junit:junit:jar:4.11:test [INFO] [INFO] --- maven-install-plugin:2.5.1:install (default-install) @ echobase-services --- [INFO] Installing <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-serv…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/echobase/echobase-services/2.6-SNAPSHOT/echobase-services-2.6-SNAPSHOT.jar [INFO] Installing <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-serv…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/echobase/echobase-services/2.6-SNAPSHOT/echobase-services-2.6-SNAPSHOT.pom [INFO] Installing <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-serv…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/echobase/echobase-services/2.6-SNAPSHOT/echobase-services-2.6-SNAPSHOT-third-party.properties [INFO] Installing <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-serv…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/echobase/echobase-services/2.6-SNAPSHOT/echobase-services-2.6-SNAPSHOT-sources.jar [INFO] Installing <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-serv…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/echobase/echobase-services/2.6-SNAPSHOT/echobase-services-2.6-SNAPSHOT-javadoc.jar [INFO] Installing <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-serv…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/echobase/echobase-services/2.6-SNAPSHOT/echobase-services-2.6-SNAPSHOT.jar.asc [INFO] Installing <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-serv…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/echobase/echobase-services/2.6-SNAPSHOT/echobase-services-2.6-SNAPSHOT.pom.asc [INFO] Installing <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-serv…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/echobase/echobase-services/2.6-SNAPSHOT/echobase-services-2.6-SNAPSHOT-third-party.properties.asc [INFO] Installing <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-serv…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/echobase/echobase-services/2.6-SNAPSHOT/echobase-services-2.6-SNAPSHOT-sources.jar.asc [INFO] Installing <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-serv…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/echobase/echobase-services/2.6-SNAPSHOT/echobase-services-2.6-SNAPSHOT-javadoc.jar.asc [JENKINS] Archiving disabled [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building EchoBase :: UI 2.6-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/echobase-group/org/nuiton/web… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/web… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/web… (2 KB at 15.3 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/web… [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/echobase-group/org/nuiton/web… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/web… (822 B at 6.3 KB/sec) [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/echobase-group/org/nuiton/web… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/web… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/web… (2 KB at 36.7 KB/sec) [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ echobase-ui --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-ui/t…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ echobase-ui --- [INFO] [INFO] --- helper-maven-plugin:2.1:check-auto-container (check-central-safe) @ echobase-ui --- [INFO] Will use repository http://repo1.maven.org/maven2/ [INFO] Will use repository https://nexus.nuiton.org/nexus/content/repositories/central-releases [INFO] Will use repository https://nexus.nuiton.org/nexus/content/repositories/other-releases [WARNING] Skip SNAPSHOT dependency : org.nuiton.web:nuiton-struts2:1.15-20140228.175130-22 [WARNING] Skip SNAPSHOT dependency : org.nuiton.web:nuiton-web:1.15-20140228.175126-22 [INFO] 73 dependencies to check. [INFO] 72 artifact(s) resolved by repository http://repo1.maven.org/maven2/ in 4.518s [INFO] No artifact resolved by the repository https://nexus.nuiton.org/nexus/content/repositories/central-releases [INFO] 1 artifact(s) resolved by repository https://nexus.nuiton.org/nexus/content/repositories/other-releases in 73.499ms [INFO] All dependencies are safe. [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ echobase-ui --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ echobase-ui --- [INFO] Exporting server [redmine-forge.codelutin.com] username in ${redmine.username} [INFO] Exporting server [redmine-forge.codelutin.com] privateKey in ${redmine.apiKey} [INFO] [INFO] --- i18n-maven-plugin:3.0:parserStruts2 (parseJsp) @ echobase-ui --- [INFO] [INFO] --- i18n-maven-plugin:3.0:parserValidation (parseOthersAndGen) @ echobase-ui --- [INFO] Load rules file validation.rules [INFO] Load rules file <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-ui/s…> [INFO] [INFO] --- i18n-maven-plugin:3.0:parserJava (parseOthersAndGen) @ echobase-ui --- [INFO] [INFO] >>> i18n-maven-plugin:3.0:gen (parseOthersAndGen) @ echobase-ui >>> [INFO] [INFO] --- i18n-maven-plugin:3.0:get (get) @ echobase-ui --- [INFO] Copying echobase-ui.properties to <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-ui/t…> [INFO] Copying echobase-ui.properties to <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-ui/t…> [INFO] [INFO] <<< i18n-maven-plugin:3.0:gen (parseOthersAndGen) @ echobase-ui <<< [INFO] [INFO] --- i18n-maven-plugin:3.0:gen (parseOthersAndGen) @ echobase-ui --- [WARNING] bundle fr_FR contains 24/435 empty entries! (use -Di18n.showEmpty to see these entries) [WARNING] bundle en_GB contains 27/432 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] >>> i18n-maven-plugin:3.0:bundle (bundle) @ echobase-ui >>> [INFO] [INFO] --- i18n-maven-plugin:3.0:collect-i18n-artifacts (collect-i18n-artifacts) @ echobase-ui --- [INFO] collected 8 i18n artifacts for locale fr_FR stored in <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-ui/t…> [INFO] collected 8 i18n artifacts for locale en_GB stored in <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-ui/t…> [INFO] [INFO] <<< i18n-maven-plugin:3.0:bundle (bundle) @ echobase-ui <<< [INFO] [INFO] --- i18n-maven-plugin:3.0:bundle (bundle) @ echobase-ui --- [WARNING] bundle en_GB contains 3/547 empty entries! - 0/3 : echobase.error.showData.dataMetadataIdForLayer.required - 1/3 : echobase.error.showData.noLayer.selected - 2/3 : echobase.error.showData.voyage.required [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] EchoBase .......................................... SUCCESS [ 18.101 s] [INFO] EchoBase :: Domain ................................ SUCCESS [ 41.010 s] [INFO] EchoBase :: Services .............................. SUCCESS [ 31.795 s] [INFO] EchoBase :: UI .................................... FAILURE [ 7.731 s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 01:40 min [INFO] Finished at: 2014-03-03T00:07:40+01:00 [INFO] Final Memory: 66M/547M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.nuiton.i18n:i18n-maven-plugin:3.0:bundle (bundle) on project echobase-ui: Bundles for locale(s) [en_GB] are not complete. Use the -Di18n.showEmpty to see missing translations. -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.nuiton.i18n:i18n-maven-plugin:3.0:bundle (bundle) on project echobase-ui: Bundles for locale(s) [en_GB] are not complete. Use the -Di18n.showEmpty to see missing translations. at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:212) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:108) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:76) at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:51) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:116) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:361) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:155) at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238) at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at hudson.maven.Maven3Builder.call(Maven3Builder.java:134) at hudson.maven.Maven3Builder.call(Maven3Builder.java:69) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:328) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:744) Caused by: org.apache.maven.plugin.MojoFailureException: Bundles for locale(s) [en_GB] are not complete. Use the -Di18n.showEmpty to see missing translations. at org.nuiton.i18n.plugin.bundle.AbstractMakeI18nBundleMojo.failsIfWarning(AbstractMakeI18nBundleMojo.java:212) at org.nuiton.i18n.plugin.bundle.BundleMojo.doAction(BundleMojo.java:275) at org.nuiton.plugin.AbstractPlugin.execute(AbstractPlugin.java:132) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:133) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 30 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <goals> -rf :echobase-ui Sending e-mails to: echobase-commits(a)list.forge.codelutin.com chemit+codelutin-ci(a)codelutin.com channel stopped Skipping sonar analysis due to bad build status FAILURE

1 1

Build failed in Jenkins: echobase-nightly » EchoBase :: UI #12
by admin+ci-codelutin.com＠codelutin.com March 4, 2014

March 4, 2014

See <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…> Changes: [Tony CHEMIT] refs #2931: Export de cartes au format image vers le site des indicateurs ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building EchoBase :: UI 2.6-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/echobase-group/org/nuiton/web… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/web… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/web… (2 KB at 15.3 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/web… [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/echobase-group/org/nuiton/web… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/web… (822 B at 6.3 KB/sec) [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/echobase-group/org/nuiton/web… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/web… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/web… (2 KB at 36.7 KB/sec) [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ echobase-ui --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ echobase-ui --- [INFO] [INFO] --- helper-maven-plugin:2.1:check-auto-container (check-central-safe) @ echobase-ui --- [INFO] Will use repository http://repo1.maven.org/maven2/ [INFO] Will use repository https://nexus.nuiton.org/nexus/content/repositories/central-releases [INFO] Will use repository https://nexus.nuiton.org/nexus/content/repositories/other-releases [WARNING] Skip SNAPSHOT dependency : org.nuiton.web:nuiton-struts2:1.15-20140228.175130-22 [WARNING] Skip SNAPSHOT dependency : org.nuiton.web:nuiton-web:1.15-20140228.175126-22 [INFO] 73 dependencies to check. [INFO] 72 artifact(s) resolved by repository http://repo1.maven.org/maven2/ in 4.518s [INFO] No artifact resolved by the repository https://nexus.nuiton.org/nexus/content/repositories/central-releases [INFO] 1 artifact(s) resolved by repository https://nexus.nuiton.org/nexus/content/repositories/other-releases in 73.499ms [INFO] All dependencies are safe. [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ echobase-ui --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ echobase-ui --- [INFO] Exporting server [redmine-forge.codelutin.com] username in ${redmine.username} [INFO] Exporting server [redmine-forge.codelutin.com] privateKey in ${redmine.apiKey} [INFO] [INFO] --- i18n-maven-plugin:3.0:parserStruts2 (parseJsp) @ echobase-ui --- [INFO] [INFO] --- i18n-maven-plugin:3.0:parserValidation (parseOthersAndGen) @ echobase-ui --- [INFO] Load rules file validation.rules [INFO] Load rules file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…> [INFO] [INFO] --- i18n-maven-plugin:3.0:parserJava (parseOthersAndGen) @ echobase-ui --- [INFO] [INFO] >>> i18n-maven-plugin:3.0:gen (parseOthersAndGen) @ echobase-ui >>> [INFO] [INFO] --- i18n-maven-plugin:3.0:get (get) @ echobase-ui --- [INFO] Copying echobase-ui.properties to <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…> [INFO] Copying echobase-ui.properties to <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…> [INFO] [INFO] <<< i18n-maven-plugin:3.0:gen (parseOthersAndGen) @ echobase-ui <<< [INFO] [INFO] --- i18n-maven-plugin:3.0:gen (parseOthersAndGen) @ echobase-ui --- [WARNING] bundle fr_FR contains 24/435 empty entries! (use -Di18n.showEmpty to see these entries) [WARNING] bundle en_GB contains 27/432 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] >>> i18n-maven-plugin:3.0:bundle (bundle) @ echobase-ui >>> [INFO] [INFO] --- i18n-maven-plugin:3.0:collect-i18n-artifacts (collect-i18n-artifacts) @ echobase-ui --- [INFO] collected 8 i18n artifacts for locale fr_FR stored in <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…> [INFO] collected 8 i18n artifacts for locale en_GB stored in <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…> [INFO] [INFO] <<< i18n-maven-plugin:3.0:bundle (bundle) @ echobase-ui <<< [INFO] [INFO] --- i18n-maven-plugin:3.0:bundle (bundle) @ echobase-ui --- [WARNING] bundle en_GB contains 3/547 empty entries! - 0/3 : echobase.error.showData.dataMetadataIdForLayer.required - 1/3 : echobase.error.showData.noLayer.selected - 2/3 : echobase.error.showData.voyage.required [JENKINS] Archiving disabled

1 1

r971 - in trunk: echobase-domain/src/main/java/fr/ifremer/echobase echobase-domain/src/main/java/fr/ifremer/echobase/converter echobase-domain/src/main/resources/i18n echobase-ui/src/main/java/fr/ifremer/echobase/ui echobase-ui/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com March 4, 2014

March 4, 2014

Author: tchemit Date: 2014-03-04 09:24:07 +0100 (Tue, 04 Mar 2014) New Revision: 971 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/971 Log: utilisation du float converter recopie depuis celui de l'ird Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/converter/ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/converter/FloatConverter.java Modified: trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/converter/FloatConverter.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/converter/FloatConverter.java (rev 0) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/converter/FloatConverter.java 2014-03-04 08:24:07 UTC (rev 971) @@ -0,0 +1,87 @@ +package fr.ifremer.echobase.converter; + +/* + * #%L + * EchoBase :: Domain + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2014 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 org.apache.commons.beanutils.ConversionException; +import org.apache.commons.beanutils.Converter; + +import static org.nuiton.i18n.I18n.t; + +/** + * Created on 3/3/14. + * <p/> + * A float converter which is not dependant on user locale to obtain the locale + * {@code dot} representation. + * <p/> + * It can transform {@code 0.2} and also {@code 0,2}. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 2.6 + */ +public class FloatConverter implements Converter { + + @Override + public <T> T convert(Class<T> aClass, Object value) { + if (value == null) { + throw new ConversionException( + t("echobase.error.convertor.noValue", this)); + } + if (isEnabled(aClass)) { + T result; + if (isEnabled(value.getClass())) { + result = (T) value; + return result; + } + if (value instanceof String) { + result = (T) valueOf((String) value); + return result; + } + } + throw new ConversionException( + t("echobase.error.no.convertor", aClass.getName(), value)); + } + + protected Float valueOf(String value) { + try { + if (value.contains(",")) { + value = value.replaceAll(",", "."); + } + Float result; + result = Float.valueOf(value); + return result; + } catch (NumberFormatException e) { + throw new ConversionException( + t("echobase.error.float.convertor", value, this, e.getMessage())); + } + } + + + protected boolean isEnabled(Class<?> aClass) { + return Float.class.equals(aClass); + } + + public Class<?> getType() { + return Float.class; + } +} Property changes on: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/converter/FloatConverter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties =================================================================== --- trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties 2014-03-04 08:21:49 UTC (rev 970) +++ trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties 2014-03-04 08:24:07 UTC (rev 971) @@ -38,3 +38,6 @@ echobase.config.version.description=Application version echobase.config.war.location.description=Location of the war used to create embedded applications echobase.configuration.description=EchoBase configuration +echobase.error.convertor.noValue=Can not convert a null value +echobase.error.float.convertor=a problem occurs while converting value '%s' with float convertor %s for reason %s +echobase.error.no.convertor=Can not convert a float from type %s (value to convert\: %s) Modified: trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties =================================================================== --- trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties 2014-03-04 08:21:49 UTC (rev 970) +++ trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties 2014-03-04 08:24:07 UTC (rev 971) @@ -38,3 +38,6 @@ echobase.config.version.description=Version de l'application echobase.config.war.location.description=Chemin d'accèss au war embarqué à utiliser pour créer des applications embarquées echobase.configuration.description=Configuration d'EchoBase +echobase.error.convertor.noValue=Impossible de conertir une valeur nulle +echobase.error.float.convertor=Un problème est apparu lors de la convertion en float de '%s' avec le convertisseur %s pour la raison suivante \: %s +echobase.error.no.convertor=Impossible de convertir un float à partir de ce type %s (valeur à convertir %s) Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java 2014-03-04 08:21:49 UTC (rev 970) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java 2014-03-04 08:24:07 UTC (rev 971) @@ -29,6 +29,7 @@ import com.google.common.io.Files; import com.opensymphony.xwork2.ActionContext; import fr.ifremer.echobase.config.EchoBaseConfiguration; +import fr.ifremer.echobase.converter.FloatConverter; import fr.ifremer.echobase.entities.DriverType; import fr.ifremer.echobase.entities.EchoBaseInternalPersistenceContext; import fr.ifremer.echobase.entities.EchoBaseInternalTopiaApplicationContext; @@ -44,7 +45,6 @@ import fr.ifremer.echobase.services.service.UserService; import fr.ifremer.echobase.services.service.embeddedapplication.EmbeddedApplicationService; import fr.ifremer.echobase.services.service.workingDb.WorkingDbConfigurationService; -import fr.ird.converter.FloatConverter; import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.beanutils.Converter; import org.apache.commons.collections4.CollectionUtils; Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2014-03-04 08:21:49 UTC (rev 970) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2014-03-04 08:24:07 UTC (rev 971) @@ -14,7 +14,6 @@ echobase.action.delete=Delete echobase.action.delete.selectedImport=Delete selected imports echobase.action.deleteConfiguration=Delete -echobase.action.display=Display spatial data echobase.action.downloadEmbeddedApplicationFile=Download the portable database echobase.action.downloadExportDbFile=Download database export file echobase.action.downloadExportMapFile=Download voyage maps export file @@ -66,21 +65,14 @@ echobase.common.cellRegionAssociationFile= echobase.common.cellRegionResultFile= echobase.common.cellRegionsFile= -echobase.common.cellType=Cell type echobase.common.dataCentre=Data center echobase.common.dataCentreEmail=Data center email -echobase.common.dataMetadata=Data Metadata -echobase.common.dataMetadata.forEsduDataLayer=Data Metadata for Esdu - Data layer -echobase.common.dataMetadata.forEsduResultLayer=Data Metadata for Esdu - Result layer -echobase.common.dataMetadata.forMapDataLayer=Data Metadata for Map - Data layer -echobase.common.dataMetadata.forMapResultLayer=Data Metadata for Map - Result layer echobase.common.dataProcessing=DataProcessing echobase.common.dataProcessingNotes=Data processing notes echobase.common.datum=Datum echobase.common.description=Description echobase.common.digitThreshold=Digitization threshold echobase.common.distributionStatement=Distribution statement -echobase.common.echotype=Echotype echobase.common.echotypeFile= echobase.common.email=E-mail echobase.common.entityId=ID @@ -143,17 +135,11 @@ echobase.common.processingTemplate=Data processing template echobase.common.project=Project echobase.common.resultLabel=Results label -echobase.common.showCellEsduDataLayer=Show Cell Esdu data layer -echobase.common.showCellEsduResultLayer=Show Cell Esdu result layer -echobase.common.showCellMapDataLayer=Show Cell map data layer -echobase.common.showCellMapResultLayer=Show Cell map result layer -echobase.common.showOperationLayer=Show operation layer echobase.common.soundSpeedCalculationsER60=Sound speed calculations method (ER60 instrument) echobase.common.soundSpeedCalculationsME70=Sound speed calculation method (ME70 instrument) echobase.common.sounderConstant=Sounder constant (if relevant) echobase.common.source=Source echobase.common.spatialAware=Is database spatial aware ? -echobase.common.species=Species echobase.common.startEndDate=Start - End date echobase.common.startEndPort=Start - End port echobase.common.subSampleFile= @@ -173,7 +159,6 @@ echobase.confirm.delete.query=Delete query echobase.confirm.delete.selected.importData=Delete selected imports echobase.confirm.delete.workingDbConfiguration=Delete working database configuration -echobase.error.bad.password=Invalid password echobase.error.email.already.used=The user name already exists echobase.error.export.description.requiredstring=Export description required echobase.error.export.name.requiredstring=Export name required @@ -230,7 +215,6 @@ echobase.error.importDb.input.required=Le fichier d'import est obligatoire echobase.error.importFile.required=Fichier d'import obligatoire echobase.error.invalid.sql=Invalid query\: %s -echobase.error.login.unknown=Unkwown user echobase.error.login.wrongLogin=Le login est déjà utilisé echobase.error.mission.name.already.exist=The mission name already exists echobase.error.no.embeddedApplication.configurationFound=Portable database configuration not found @@ -243,9 +227,6 @@ echobase.error.query.name.already.exists=Query name already exists echobase.error.required.email=E-mail address required echobase.error.required.password=Password is required -echobase.error.showData.dataMetadataIdForLayer.required= -echobase.error.showData.noLayer.selected= -echobase.error.showData.voyage.required= echobase.error.warlocation.notFound=Database .war file not found at location %s echobase.error.workingDbConfiguration.couldNotConnect=Could not connect to database (%s) echobase.error.workingDbConfiguration.createOnlyOnPostgresql=Database creation is only possible for *Postgresql* type @@ -278,7 +259,6 @@ echobase.info.new.sqlQuery.inprogress=Query creation in progress echobase.info.new.workingDbConfiguration.inprogress=New working database configuration in progress echobase.info.no.sqlQuery.saved=No saved SQL query -echobase.info.no.sqlQuery.selected=No SQL query selected echobase.info.no.table.selected=No table selected echobase.info.no.voyagee.found=No survey selected echobase.info.no.workingDb.selected=No working database selected @@ -341,7 +321,6 @@ echobase.legend.embeddedApplication.configuration=Portable database configuration echobase.legend.exportDb.configuration.files=Export configuration echobase.legend.exportDb.resume=Resume of database export -echobase.legend.exportMap.configuration.files=Export configuration echobase.legend.exportMap.resume=Resume of voyage maps export echobase.legend.importData.configuration.selectImportType=Type of import selection echobase.legend.importData.configure=Import configuration Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2014-03-04 08:21:49 UTC (rev 970) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2014-03-04 08:24:07 UTC (rev 971) @@ -14,7 +14,6 @@ echobase.action.delete=Suppression echobase.action.delete.selectedImport=Supprimer les imports sélectionnés echobase.action.deleteConfiguration=Supprimer -echobase.action.display=Afficher les données echobase.action.downloadEmbeddedApplicationFile=Télécharger l'application embarquée echobase.action.downloadExportDbFile=Télécharger le fichier d'export de la base complète echobase.action.downloadExportMapFile=Télécharger le fichier d'export des cartes d'une campagne @@ -66,21 +65,14 @@ echobase.common.cellRegionAssociationFile= echobase.common.cellRegionResultFile= echobase.common.cellRegionsFile= -echobase.common.cellType=Type de cellule echobase.common.dataCentre=Centre de données echobase.common.dataCentreEmail=Courriel du centre de données -echobase.common.dataMetadata=Type de donnée -echobase.common.dataMetadata.forEsduDataLayer=Méta data à utiliser pour la couche Esdu - Data -echobase.common.dataMetadata.forEsduResultLayer=Méta data à utiliser pour la couche Esdu - Result -echobase.common.dataMetadata.forMapDataLayer=Méta data à utiliser pour la couche Map - Data -echobase.common.dataMetadata.forMapResultLayer=Méta data à utiliser pour la couche Map - Result echobase.common.dataProcessing=DataProcessing echobase.common.dataProcessingNotes=Notes sur le pré-traitement des données echobase.common.datum=Référenciel echobase.common.description=Description echobase.common.digitThreshold=Seuil de numérisation echobase.common.distributionStatement=Conditions de diffusion des données -echobase.common.echotype=Échotype echobase.common.echotypeFile= echobase.common.email=Courriel echobase.common.entityId=Identifiant de l'entité @@ -143,17 +135,11 @@ echobase.common.processingTemplate=Intitulé de la méthode de pré-traitement des données echobase.common.project=Projet echobase.common.resultLabel=Intitulé des résultats -echobase.common.showCellEsduDataLayer=Voir la couche Esdu - Data -echobase.common.showCellEsduResultLayer=Voir la couche Esdu - Result -echobase.common.showCellMapDataLayer=Voir la couche Map - Data -echobase.common.showCellMapResultLayer=Voir la couche Map - Result -echobase.common.showOperationLayer=Voir la couche Operation echobase.common.soundSpeedCalculationsER60=Méthode de calcul de la célérité du son (ER60) echobase.common.soundSpeedCalculationsME70=Méthode de calcul de la célérité du son (ME70) echobase.common.sounderConstant=Constante sondeur (si besoin) echobase.common.source=Source echobase.common.spatialAware=Base spatialisée ? -echobase.common.species=Espèce echobase.common.startEndDate=Date de début - fin echobase.common.startEndPort=Port de départ - arrivé echobase.common.subSampleFile= @@ -173,7 +159,6 @@ echobase.confirm.delete.query=Confirmer la suppression de la requête echobase.confirm.delete.selected.importData=Confirmer la suppression des imports sélectionnés echobase.confirm.delete.workingDbConfiguration=Confirmer la suppression de la configuration suivante -echobase.error.bad.password=Mot de passe incorrect echobase.error.email.already.used=Nom d'utilisateur déjà utilisé echobase.error.export.description.requiredstring=La description de l'export est obligatoire echobase.error.export.name.requiredstring=Le nom de l'export est obligatoire @@ -230,7 +215,6 @@ echobase.error.importDb.input.required=Le fichier d'import est obligatoire echobase.error.importFile.required=Fichier d'import obligatoire echobase.error.invalid.sql=Requête non valide \: %s -echobase.error.login.unknown=Utilisateur inconnu echobase.error.login.wrongLogin=Le login est déjà utilisé echobase.error.mission.name.already.exist=Nom de mission déjà utilisé echobase.error.no.embeddedApplication.configurationFound=Configuration de création d'application embarquée non trouvée @@ -243,12 +227,6 @@ echobase.error.query.name.already.exists=Nom de requête déjà utilisé echobase.error.required.email=Courriel obligatoire echobase.error.required.password=Le mot de passe est obligatoire -echobase.error.showData.cellType.required=La sélection d'un type de cellule est obligatoire -echobase.error.showData.dataMetadata.required=La sélection d'un type de donnée est obligatoire -echobase.error.showData.dataMetadataIdForLayer.required=Il faut sélectionner la méta-donnée à utiliser sur la couche -echobase.error.showData.echoTypeOrSpecies.required=La sélection d'un echotype ou (et) d'une espèces est obligatoire -echobase.error.showData.noLayer.selected=Aucune couche de présentation sélectionnée -echobase.error.showData.voyage.required=La sélection d'une campagne est obligatoire echobase.error.warlocation.notFound=L'application n'a pas été trouvée à l'emplacement suivant %s echobase.error.workingDbConfiguration.couldNotConnect=Impossible de se connecter (%s) echobase.error.workingDbConfiguration.createOnlyOnPostgresql=La création d'une base n'est possible que pour le type *Postgresql* @@ -281,7 +259,6 @@ echobase.info.new.sqlQuery.inprogress=Nouvelle requête en cours de création echobase.info.new.workingDbConfiguration.inprogress=Nouvelle configuration de base de travail en cours de création echobase.info.no.sqlQuery.saved=Aucune requête d'export SQL enregistrée -echobase.info.no.sqlQuery.selected=Aucune requête d'export SQL sélectionnée echobase.info.no.table.selected=Aucune table sélectionnée echobase.info.no.voyagee.found=Aucune campagne à exporter echobase.info.no.workingDb.selected=Aucune base de travail sélectionnée @@ -344,7 +321,6 @@ echobase.legend.embeddedApplication.configuration=Configuration de l'application embarquée echobase.legend.exportDb.configuration.files=Configuration de l'export echobase.legend.exportDb.resume=Résumé de l'export de base -echobase.legend.exportMap.configuration.files=Configuration de l'export echobase.legend.exportMap.resume=Résumé de l'export des cartes d'une campagne echobase.legend.importData.configuration.selectImportType=Sélection du type d'import echobase.legend.importData.configure=Configurer l'import

1 0

r970 - trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions
by tchemit＠users.forge.codelutin.com March 4, 2014

March 4, 2014

Author: tchemit Date: 2014-03-04 09:21:49 +0100 (Tue, 04 Mar 2014) New Revision: 970 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/970 Log: remove no more used validation file Removed: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/spatial/

1 0

r969 - in trunk: . echobase-ui
by tchemit＠users.forge.codelutin.com March 4, 2014

March 4, 2014

Author: tchemit Date: 2014-03-04 09:18:20 +0100 (Tue, 04 Mar 2014) New Revision: 969 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/969 Log: updates some dependencies + remove ird dep Modified: trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2014-03-01 23:20:47 UTC (rev 968) +++ trunk/echobase-ui/pom.xml 2014-03-04 08:18:20 UTC (rev 969) @@ -186,10 +186,10 @@ <version>${project.version}</version> </dependency> - <dependency> +  <dependency> <groupId>org.nuiton.web</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-01 23:20:47 UTC (rev 968) +++ trunk/pom.xml 2014-03-04 08:18:20 UTC (rev 969) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0</version> + <version>5.0.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer</groupId> @@ -138,15 +138,15 @@  - <topiaVersion>3.0-alpha-11</topiaVersion> + <topiaVersion>3.0-alpha-13</topiaVersion> <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion> <nuitonI18nVersion>3.0</nuitonI18nVersion> <nuitonWebVersion>1.15-SNAPSHOT</nuitonWebVersion> - <struts2Version>2.3.15.3</struts2Version> - <jqueryPluginVersion>3.6.1</jqueryPluginVersion> - <h2Version>1.3.174</h2Version> - <postgresqlVersion>9.2-1003-jdbc4</postgresqlVersion> - <slf4jVersion>1.7.5</slf4jVersion> + <struts2Version>2.3.16</struts2Version> + <jqueryPluginVersion>3.7.0</jqueryPluginVersion> + <h2Version>1.3.175</h2Version> + <postgresqlVersion>9.3-1101-jdbc41</postgresqlVersion> + <slf4jVersion>1.7.6</slf4jVersion> <licensePluginVersion>1.6</licensePluginVersion> <googleSearchEnabled>true</googleSearchEnabled> @@ -178,20 +178,6 @@ <dependencyManagement> <dependencies> -  - <dependency> - <groupId>fr.ird</groupId> - <artifactId>msaccess-importer</artifactId> - <version>1.4.1</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>com.healthmarketscience.jackcess</groupId> - <artifactId>jackcess</artifactId> - <version>1.2.14.3</version> - </dependency> -  <dependency> @@ -215,7 +201,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> - <version>3.0-alpha-3</version> + <version>3.0-rc-1</version> </dependency> <dependency> @@ -270,7 +256,7 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <version>4.2.5.Final</version> + <version>4.2.10.Final</version> </dependency>  @@ -293,6 +279,12 @@ <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> <version>${struts2Version}</version> + <exclusions> + <exclusion> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </exclusion> + </exclusions> </dependency> <dependency>

1 0

r968 - in trunk: echobase-domain/src/main/data echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb echobase-domain/src/main/resources/migration echobase-services/src/main/java/fr/ifremer/echobase/services/service echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap echobase-ui/src/main/java/fr/ifremer/echobase/u
by tchemit＠users.forge.codelutin.com March 1, 2014

March 1, 2014

Author: tchemit Date: 2014-03-02 00:20:47 +0100 (Sun, 02 Mar 2014) New Revision: 968 Url: http://codelutin.com/projects/echobase/repository/revisions/968 Log: refs #2931: Export de cartes au format image vers le site des indicateurs Added: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapService.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Configure.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Download.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Export.java trunk/echobase-ui/src/main/resources/config/struts-exportMap.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportMap/ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportMap/Configure-validation.xml trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/configure.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/progress.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/result.jsp Modified: trunk/echobase-domain/src/main/data/echobase-referentiel.echobase trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java trunk/echobase-domain/src/main/resources/migration/postgis-view-2.6.sql trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/RefreshSpatialViews.java trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/resources/struts.xml trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp Property changes on: trunk/echobase-domain/src/main/data/echobase-referentiel.echobase ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java 2014-02-28 18:55:22 UTC (rev 967) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java 2014-03-01 23:20:47 UTC (rev 968) @@ -4,7 +4,7 @@ * #%L * EchoBase :: Domain * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2014 Ifremer, Codelutin * %% Property changes on: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/echobase-domain/src/main/resources/migration/postgis-view-2.6.sql =================================================================== --- trunk/echobase-domain/src/main/resources/migration/postgis-view-2.6.sql 2014-02-28 18:55:22 UTC (rev 967) +++ trunk/echobase-domain/src/main/resources/migration/postgis-view-2.6.sql 2014-03-01 23:20:47 UTC (rev 968) @@ -1,8 +1,8 @@ --- -- #%L -- EchoBase :: Domain --- $Id:$ --- $HeadURL:$ +-- $Id$ +-- $HeadURL$ -- %% -- Copyright (C) 2011 - 2014 Ifremer, Codelutin -- %% Property changes on: trunk/echobase-domain/src/main/resources/migration/postgis-view-2.6.sql ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapConfiguration.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapConfiguration.java 2014-03-01 23:20:47 UTC (rev 968) @@ -0,0 +1,119 @@ +package fr.ifremer.echobase.services.service.exportMap; + +/* + * #%L + * EchoBase :: Services + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2014 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 fr.ifremer.echobase.persistence.JdbcConfiguration; +import fr.ifremer.echobase.services.AbstractEchobaseActionConfiguration; +import fr.ifremer.echobase.services.ProgressModel; +import org.apache.commons.io.FileUtils; + +import java.io.File; +import java.io.IOException; + +/** + * Created on 3/1/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since XXX + */ +public class ExportMapConfiguration extends AbstractEchobaseActionConfiguration { + + private static final long serialVersionUID = 1L; + + /** + * File of of export file. + */ + private String fileName; + + /** + * Working directory. + */ + private File workingDirectory; + + /** + * Final export file. + */ + private File exportFile; + + /** + * Id of voyage to export. + */ + private String voyageId; + + private JdbcConfiguration dbConfiguration; + + public ExportMapConfiguration() { + } + + public ExportMapConfiguration(ProgressModel progressModel) { + super(progressModel); + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public File getWorkingDirectory() { + return workingDirectory; + } + + public void setWorkingDirectory(File workingDirectory) { + this.workingDirectory = workingDirectory; + } + + public File getExportFile() { + return exportFile; + } + + public void setExportFile(File exportFile) { + this.exportFile = exportFile; + } + + public String getVoyageId() { + return voyageId; + } + + public void setVoyageId(String voyageId) { + this.voyageId = voyageId; + } + + public JdbcConfiguration getDbConfiguration() { + return dbConfiguration; + } + + public void setDbConfiguration(JdbcConfiguration dbConfiguration) { + this.dbConfiguration = dbConfiguration; + } + + @Override + public void destroy() throws IOException { + if (workingDirectory != null) { + FileUtils.deleteDirectory(workingDirectory); + } + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapConfiguration.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapService.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapService.java 2014-03-01 23:20:47 UTC (rev 968) @@ -0,0 +1,87 @@ +package fr.ifremer.echobase.services.service.exportMap; + +/* + * #%L + * EchoBase :: Services + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2014 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 fr.ifremer.echobase.io.EchoBaseIOUtil; +import fr.ifremer.echobase.persistence.JdbcConfiguration; +import fr.ifremer.echobase.services.EchoBaseServiceSupport; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.FileUtil; +import org.nuiton.util.TimeLog; + +import java.io.File; +import java.io.IOException; + +/** + * Created on 3/1/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 2.6 + */ +public class ExportMapService extends EchoBaseServiceSupport { + + /** Logger. */ + private static final Log log = LogFactory.getLog(ExportMapService.class); + + public static final TimeLog timeLog = new TimeLog(ExportMapService.class); + + public void doExport(ExportMapConfiguration model) throws IOException { + + String fileName = model.getFileName(); + + File tempDirectory = model.getWorkingDirectory(); + + File zipFile = new File(tempDirectory, fileName + ".zip"); + + if (log.isInfoEnabled()) { + log.info("Will export map to " + zipFile); + } + model.setExportFile(zipFile); + + File dir = new File(tempDirectory, "echobase"); + + FileUtil.createDirectoryIfNecessary(dir); + if (log.isInfoEnabled()) { + log.info("Will store maps in " + dir); + } + + JdbcConfiguration dbConfiguration = model.getDbConfiguration(); + if (log.isInfoEnabled()) { + log.info("Will connect to db: " + dbConfiguration.getUrl()); + } + + // compute nb steps + int nbSteps = 0; + + if (log.isInfoEnabled()) { + log.info("NB steps: " + nbSteps); + } + model.setNbSteps(nbSteps); + + // TODO Export + + EchoBaseIOUtil.compressZipFile(zipFile, dir); + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportMap/ExportMapService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Configure.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Configure.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Configure.java 2014-03-01 23:20:47 UTC (rev 968) @@ -0,0 +1,100 @@ +package fr.ifremer.echobase.ui.actions.exportMap; + +/* + * #%L + * EchoBase :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2014 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 fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.persistence.JdbcConfiguration; +import fr.ifremer.echobase.services.service.exportMap.ExportMapConfiguration; +import fr.ifremer.echobase.ui.EchoBaseSession; +import fr.ifremer.echobase.ui.actions.AbstractConfigureAction; +import org.apache.commons.io.FileUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.FileUtil; + +import java.io.File; +import java.io.IOException; +import java.util.Map; + +/** + * Created on 3/1/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 2.6 + */ +public class Configure extends AbstractConfigureAction<ExportMapConfiguration> { + + private static final long serialVersionUID = 1L; + + /** Logger. */ + private static final Log log = LogFactory.getLog(Configure.class); + + /** Universe of voyages to export in db. */ + protected Map<String, String> voyages; + + public Configure() { + super(ExportMapConfiguration.class); + } + + public Map<String, String> getVoyages() { + return voyages; + } + + public void setFileName(String fileName) { + getModel().setFileName(fileName); + } + + @Override + protected ExportMapConfiguration createModel() { + ExportMapConfiguration result = new ExportMapConfiguration(); + result.setFileName("echobase"); + + EchoBaseSession userSession = getEchoBaseSession(); + JdbcConfiguration workingDbConfiguration = userSession.getWorkingDbConfiguration(); + result.setDbConfiguration(workingDbConfiguration); + return result; + } + + @Override + protected void prepareInputAction(ExportMapConfiguration model) { + + voyages = userDbPersistenceService.loadSortAndDecorate(Voyage.class); + } + + @Override + protected void prepareExecuteAction(ExportMapConfiguration model) throws IOException { + + File tempDirectory = FileUtils.getTempDirectory(); + File dataDirectory = new File(tempDirectory, + "echobase-exportMap-" + + System.currentTimeMillis()); + FileUtil.createDirectoryIfNecessary(dataDirectory); + model.setWorkingDirectory(dataDirectory); + if (log.isInfoEnabled()) { + log.info("Temporary directory to use : " + dataDirectory); + } + + voyages = userDbPersistenceService.loadSortAndDecorate(Voyage.class); + } +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Configure.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Download.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Download.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Download.java 2014-03-01 23:20:47 UTC (rev 968) @@ -0,0 +1,96 @@ +package fr.ifremer.echobase.ui.actions.exportMap; + +/* + * #%L + * EchoBase :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2014 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 fr.ifremer.echobase.services.service.exportMap.ExportMapConfiguration; +import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; + +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; + +/** + * Created on 3/1/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 2.6 + */ +public class Download extends EchoBaseActionSupport { + + private static final long serialVersionUID = 1L; + + /** Input stream of the file to download. */ + protected transient InputStream inputStream; + + /** File name of the download. */ + protected String fileName; + + /** Length of the file to download. */ + protected long contentLength; + + /** Content type of the file to download. */ + protected String contentType; + + public InputStream getInputStream() { + return inputStream; + } + + public String getFileName() { + return fileName; + } + + public long getContentLength() { + return contentLength; + } + + public String getContentType() { + return contentType; + } + + @Override + public String execute() throws Exception { + + ExportMapConfiguration model = + getEchoBaseSession().getActionConfiguration(ExportMapConfiguration.class); + + if (model == null) { + addFlashError(t("echobase.error.no.exportMap.configurationFound")); + return ERROR; + } + + File exportFile = model.getExportFile(); + if (exportFile == null) { + addFlashError(t("echobase.error.no.exportMap.exportFileFound")); + return ERROR; + } + + fileName = exportFile.getName(); + contentType = "application/zip"; + contentLength = exportFile.length(); + inputStream = new BufferedInputStream(new FileInputStream(exportFile)); + + return SUCCESS; + } +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Download.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Export.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Export.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Export.java 2014-03-01 23:20:47 UTC (rev 968) @@ -0,0 +1,85 @@ +package fr.ifremer.echobase.ui.actions.exportMap; + +/* + * #%L + * EchoBase :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2014 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 fr.ifremer.echobase.services.service.exportMap.ExportMapConfiguration; +import fr.ifremer.echobase.services.service.exportMap.ExportMapService; +import fr.ifremer.echobase.ui.actions.AbstractWaitAndExecAction; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * Created on 3/1/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 2.6 + */ +public class Export extends AbstractWaitAndExecAction<ExportMapConfiguration, ExportMapService> { + + private static final long serialVersionUID = 1L; + + /** Logger. */ + private static final Log log = LogFactory.getLog(Export.class); + + public Export() { + super(ExportMapConfiguration.class, ExportMapService.class); + } + + @Override + protected void startAction(ExportMapService service, + ExportMapConfiguration model) throws Exception { + if (log.isInfoEnabled()) { + log.info("Start export map to file " + model.getFileName()); + } + service.doExport(model); + } + + @Override + protected String getSuccesMessage() { + return t("echobase.info.exportMap.succeded"); + } + + @Override + protected String getErrorMessage() { + return t("echobase.info.exportMap.failed"); + } + + @Override + public String getActionResumeTitle() { + return t("echobase.legend.exportMap.resume"); + } + + @Override + protected String getResultMessage(ExportMapConfiguration model) { + String result = t("echobase.message.exportMap.result", + model.getFileName(), + model.getActionTime()); + + if (log.isInfoEnabled()) { + log.info("Result: " + result); + } + return result; + } + +} \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportMap/Export.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/RefreshSpatialViews.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/RefreshSpatialViews.java 2014-02-28 18:55:22 UTC (rev 967) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/RefreshSpatialViews.java 2014-03-01 23:20:47 UTC (rev 968) @@ -1,5 +1,28 @@ package fr.ifremer.echobase.ui.actions.spatial; +/* + * #%L + * EchoBase :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2014 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 fr.ifremer.echobase.services.service.spatial.SpatialService; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/RefreshSpatialViews.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Added: trunk/echobase-ui/src/main/resources/config/struts-exportMap.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-exportMap.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/config/struts-exportMap.xml 2014-03-01 23:20:47 UTC (rev 968) @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<!DOCTYPE struts PUBLIC + "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN" + "http://struts.apache.org/dtds/struts-2.3.dtd"> + +<struts> + + <package name="exportMap" extends="logguedAndWithDb" namespace="/exportMap"> + +  + <action name="configureInput" method="input" + class="fr.ifremer.echobase.ui.actions.exportMap.Configure"> + <result name="input">/WEB-INF/jsp/exportMap/configure.jsp</result> + </action> + +  + <action name="configure" method="execute" + class="fr.ifremer.echobase.ui.actions.exportMap.Configure"> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> + <result name="input">/WEB-INF/jsp/exportMap/configure.jsp</result> + <result type="redirectAction"> + <param name="namespace">/exportMap</param> + <param name="actionName">export</param> + </result> + </action> + +  + <action name="export" method="execute" + class="fr.ifremer.echobase.ui.actions.exportMap.Export"> + <interceptor-ref name="basicStackLogguedWithdb"/> + <interceptor-ref name="execAndWait"/> + <result name="wait">/WEB-INF/jsp/exportMap/progress.jsp</result> + <result type="redirectAction"> + <param name="namespace">/exportMap</param> + <param name="actionName">result</param> + </result> + </action> + +  + <action name="result" method="result" + class="fr.ifremer.echobase.ui.actions.exportMap.Export"> + <result>/WEB-INF/jsp/exportMap/result.jsp</result> + </action> + +  + <action name="download" method="execute" + class="fr.ifremer.echobase.ui.actions.exportMap.Download"> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> + <result type="stream"> + <param name="contentType">${contentType}</param> + <param name="contentLength">${contentLength}</param> + <param name="contentDisposition">filename="${fileName}"</param> + </result> + </action> + + </package> + +</struts> + Property changes on: trunk/echobase-ui/src/main/resources/config/struts-exportMap.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportMap/Configure-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportMap/Configure-validation.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportMap/Configure-validation.xml 2014-03-01 23:20:47 UTC (rev 968) @@ -0,0 +1,40 @@ + +<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="model.voyageId"> + <field-validator type="requiredstring"> + <message key="echobase.error.exportMap.voyage.required"/> + </field-validator> + </field> + + <field name="model.fileName"> + <field-validator type="requiredstring"> + <message key="echobase.error.exportMap.filename.required"/> + </field-validator> + </field> + +</validators> \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportMap/Configure-validation.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2014-02-28 18:55:22 UTC (rev 967) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2014-03-01 23:20:47 UTC (rev 968) @@ -17,6 +17,7 @@ echobase.action.display=Display spatial data echobase.action.downloadEmbeddedApplicationFile=Download the portable database echobase.action.downloadExportDbFile=Download database export file +echobase.action.downloadExportMapFile=Download voyage maps export file echobase.action.export=Export echobase.action.exportSqlData=Data export echobase.action.exportTable=Export @@ -36,6 +37,7 @@ echobase.action.saveSqlQuery=Update query echobase.action.show.embedded.documentation=How to use a portable database echobase.action.show.exportDb.documentation=How to export a database +echobase.action.show.exportMap.documentation=How to export voyage maps (Coser) echobase.action.show.import.documentation=How to import data echobase.action.show.importDb.documentation=How to import a database echobase.action.show.showSpatialData.documentation=How to display spatial data @@ -173,14 +175,16 @@ echobase.confirm.delete.workingDbConfiguration=Delete working database configuration echobase.error.bad.password=Invalid password echobase.error.email.already.used=The user name already exists -echobase.error.export.description.requiredstring=La description de l'export est obligatoire -echobase.error.export.name.requiredstring=Le nom de l'export est obligatoire +echobase.error.export.description.requiredstring=Export description required +echobase.error.export.name.requiredstring=Export name required echobase.error.export.sqlQuery.forbidden.alter.word=La requète contient le mot 'ALTER', ce qui est interdit echobase.error.export.sqlQuery.forbidden.delete.word=La requète contient le mot 'DELETE', ce qui est interdit echobase.error.export.sqlQuery.forbidden.drop.word=La requète contient le mot 'DROP', ce qui est interdit echobase.error.export.sqlQuery.forbidden.insert.word=La requète contient le mot 'INSERT', ce qui est interdit echobase.error.export.sqlQuery.forbidden.update.word=La requète contient le mot 'UPDATE', ce qui est interdit echobase.error.export.sqlQuery.requiredstring=La requète de l'export est obligatoire +echobase.error.exportMap.filename.required=Export filename required +echobase.error.exportMap.voyage.required=No voyage selected echobase.error.import.acousticDensityUnit.required=acousticDensityUnit non renseigné echobase.error.import.acquisitionSoftwareVersionER60.required=acquisitionSoftwareVersionER60 non renseigné echobase.error.import.acquisitionSoftwareVersionME70.required=acquisitionSoftwareVersionME70 non renseigné @@ -233,16 +237,15 @@ echobase.error.no.embeddedApplication.exportFileFound=New portable database not found echobase.error.no.exportDb.configurationFound=Database export configuration not found echobase.error.no.exportDb.exportFileFound=Database export archive not found +echobase.error.no.exportMap.configurationFound=Voyage maps export configuration not found +echobase.error.no.exportMap.exportFileFound=Voyage maps archive not found echobase.error.query.invalid.name=\=Query names must only contains alphanumeric characters echobase.error.query.name.already.exists=Query name already exists echobase.error.required.email=E-mail address required echobase.error.required.password=Password is required -echobase.error.showData.cellType.required=CellType required -echobase.error.showData.dataMetadata.required=DataMetadata required -echobase.error.showData.dataMetadataIdForLayer.required=Il faut sélectionner la méta-donnée à utiliser sur la couche -echobase.error.showData.echoTypeOrSpecies.required=Echotype or (and) Species is required -echobase.error.showData.noLayer.selected=Aucune couche de présentation sélectionnée -echobase.error.showData.voyage.required=Voyage required +echobase.error.showData.dataMetadataIdForLayer.required= +echobase.error.showData.noLayer.selected= +echobase.error.showData.voyage.required= echobase.error.warlocation.notFound=Database .war file not found at location %s echobase.error.workingDbConfiguration.couldNotConnect=Could not connect to database (%s) echobase.error.workingDbConfiguration.createOnlyOnPostgresql=Database creation is only possible for *Postgresql* type @@ -260,9 +263,12 @@ echobase.info.documentation=EchoBase online documentation echobase.info.downloadFiles=Download EchoBase or some import files echobase.info.echoR=EchoR project -echobase.info.exportDb.archive=Basebame of the archive, extension <strong>.echobase</strong> will be added to it. +echobase.info.exportDb.archive=Basename of the archive, extension <strong>.echobase</strong> will be added to it. echobase.info.exportDb.failed=Database export failed echobase.info.exportDb.succeded=Database export successful +echobase.info.exportMap.archive=Basename of the archive, extension <strong>.zip</strong> will be added to it. +echobase.info.exportMap.failed=Voyage maps export failed +echobase.info.exportMap.succeded=Voyage maps export successful echobase.info.import.failed=Import failed echobase.info.importData.failed=Data import failed echobase.info.importData.succeded=Data import sucessful @@ -311,6 +317,7 @@ echobase.label.exportAsSeen=Export as displayed on the screen echobase.label.exportDbFileName=Name of export file echobase.label.exportFileName=Name of export file +echobase.label.exportMapFileName=Name of export file echobase.label.importFile=File to export echobase.label.login=Connection echobase.label.numberOfCreatedEntities=No. of fields created @@ -334,6 +341,8 @@ echobase.legend.embeddedApplication.configuration=Portable database configuration echobase.legend.exportDb.configuration.files=Export configuration echobase.legend.exportDb.resume=Resume of database export +echobase.legend.exportMap.configuration.files=Export configuration +echobase.legend.exportMap.resume=Resume of voyage maps export echobase.legend.importData.configuration.selectImportType=Type of import selection echobase.legend.importData.configure=Import configuration echobase.legend.importData.createMission=Mission caracteristics @@ -355,6 +364,7 @@ echobase.menu.editData=Modify data echobase.menu.export=Export data echobase.menu.exportDb=Database export +echobase.menu.exportMap=Voyage maps export echobase.menu.importData=Import data echobase.menu.importDb=Database import echobase.menu.logs=Change log @@ -366,6 +376,7 @@ echobase.message.createEmbedded.result=Portable application was successful in %s. echobase.message.download.link=If download did not start by itself, you can start it manually from this link\: echobase.message.exportDb.result=Export of database (mode %s) was successful (file %s) in %s. +echobase.message.exportMap.result=Export of voyage maps was successful (file %s) in %s. echobase.message.importData.result=Data import successful in %s \:\n%s echobase.message.no.row.selected=No data selected echobase.message.no.spatial.database.support=The working db you are using is not compatible with postgis 2. @@ -394,6 +405,9 @@ echobase.title.exportDb=Export a complete database echobase.title.exportDbProgress=Export database in progress echobase.title.exportDbResult=Database export results +echobase.title.exportMap=Export voyage maps +echobase.title.exportMapProgress=Voyage maps export in progress +echobase.title.exportMapResult=Voyage maps export results echobase.title.exportTable=Export a table echobase.title.importData.selectImportType=Select type of import echobase.title.importDb=Database import Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2014-02-28 18:55:22 UTC (rev 967) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2014-03-01 23:20:47 UTC (rev 968) @@ -17,6 +17,7 @@ echobase.action.display=Afficher les données echobase.action.downloadEmbeddedApplicationFile=Télécharger l'application embarquée echobase.action.downloadExportDbFile=Télécharger le fichier d'export de la base complète +echobase.action.downloadExportMapFile=Télécharger le fichier d'export des cartes d'une campagne echobase.action.export=Exporter echobase.action.exportSqlData=Exporter les données echobase.action.exportTable=Exporter @@ -36,6 +37,7 @@ echobase.action.saveSqlQuery=Mettre à jour echobase.action.show.embedded.documentation=Comment utiliser une application embarquée echobase.action.show.exportDb.documentation=Comment exporter une base +echobase.action.show.exportMap.documentation=Comment exporter les cartes d'une campagne (Coser) echobase.action.show.import.documentation=Comment importer des données echobase.action.show.importDb.documentation=Comment importer une base echobase.action.show.showSpatialData.documentation=Comment visualiser des données spatiales @@ -181,6 +183,8 @@ echobase.error.export.sqlQuery.forbidden.insert.word=La requète contient le mot 'INSERT', ce qui est interdit echobase.error.export.sqlQuery.forbidden.update.word=La requète contient le mot 'UPDATE', ce qui est interdit echobase.error.export.sqlQuery.requiredstring=La requète de l'export est obligatoire +echobase.error.exportMap.filename.required=Le nom d'un fichier d'export est obligatoire +echobase.error.exportMap.voyage.required=La sélection d'une campagne est obligatoire echobase.error.import.acousticDensityUnit.required=acousticDensityUnit non renseigné echobase.error.import.acquisitionSoftwareVersionER60.required=acquisitionSoftwareVersionER60 non renseigné echobase.error.import.acquisitionSoftwareVersionME70.required=acquisitionSoftwareVersionME70 non renseigné @@ -233,6 +237,8 @@ echobase.error.no.embeddedApplication.exportFileFound=Application embarquée générée non trouvée echobase.error.no.exportDb.configurationFound=Configuration de l'export de la base non trouvée echobase.error.no.exportDb.exportFileFound=Archive d'export de la base introuvable +echobase.error.no.exportMap.configurationFound=Configuration de l'export des cartes d'une campagne +echobase.error.no.exportMap.exportFileFound=Archive d'export des cartes d'une campagne introuvable echobase.error.query.invalid.name=Le nom de la requête doit être constitué uniquement de caractères alphanumériques echobase.error.query.name.already.exists=Nom de requête déjà utilisé echobase.error.required.email=Courriel obligatoire @@ -263,6 +269,9 @@ echobase.info.exportDb.archive=Il s'agit du nom de l'archive, l'extension <strong>.echobase</strong> sera automatiquement rajoutée. echobase.info.exportDb.failed=L'export de la base de données a échoué echobase.info.exportDb.succeded=L'export de la base de données a réussi +echobase.info.exportMap.archive=Il s'agit du nom de l'archive, l'extension <strong>.zip</strong> sera automatiquement rajoutée. +echobase.info.exportMap.failed=L'export des cartes d'une campagne a échoué +echobase.info.exportMap.succeded=L'export des cartes d'une campagne a réussi echobase.info.import.failed=L'import a échoué echobase.info.importData.failed=L'import des données a échoué echobase.info.importData.succeded=L'import des données a réussi @@ -311,6 +320,7 @@ echobase.label.exportAsSeen=Exporter "comme à l'écran" echobase.label.exportDbFileName=Nom du fichier d'export echobase.label.exportFileName=Nom du fichier d'export +echobase.label.exportMapFileName=Nom du fichier d'export echobase.label.importFile=Fichier à importer echobase.label.login=Connexion echobase.label.numberOfCreatedEntities=Nombre de champs créés @@ -334,6 +344,8 @@ echobase.legend.embeddedApplication.configuration=Configuration de l'application embarquée echobase.legend.exportDb.configuration.files=Configuration de l'export echobase.legend.exportDb.resume=Résumé de l'export de base +echobase.legend.exportMap.configuration.files=Configuration de l'export +echobase.legend.exportMap.resume=Résumé de l'export des cartes d'une campagne echobase.legend.importData.configuration.selectImportType=Sélection du type d'import echobase.legend.importData.configure=Configurer l'import echobase.legend.importData.createMission=Caractéristiques de la mission @@ -355,6 +367,7 @@ echobase.menu.editData=Modifier les données echobase.menu.export=Exporter des données echobase.menu.exportDb=Exporter une base +echobase.menu.exportMap=Exporter les cartes d'une campagne echobase.menu.importData=Importer des données echobase.menu.importDb=Importer une base echobase.menu.logs=Journal des modifications @@ -366,6 +379,7 @@ echobase.message.createEmbedded.result=La création de l'application embarqué a réussi en %s echobase.message.download.link=Si le téléchargement n'a pas démarré automatiquement, suivez ce lien \: echobase.message.exportDb.result=L'export de la base (mode %s) a réussi (fichier %s) en %s +echobase.message.exportMap.result=L'export des cartes a réussi (fichier %s) en %s echobase.message.importData.result=Import de données réussi en %s \:\n%s echobase.message.no.row.selected=Aucune donnée sélectionnée echobase.message.no.spatial.database.support=La base de travail que vous utilisez ne possède pas de support spatiale. @@ -394,6 +408,9 @@ echobase.title.exportDb=Export complet de la base echobase.title.exportDbProgress=Export de la base de données en cours echobase.title.exportDbResult=Résultats de l'export de la base de données +echobase.title.exportMap=Export des cartes d'une campagne +echobase.title.exportMapProgress=Export des cartes d'une campagne en cours +echobase.title.exportMapResult=Résultats de l'export des cartes d'une campagne echobase.title.exportTable=Exporter une table echobase.title.importData.selectImportType=Sélection du type d'import echobase.title.importDb=Import d'une base Modified: trunk/echobase-ui/src/main/resources/struts.xml =================================================================== --- trunk/echobase-ui/src/main/resources/struts.xml 2014-02-28 18:55:22 UTC (rev 967) +++ trunk/echobase-ui/src/main/resources/struts.xml 2014-03-01 23:20:47 UTC (rev 968) @@ -292,6 +292,7 @@ <include file="config/struts-importDb.xml"/> <include file="config/struts-exportDb.xml"/> + <include file="config/struts-exportMap.xml"/> <include file="config/struts-removeData.xml"/> <include file="config/struts-spatial.xml"/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2014-02-28 18:55:22 UTC (rev 967) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2014-03-01 23:20:47 UTC (rev 968) @@ -149,6 +149,13 @@ </span> </s:a> </li> + <li> + <s:a action="configureInput" namespace="/exportMap" cssClass="spatial"> + <span> + <s:text name="echobase.menu.exportMap"/> + </span> + </s:a> + </li> </s:if> <li> <s:a action="userList" namespace="/user" cssClass="user"> Added: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/configure.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/configure.jsp 2014-03-01 23:20:47 UTC (rev 968) @@ -0,0 +1,65 @@ +<%-- + #%L + EchoBase :: UI + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 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% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<title><s:text name="echobase.title.exportMap"/></title> + +<script type="text/javascript"> + + jQuery(document).ready(function () { + + }); +</script> + +<s:form namespace="/exportMap" method="POST"> + <fieldset> + <legend> + <s:text name="echobase.legend.exportDb.configuration.files"/> + </legend> + + <div class="cleanBoth help"> + <s:a href="%{getDocumentation('exportMap.html', null)}" target="doc"> + <s:text name="echobase.action.show.exportMap.documentation"/> + </s:a> + </div> + <br/> + + <s:select key="model.voyageId" requiredLabel="true" + label='%{getText("echobase.common.voyage")}' + list="voyages" headerKey="" headerValue=""/> + + <div class="cleanBoth"></div> + <br/> + <s:textfield key="model.fileName" requiredLabel="true" size="100" + label="%{getText('echobase.label.exportMapFileName')} (*)"/> + + <div class="cleanBoth"> + <br/> + (*) <s:text name="echobase.info.exportMap.archive"/> + </div> + </fieldset> + <br/> + <s:submit action="configure" value='%{getText("echobase.action.export")}'/> +</s:form> Property changes on: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/configure.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/progress.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/progress.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/progress.jsp 2014-03-01 23:20:47 UTC (rev 968) @@ -0,0 +1,39 @@ +<%-- + #%L + EchoBase :: UI + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 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% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> + +<meta http-equiv="refresh" content='10;url=<s:url action="export" namespace="/exportMap"/>'/> + +<title><s:text name="echobase.title.exportMapProgress"/></title> + +<%-- TODO letellier 20111104 : Add warn icon --%> +<p><s:text name="echobase.message.warnExportInProgress"/></p> + +<br/> + +<div> + <sj:progressbar value="%{model.progress}"/> +</div> \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/progress.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/result.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/result.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/result.jsp 2014-03-01 23:20:47 UTC (rev 968) @@ -0,0 +1,54 @@ +<%-- + #%L + EchoBase :: UI + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 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% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<s:url id="downloadUrl" namespace="/exportMap" action="download"/> + +<script type="text/javascript"> + + jQuery(document).ready(function () { + + // start to download by it-self the result of import + window.open("${downloadUrl}"); + }); + +</script> +<title><s:text name="echobase.title.exportMapResult"/></title> + +<%@ include file="/WEB-INF/includes/actionResult.jsp" %> + +<div> + L'export des cartes de la campagne a réussi en <s:property value="model.actionTime"/>. +</div> + +<br/> + +<div> + Si le téléchargement n'a pas démarré automatiquement, suivez ce lien : + <a href="${downloadUrl}" target="download"> + <s:text name="echobase.action.downloadExportMapFile"/> + </a> +</div> + Property changes on: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportMap/result.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0