November 2010 - Wao-commits - mailman.cloud.codelutin.com

[Suiviobsmer-commits] r817 - in trunk: wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/java/fr/ifremer/wao/service wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org 30 Nov '10

30 Nov '10

Author: bleny Date: 2010-11-30 11:11:13 +0000 (Tue, 30 Nov 2010) New Revision: 817 Log: add DCF5 code filtering in synthesis Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-ui/src/main/webapp/Synthesis.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-11-29 17:53:00 UTC (rev 816) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-11-30 11:11:13 UTC (rev 817) @@ -204,14 +204,21 @@ return query; } + public TopiaQuery applySamplingFilter(SamplingFilter filter) { + return applySamplingFilter(filter, true); + } + /** * Prepare the {@code query} with sampleRow filters. Need the {@code main} * alias to set SampleRow properties. The zoneAlias can also be used if * the query already have the fishingZone. * + * @param joinDCF5ifneeded set it to false if your request already join + * sample-rows to DCF5code. Otherwise, your request full to the join + * two times and will lead to a bad HQL * @return the query with filtered elements added */ - public TopiaQuery applySamplingFilter(SamplingFilter filter) { + public TopiaQuery applySamplingFilter(SamplingFilter filter, boolean joinDCF5ifneeded) { // need sampleRowProperty, may have fishingZoneProperty @@ -331,13 +338,28 @@ query.addWhere(sampleRowProperty.periodEnd(), TopiaQuery.Op.GE, calendar.getTime()); } + WaoQueryHelper.DCF5CodeProperty dcf5CodeProperty = + WaoQueryHelper.newDCF5CodeProperty(); + + if (joinDCF5ifneeded) { + // needed is true if we need to make the join, we need to if any + // of DCF is used in filter + boolean needed = filter.getFishingGearDCF() != null + || filter.getTargetSpeciesDCF() != null; + + if (needed) { + query.addLeftJoin(sampleRowProperty.dCF5Code(), + dcf5CodeProperty.$alias(), false); + } + } + if (filter.getFishingGearDCF() != null) { - query.addEquals(WaoQueryHelper.newDCF5CodeProperty().fishingGearDCF(), + query.addEquals(dcf5CodeProperty.fishingGearDCF(), filter.getFishingGearDCF()); } if (filter.getTargetSpeciesDCF() != null) { - query.addEquals(WaoQueryHelper.newDCF5CodeProperty().targetSpeciesDCF(), + query.addEquals(dcf5CodeProperty.targetSpeciesDCF(), filter.getTargetSpeciesDCF()); } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-11-29 17:53:00 UTC (rev 816) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-11-30 11:11:13 UTC (rev 817) @@ -531,7 +531,7 @@ WaoQueryHelper.DCF5CodeProperty dcf5CodeProperty = WaoQueryHelper.newDCF5CodeProperty(); - TopiaQuery query = builder.applySamplingFilter(filter). + TopiaQuery query = builder.applySamplingFilter(filter, false). addDistinct(). setSelect(sampleRowProperty.$alias()). addLeftJoin(sampleRowProperty.dCF5Code(), Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-29 17:53:00 UTC (rev 816) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-30 11:11:13 UTC (rev 817) @@ -273,7 +273,7 @@ } } - // results like + // results like (first column is a boat entity) // [AN TUAZ COZ, 2010_0043, 2009-11-19 00:00:00.0] // [AN TUAZ COZ, 2010_0043, 2009-11-20 00:00:00.0] // [APHRODITE, 2009_0185, 2009-09-24 00:00:00.0] Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-11-29 17:53:00 UTC (rev 816) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-11-30 11:11:13 UTC (rev 817) @@ -79,6 +79,12 @@  </div> + <div> + <t:label t:for="fishingGearDCF" /> : + <input t:type="select" t:id="fishingGearDCF" t:model="dcfGearSelectModel" value="fishingGearDCFId"/>  + <t:label t:for="targetSpeciesDCF" /> : + <input t:type="select" t:id="targetSpeciesDCF" t:model="dcfSpeciesSelectModel" value="targetSpeciesDCFId"/>  + </div> <div class="filterRow"> <input t:type="checkbox" t:id="estimatedTides" value="filter.estimatedTides" /> <t:label t:for="estimatedTides" title="L'effort d'observations estimé équivaut au nombre de contacts validés ou non par la société. Les contacts refusés par le programme ne sont pas pris en compte" />

1 0

[Suiviobsmer-commits] r816 - in trunk: wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/java/fr/ifremer/wao/service wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/resources/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp wao-ui/src/main/webapp/WEB-INF
by bleny＠users.labs.libre-entreprise.org 29 Nov '10

29 Nov '10

Author: bleny Date: 2010-11-29 17:53:00 +0000 (Mon, 29 Nov 2010) New Revision: 816 Log: minor fixes Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties trunk/wao-ui/src/main/webapp/SamplingPlan.tml trunk/wao-ui/src/main/webapp/WEB-INF/app.properties Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-11-28 20:10:23 UTC (rev 815) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-11-29 17:53:00 UTC (rev 816) @@ -215,8 +215,6 @@ // need sampleRowProperty, may have fishingZoneProperty - SampleRow sampleRow = filter.getSampleRow(); - String codeDCF5 = filter.getCodeDCF5(); String programName = filter.getProgramName(); PeriodDates period = filter.getPeriod(); Date fromDate = filter.getFromDate(); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-28 20:10:23 UTC (rev 815) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-29 17:53:00 UTC (rev 816) @@ -663,8 +663,6 @@ protected Map<String, Double> executeGetDataReliability (TopiaContext transaction, SamplingFilter filter) throws Exception { - // FIXME bleny 20101028 exception if company is not in the DB results - WaoQueryBuilder builder = context.newQueryBuilder(); ContactProperty contactProperty = builder.initializeForContact(); @@ -871,8 +869,11 @@ } } - double percentRealized = ((double) totalNumberOfRealized / + Double percentRealized = null; + if (totalNumberOfPlanned > 0) { + percentRealized = ((double) totalNumberOfRealized / (double) totalNumberOfPlanned) * 100.0; + } if (log.isDebugEnabled()) { log.debug(String.format("percent realized %f %%", percentRealized)); @@ -918,7 +919,10 @@ } double numberOfCompanies = (double) allegroReactivity.size(); - double totalAverages = sumAverages / numberOfCompanies; + Double totalAverages = null; + if (numberOfCompanies > 0) { + totalAverages = sumAverages / numberOfCompanies; + } return totalAverages; } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2010-11-28 20:10:23 UTC (rev 815) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2010-11-29 17:53:00 UTC (rev 816) @@ -612,9 +612,15 @@ if ( ! existingFishingGearCodes.contains(code.getFishingGearCode())) { sampleRowForm.recordError(code.getFishingGearCode() + " n'est pas un code d'engin valide"); } - if (code.getTargetSpeciesCode() != null && - ! existingTargetSpeciesCodes.contains(code.getTargetSpeciesCode())) { - sampleRowForm.recordError(code.getTargetSpeciesCode() + " n'est pas un code d'espèces cibles valide"); + + if (StringUtils.isEmpty(code.getTargetSpeciesCode())) { + if (StringUtils.isEmpty(getSampleRow().getProfession().getSpecies())) { + sampleRowForm.recordError("Le code DCF d'espèces cibles peut ne pas être renseigné, mais dans ce cas il faut préciser une description des espèces cibles"); + } + } else { + if ( ! existingTargetSpeciesCodes.contains(code.getTargetSpeciesCode())) { + sampleRowForm.recordError(code.getTargetSpeciesCode() + " n'est pas un code d'espèces cibles valide"); + } } } } Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties 2010-11-28 20:10:23 UTC (rev 815) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties 2010-11-29 17:53:00 UTC (rev 816) @@ -33,6 +33,8 @@ company-label: Soci\u00e9t\u00e9 programName-label: Programme estimatedTides-label: Voir l'effort d'observations estim\u00e9 +fishingGearDCF-label: Engins code DCF +targetSpeciesDCF-label: Ensembles d\'esp\u00e8ces-cible code DCF companyForBoarding-label: Soci\u00e9t\u00e9 Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-28 20:10:23 UTC (rev 815) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-29 17:53:00 UTC (rev 816) @@ -206,12 +206,10 @@ title="Changer les dates de la période par rapport à celles de la ligne"> ${row.code} </a> - <t:if t:test="canEditSampleRow()"> - <t:if test="rowModified"> - <a t:type="pagelink" t:page="sampleRowHistoric" t:context="row.code"> - <img src="${asset:context:}/img/clock-22px.png" class="fright" alt=" * " title="Cette ligne a été modifiée (voir l'historique)"/> - </a> - </t:if> + <t:if test="rowModified"> + <a t:type="pagelink" t:page="sampleRowHistoric" t:context="row.code"> + <img src="${asset:context:}/img/clock-22px.png" class="fright" alt=" * " title="Cette ligne a été modifiée (voir l'historique)"/> + </a> </t:if> </td> <td class="width150">${row.programName}</td> Modified: trunk/wao-ui/src/main/webapp/WEB-INF/app.properties =================================================================== --- trunk/wao-ui/src/main/webapp/WEB-INF/app.properties 2010-11-28 20:10:23 UTC (rev 815) +++ trunk/wao-ui/src/main/webapp/WEB-INF/app.properties 2010-11-29 17:53:00 UTC (rev 816) @@ -33,7 +33,8 @@ ContactState.CONTACT_START: Contact pris DataReliability.UNKNOWN: Inconnue -DataReliability.NOT_RELIABLE: Non-exploitable +DataReliability.NOT_RELIABLE: Non exploitable DataReliability.DOUBTFUL: Douteuse DataReliability.RELIABLE: Exploitable +DataReliability.NOT_PROVIDED: Non contr\u00f4l\u00e9e

1 0

[Suiviobsmer-commits] r815 - trunk
by tchemit＠users.labs.libre-entreprise.org 28 Nov '10

28 Nov '10

Author: tchemit Date: 2010-11-28 20:10:23 +0000 (Sun, 28 Nov 2010) New Revision: 815 Log: use last dev version of eugene and topia Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-26 18:03:26 UTC (rev 814) +++ trunk/pom.xml 2010-11-28 20:10:23 UTC (rev 815) @@ -331,8 +331,8 @@ <nuitonI18nVersion>1.2.2</nuitonI18nVersion> <nuitonUtilsVersion>1.4.2</nuitonUtilsVersion> <nuitonWebVersion>0.1</nuitonWebVersion> - <topiaVersion>2.4.4-SNAPSHOT</topiaVersion> - <eugeneVersion>2.2.1-SNAPSHOT</eugeneVersion> + <topiaVersion>2.5-SNAPSHOT</topiaVersion> + <eugeneVersion>2.3-SNAPSHOT</eugeneVersion> <tapestryVersion>5.1.0.5</tapestryVersion> <hibernateVersion>3.3.2.GA</hibernateVersion>

1 0

[Suiviobsmer-commits] r814 - trunk
by tchemit＠users.labs.libre-entreprise.org 26 Nov '10

26 Nov '10

Author: tchemit Date: 2010-11-26 18:03:26 +0000 (Fri, 26 Nov 2010) New Revision: 814 Log: use dev version of eugene and topia Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-26 16:21:42 UTC (rev 813) +++ trunk/pom.xml 2010-11-26 18:03:26 UTC (rev 814) @@ -331,8 +331,8 @@ <nuitonI18nVersion>1.2.2</nuitonI18nVersion> <nuitonUtilsVersion>1.4.2</nuitonUtilsVersion> <nuitonWebVersion>0.1</nuitonWebVersion> - <topiaVersion>2.4.3</topiaVersion> - <eugeneVersion>2.2</eugeneVersion> + <topiaVersion>2.4.4-SNAPSHOT</topiaVersion> + <eugeneVersion>2.2.1-SNAPSHOT</eugeneVersion> <tapestryVersion>5.1.0.5</tapestryVersion> <hibernateVersion>3.3.2.GA</hibernateVersion>

1 0

[Suiviobsmer-commits] r813 - in trunk: . wao-business wao-ui
by bleny＠users.labs.libre-entreprise.org 26 Nov '10

26 Nov '10

Author: bleny Date: 2010-11-26 16:21:42 +0000 (Fri, 26 Nov 2010) New Revision: 813 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-26 16:21:40 UTC (rev 812) +++ trunk/pom.xml 2010-11-26 16:21:42 UTC (rev 813) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.6</version> + <version>1.7-SNAPSHOT</version> <modules> <module>wao-ui</module> @@ -346,12 +346,12 @@ <scm> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.6 + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </connection> <developerConnection> - scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.6 + scm:svn:svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.6?root=suiviobsm… + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer </url> </scm> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-11-26 16:21:40 UTC (rev 812) +++ trunk/wao-business/pom.xml 2010-11-26 16:21:42 UTC (rev 813) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.6</version> + <version>1.7-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -229,13 +229,13 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.6/?root=suiviobs… + http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su… </url> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.6/wao-business + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business </connection> <developerConnection> - scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.6/wao-business + scm:svn:svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business </developerConnection> </scm> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-11-26 16:21:40 UTC (rev 812) +++ trunk/wao-ui/pom.xml 2010-11-26 16:21:42 UTC (rev 813) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.6</version> + <version>1.7-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -270,13 +270,13 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.6/?root=suiviobs… + http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs… </url> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.6/wao-ui + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui </connection> <developerConnection> - scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.6/wao-ui + scm:svn:svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui </developerConnection> </scm>

1 0

[Suiviobsmer-commits] r812 - in tags: . wao-1.6
by bleny＠users.labs.libre-entreprise.org 26 Nov '10

26 Nov '10

Author: bleny Date: 2010-11-26 16:21:40 +0000 (Fri, 26 Nov 2010) New Revision: 812 Log: [maven-release-plugin] copy for tag wao-1.6 Added: tags/wao-1.6/ Property changes on: tags/wao-1.6 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws *.iml target nbactions.xml Added: svn:mergeinfo + /branches/wao-1.5.x:679-733

1 0

[Suiviobsmer-commits] r811 - in trunk: . wao-business wao-ui
by bleny＠users.labs.libre-entreprise.org 26 Nov '10

26 Nov '10

Author: bleny Date: 2010-11-26 16:18:21 +0000 (Fri, 26 Nov 2010) New Revision: 811 Log: [maven-release-plugin] prepare release wao-1.6 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-26 16:14:46 UTC (rev 810) +++ trunk/pom.xml 2010-11-26 16:18:21 UTC (rev 811) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -17,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.6</version> <modules> <module>wao-ui</module> @@ -348,12 +346,12 @@ <scm> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.6 </connection> <developerConnection> - scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk + scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.6 </developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.6?root=suiviobsm… </url> </scm> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-11-26 16:14:46 UTC (rev 810) +++ trunk/wao-business/pom.xml 2010-11-26 16:18:21 UTC (rev 811) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -12,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.6</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -231,13 +229,13 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su… + http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.6/?root=suiviobs… </url> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.6/wao-business </connection> <developerConnection> - scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business + scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.6/wao-business </developerConnection> </scm> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-11-26 16:14:46 UTC (rev 810) +++ trunk/wao-ui/pom.xml 2010-11-26 16:18:21 UTC (rev 811) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -12,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.6</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -272,13 +270,13 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs… + http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.6/?root=suiviobs… </url> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.6/wao-ui </connection> <developerConnection> - scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui + scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.6/wao-ui </developerConnection> </scm>

1 0

[Suiviobsmer-commits] r810 - trunk/wao-ui
by bleny＠users.labs.libre-entreprise.org 26 Nov '10

26 Nov '10

Author: bleny Date: 2010-11-26 16:14:46 +0000 (Fri, 26 Nov 2010) New Revision: 810 Log: use in developerConnection Modified: trunk/wao-ui/pom.xml Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-11-26 16:00:26 UTC (rev 809) +++ trunk/wao-ui/pom.xml 2010-11-26 16:14:46 UTC (rev 810) @@ -278,7 +278,7 @@ scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui </connection> <developerConnection> - scm:svn:svn+ssh://tchemit at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui + scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui </developerConnection> </scm>

1 0

[Suiviobsmer-commits] r809 - in trunk: src/announcement src/license src/site/resources/admin src/site/resources/coordinator src/site/resources/guest src/site/resources/user src/site/rst src/site/rst/admin src/site/rst/coordinator src/site/rst/guest src/site/rst/user wao-business/src/license wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/java/fr/ifremer/wao/bean wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/java/fr/ifremer/wao/io wao-business/src/main/java/fr/ifremer
by tchemit＠users.labs.libre-entreprise.org 26 Nov '10

26 Nov '10

Author: tchemit Date: 2010-11-26 16:00:26 +0000 (Fri, 26 Nov 2010) New Revision: 809 Log: normalize svn-keywords Modified: trunk/src/announcement/release-email-1.2.txt trunk/src/announcement/release-email-1.3.txt trunk/src/announcement/release-email-1.4.1.txt trunk/src/announcement/release-email-1.4.txt trunk/src/announcement/release-email-1.5.1.txt trunk/src/announcement/release-email-1.5.2.txt trunk/src/announcement/release-email-1.5.3.txt trunk/src/announcement/release-email-1.5.4.txt trunk/src/announcement/release-email-1.5.txt trunk/src/announcement/release-email-1.6.txt trunk/src/license/project.xml trunk/src/site/resources/admin/contacts_comment_actions.png trunk/src/site/resources/admin/contacts_comment_popup.png trunk/src/site/resources/admin/depeche_with_anchor.png trunk/src/site/resources/admin/edit_depeche_with_anchor.png trunk/src/site/resources/admin/icone_quartier.png trunk/src/site/resources/admin/imports.png trunk/src/site/resources/admin/map_quartier.png trunk/src/site/resources/admin/roles.png trunk/src/site/resources/admin/zoom_quartier.png trunk/src/site/resources/coordinator/contacts_comment_actions.png trunk/src/site/resources/coordinator/contacts_comment_popup.png trunk/src/site/resources/coordinator/depeche_with_anchor.png trunk/src/site/resources/coordinator/edit_depeche_with_anchor.png trunk/src/site/resources/coordinator/roles.png trunk/src/site/resources/coordinator/users.png trunk/src/site/resources/guest/autoComplete.png trunk/src/site/resources/guest/sampling_plan.png trunk/src/site/resources/guest/sampling_plan_comment.png trunk/src/site/resources/guest/sampling_plan_history.png trunk/src/site/resources/user/Guide_WAO-creer_modifier_contact_V1.pdf trunk/src/site/resources/user/icone_quartier.png trunk/src/site/resources/user/map_quartier.png trunk/src/site/resources/user/profil.png trunk/src/site/resources/user/zoom_quartier.png trunk/src/site/rst/admin/seeContacts.rst trunk/src/site/rst/coordinator/news.rst trunk/src/site/rst/coordinator/users.rst trunk/src/site/rst/guest.rst trunk/src/site/rst/guest/echantillonage.rst trunk/src/site/rst/obsdeb.rst trunk/src/site/rst/user/seeContacts.rst trunk/wao-business/src/license/THIRD-PARTY.properties trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoServiceFactory.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactPieChartConstant.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/DataReliability.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisParametersImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/PieChartDataImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/PieChartSeriesImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/DCF5CodeImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/NewsImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/ContactInput.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportRefusedException.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ExportHelper.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ImportHelper.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/SamplingExport.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictKmlReaderJak.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictKmlReaderXpp3.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictSchemaData.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/ContactKmlWriterJak.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/IconSizeHelper.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlIOFactory.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlReader.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlWriter.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceChartEmpty.java trunk/wao-business/src/test/java/fr/ifremer/wao/WaoMigrationCallBackTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/bean/PieChartDataImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/bean/UserRoleTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/entity/WaoUserImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceCartographyImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java trunk/wao-business/src/test/resources/import/boat_districts.kml trunk/wao-ui/src/license/THIRD-PARTY.properties trunk/wao-ui/src/main/assembly/Wao.properties trunk/wao-ui/src/main/assembly/bin.xml trunk/wao-ui/src/main/assembly/go.bat trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Footer.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/IndicatorLevels.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/FiltersModel.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/KmlStreamResponse.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/IndicatorsHistory.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategy.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategyContacts.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ImportFieldSet.tml trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/LogFile.tml trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Connexion.properties trunk/wao-ui/src/main/resources/org/apache/tapestry5/corelib/components/Errors_fr.properties trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml trunk/wao-ui/src/main/webapp/css/cartography.css trunk/wao-ui/src/main/webapp/css/synthesis-print.css trunk/wao-ui/src/main/webapp/img/add-16px.png trunk/wao-ui/src/main/webapp/img/cartography.png trunk/wao-ui/src/main/webapp/img/comment-unavailable-22px.png trunk/wao-ui/src/main/webapp/img/invalid-16px.png trunk/wao-ui/src/main/webapp/img/samplingPlan-estimated.png trunk/wao-ui/src/main/webapp/img/samplingPlan-real.png trunk/wao-ui/src/main/webapp/img/source/synthesis-ind-data-reliability.xcf trunk/wao-ui/src/main/webapp/img/synthesis-global-synthesis.png trunk/wao-ui/src/main/webapp/img/synthesis-ind-data-reliability.png trunk/wao-ui/src/main/webapp/img/valid-16px.png trunk/wao-ui/src/main/webapp/js/OpenLayers/OpenLayers.js trunk/wao-ui/src/main/webapp/js/OpenLayers/img/blank.gif trunk/wao-ui/src/main/webapp/js/OpenLayers/img/cloud-popup-relative.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/drag-rectangle-off.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/drag-rectangle-on.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/east-mini.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/layer-switcher-maximize.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/layer-switcher-minimize.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/marker-blue.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/marker-gold.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/marker-green.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/marker.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/measuring-stick-off.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/measuring-stick-on.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/north-mini.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/panning-hand-off.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/panning-hand-on.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/slider.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/south-mini.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/west-mini.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/zoom-minus-mini.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/zoom-plus-mini.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/zoom-world-mini.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/zoombar.png trunk/wao-ui/src/main/webapp/js/OpenLayers/license.txt trunk/wao-ui/src/main/webapp/js/OpenLayers/news.txt trunk/wao-ui/src/main/webapp/js/OpenLayers/readme.txt trunk/wao-ui/src/main/webapp/js/OpenLayers/release-license.txt trunk/wao-ui/src/main/webapp/js/OpenLayers/repository-license.txt trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/framedCloud.css trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/google.css trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/ie6-style.css trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/add_point_off.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/add_point_on.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/blank.gif trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/close.gif trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/drag-rectangle-off.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/drag-rectangle-on.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/draw_line_off.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/draw_line_on.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/draw_point_off.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/draw_point_on.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/draw_polygon_off.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/draw_polygon_on.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/editing_tool_bar.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/move_feature_off.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/move_feature_on.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/navigation_history.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/overview_replacement.gif trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/pan-panel-NOALPHA.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/pan-panel.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/pan_off.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/pan_on.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/panning-hand-off.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/panning-hand-on.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/remove_point_off.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/remove_point_on.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/ruler.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/save_features_off.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/save_features_on.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/view_next_off.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/view_next_on.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/view_previous_off.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/view_previous_on.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/zoom-panel-NOALPHA.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/zoom-panel.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/style.css trunk/wao-ui/src/main/webapp/js/administration.js trunk/wao-ui/src/main/webapp/js/cartography.js trunk/wao-ui/src/main/webapp/js/contacts.js trunk/wao-ui/src/main/webapp/js/news.js Property changes on: trunk/src/announcement/release-email-1.2.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Property changes on: trunk/src/announcement/release-email-1.3.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/announcement/release-email-1.4.1.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/announcement/release-email-1.4.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/announcement/release-email-1.5.1.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/announcement/release-email-1.5.2.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/announcement/release-email-1.5.3.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/announcement/release-email-1.5.4.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/announcement/release-email-1.5.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/announcement/release-email-1.6.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/license/project.xml ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/contacts_comment_actions.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/contacts_comment_popup.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/depeche_with_anchor.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/edit_depeche_with_anchor.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/icone_quartier.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/imports.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/map_quartier.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/roles.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/zoom_quartier.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/coordinator/contacts_comment_actions.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/coordinator/contacts_comment_popup.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/coordinator/depeche_with_anchor.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/coordinator/edit_depeche_with_anchor.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/coordinator/roles.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/coordinator/users.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/guest/autoComplete.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/guest/sampling_plan.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/guest/sampling_plan_comment.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/guest/sampling_plan_history.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/user/Guide_WAO-creer_modifier_contact_V1.pdf ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/user/icone_quartier.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/user/map_quartier.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/user/profil.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/user/zoom_quartier.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/admin/seeContacts.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/coordinator/news.rst =================================================================== --- trunk/src/site/rst/coordinator/news.rst 2010-11-26 15:59:59 UTC (rev 808) +++ trunk/src/site/rst/coordinator/news.rst 2010-11-26 16:00:26 UTC (rev 809) @@ -5,8 +5,8 @@ .. * #%L .. * Wao .. * -.. * $Id: news.rst 462 2010-04-19 23:41:59Z tchemit $ -.. * $HeadURL: svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/src/site/rst/coordinato… $ +.. * $Id$ +.. * $HeadURL$ .. * %% .. * Copyright (C) 2009 - 2010 Ifremer .. * %% Property changes on: trunk/src/site/rst/coordinator/news.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/coordinator/users.rst =================================================================== --- trunk/src/site/rst/coordinator/users.rst 2010-11-26 15:59:59 UTC (rev 808) +++ trunk/src/site/rst/coordinator/users.rst 2010-11-26 16:00:26 UTC (rev 809) @@ -5,8 +5,8 @@ .. * #%L .. * Wao .. * -.. * $Id: users.rst 523 2010-06-15 09:20:19Z jcouteau $ -.. * $HeadURL: svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/src/site/rst/admin/user… $ +.. * $Id$ +.. * $HeadURL$ .. * %% .. * Copyright (C) 2009 - 2010 Ifremer .. * %% Property changes on: trunk/src/site/rst/coordinator/users.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/guest/echantillonage.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/guest.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/obsdeb.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/user/seeContacts.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoServiceFactory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactPieChartConstant.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java 2010-11-26 15:59:59 UTC (rev 808) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java 2010-11-26 16:00:26 UTC (rev 809) @@ -3,7 +3,7 @@ * Wao :: Business * * * $Id$ - * $HeadURL: svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business/src/main/j… $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2010 Ifremer * %% Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/DataReliability.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisParametersImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/PieChartDataImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/PieChartSeriesImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/DCF5CodeImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/NewsImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/ContactInput.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportRefusedException.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ExportHelper.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ExportHelper.java 2010-11-26 15:59:59 UTC (rev 808) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ExportHelper.java 2010-11-26 16:00:26 UTC (rev 809) @@ -2,8 +2,8 @@ * #%L * Wao :: Business * - * $Id: ExportHelper.java 492 2010-06-07 18:36:10Z fdesbois $ - * $HeadURL: svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business/src/main/j… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2009 - 2010 Ifremer * %% Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ExportHelper.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ImportHelper.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ImportHelper.java 2010-11-26 15:59:59 UTC (rev 808) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ImportHelper.java 2010-11-26 16:00:26 UTC (rev 809) @@ -2,8 +2,8 @@ * #%L * Wao :: Business * - * $Id: ImportHelper.java 570 2010-06-28 14:29:55Z fdesbois $ - * $HeadURL: svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business/src/main/j… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2009 - 2010 Ifremer * %% Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ImportHelper.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/SamplingExport.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/SamplingExport.java 2010-11-26 15:59:59 UTC (rev 808) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/SamplingExport.java 2010-11-26 16:00:26 UTC (rev 809) @@ -2,8 +2,8 @@ * #%L * Wao :: Business * - * $Id: SamplingExport.java 507 2010-06-11 14:51:13Z fdesbois $ - * $HeadURL: svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business/src/main/j… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2009 - 2010 Ifremer * %% Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/SamplingExport.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java 2010-11-26 15:59:59 UTC (rev 808) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java 2010-11-26 16:00:26 UTC (rev 809) @@ -2,8 +2,8 @@ * #%L * Wao :: Business * - * $Id: WaoCsvHeader.java 462 2010-04-19 23:41:59Z tchemit $ - * $HeadURL: svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business/src/main/j… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2009 - 2010 Ifremer * %% Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictKmlReaderJak.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictKmlReaderXpp3.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictSchemaData.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/ContactKmlWriterJak.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/IconSizeHelper.java ___________________________________________________________________ Modified: svn:keywords - Id HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlIOFactory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlReader.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlWriter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceChartEmpty.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/WaoMigrationCallBackTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/bean/PieChartDataImplTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/bean/UserRoleTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/WaoUserImplTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceCartographyImplTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/test/resources/import/boat_districts.kml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/assembly/Wao.properties ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/assembly/bin.xml ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/assembly/go.bat ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Footer.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/IndicatorLevels.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/FiltersModel.java ___________________________________________________________________ Modified: svn:keywords - Id HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/KmlStreamResponse.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/IndicatorsHistory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategy.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategyContacts.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ImportFieldSet.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/LogFile.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Connexion.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/resources/org/apache/tapestry5/corelib/components/Errors_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml =================================================================== --- trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml 2010-11-26 15:59:59 UTC (rev 808) +++ trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml 2010-11-26 16:00:26 UTC (rev 809) @@ -3,11 +3,11 @@ #%L Wao :: Web Interface - $Author: bleny $ - $LastChangedDate: 2010-11-02 22:17:33 +0100 (mar. 02 nov. 2010) $ - $LastChangedRevision: 727 $ - $Id: Synthesis.tml 727 2010-11-02 21:17:33Z bleny $ - $HeadURL: svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui/src/main/webapp/… $ + $Author$ + $LastChangedDate$ + $LastChangedRevision$ + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer %% Property changes on: trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/css/cartography.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/css/synthesis-print.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/add-16px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/cartography.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/comment-unavailable-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/invalid-16px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/samplingPlan-estimated.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/samplingPlan-real.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/source/synthesis-ind-data-reliability.xcf ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/synthesis-global-synthesis.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/synthesis-ind-data-reliability.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/valid-16px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/webapp/js/OpenLayers/OpenLayers.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/OpenLayers/OpenLayers.js 2010-11-26 15:59:59 UTC (rev 808) +++ trunk/wao-ui/src/main/webapp/js/OpenLayers/OpenLayers.js 2010-11-26 16:00:26 UTC (rev 809) @@ -114,7 +114,7 @@ scriptLocation="";var isOL=new RegExp("(^|(.*?\\/))("+OpenLayers._scriptName+")(\\?|$)");var scripts=document.getElementsByTagName('script');for(var i=0,len=scripts.length;i<len;i++){var src=scripts[i].getAttribute('src');if(src){var match=src.match(isOL);if(match){scriptLocation=match[1];break;}}} return scriptLocation;}};if(!singleFile){var jsfiles=new Array("OpenLayers/Util.js","OpenLayers/BaseTypes.js","OpenLayers/BaseTypes/Class.js","OpenLayers/BaseTypes/Bounds.js","OpenLayers/BaseTypes/Element.js","OpenLayers/BaseTypes/LonLat.js","OpenLayers/BaseTypes/Pixel.js","OpenLayers/BaseTypes/Size.js","OpenLayers/Console.js","OpenLayers/Tween.js","Rico/Corner.js","Rico/Color.js","OpenLayers/Ajax.js","OpenLayers/Events.js","OpenLayers/Request.js","OpenLayers/Request/XMLHttpRequest.js","OpenLayers/Projection.js","OpenLayers/Map.js","OpenLayers/Layer.js","OpenLayers/Icon.js","OpenLayers/Marker.js","OpenLayers/Marker/Box.js","OpenLayers/Popup.js","OpenLayers/Tile.js","OpenLayers/Tile/Image.js","OpenLayers/Tile/Image/IFrame.js","OpenLayers/Tile/WFS.js","OpenLayers/Layer/Image.js","OpenLayers/Layer/SphericalMercator.js","OpenLayers/Layer/EventPane.js","OpenLayers/Layer/FixedZoomLevels.js","OpenLayers/Layer/Google.js","OpenLayers/Layer/VirtualEarth.js","OpenLayers/Layer/Yahoo.js","OpenLayers/Layer/HTTPRequest.js","OpenLayers/Layer/Grid.js","OpenLayers/Layer/MapGuide.js","OpenLayers/Layer/MapServer.js","OpenLayers/Layer/MapServer/Untiled.js","OpenLayers/Layer/KaMap.js","OpenLayers/Layer/KaMapCache.js","OpenLayers/Layer/MultiMap.js","OpenLayers/Layer/Markers.js","OpenLayers/Layer/Text.js","OpenLayers/Layer/WorldWind.js","OpenLayers/Layer/ArcGIS93Rest.js","OpenLayers/Layer/WMS.js","OpenLayers/Layer/WMS/Untiled.js","OpenLayers/Layer/WMS/Post.js","OpenLayers/Layer/ArcIMS.js","OpenLayers/Layer/GeoRSS.js","OpenLayers/Layer/Boxes.js","OpenLayers/Layer/XYZ.js","OpenLayers/Layer/TMS.js","OpenLayers/Layer/TileCache.js","OpenLayers/Layer/Zoomify.js","OpenLayers/Popup/Anchored.js","OpenLayers/Popup/AnchoredBubble.js","OpenLayers/Popup/Framed.js","OpenLayers/Popup/FramedCloud.js","OpenLayers/Feature.js","OpenLayers/Feature/Vector.js","OpenLayers/Feature/WFS.js","OpenLayers/Handler.js","OpenLayers/Handler/Click.js","OpenLayers/Handler/Hover.js","OpenLayers/Handler/Point.js","OpenLayers/Handler/Path.js","OpenLayers/Handler/Polygon.js","OpenLayers/Handler/Feature.js","OpenLayers/Handler/Drag.js","OpenLayers/Handler/RegularPolygon.js","OpenLayers/Handler/Box.js","OpenLayers/Handler/MouseWheel.js","OpenLayers/Handler/Keyboard.js","OpenLayers/Control.js","OpenLayers/Control/Attribution.js","OpenLayers/Control/Button.js","OpenLayers/Control/ZoomBox.js","OpenLayers/Control/ZoomToMaxExtent.js","OpenLayers/Control/DragPan.js","OpenLayers/Control/Navigation.js","OpenLayers/Control/MouseDefaults.js","OpenLayers/Control/MousePosition.js","OpenLayers/Control/OverviewMap.js","OpenLayers/Control/KeyboardDefaults.js","OpenLayers/Control/PanZoom.js","OpenLayers/Control/PanZoomBar.js","OpenLayers/Control/ArgParser.js","OpenLayers/Control/Permalink.js","OpenLayers/Control/Scale.js","OpenLayers/Control/ScaleLine.js","OpenLayers/Control/Snapping.js","OpenLayers/Control/Split.js","OpenLayers/Control/LayerSwitcher.js","OpenLayers/Control/DrawFeature.js","OpenLayers/Control/DragFeature.js","OpenLayers/Control/ModifyFeature.js","OpenLayers/Control/Panel.js","OpenLayers/Control/SelectFeature.js","OpenLayers/Control/NavigationHistory.js","OpenLayers/Control/Measure.js","OpenLayers/Control/WMSGetFeatureInfo.js","OpenLayers/Control/Graticule.js","OpenLayers/Control/TransformFeature.js","OpenLayers/Geometry.js","OpenLayers/Geometry/Rectangle.js","OpenLayers/Geometry/Collection.js","OpenLayers/Geometry/Point.js","OpenLayers/Geometry/MultiPoint.js","OpenLayers/Geometry/Curve.js","OpenLayers/Geometry/LineString.js","OpenLayers/Geometry/LinearRing.js","OpenLayers/Geometry/Polygon.js","OpenLayers/Geometry/MultiLineString.js","OpenLayers/Geometry/MultiPolygon.js","OpenLayers/Geometry/Surface.js","OpenLayers/Renderer.js","OpenLayers/Renderer/Elements.js","OpenLayers/Renderer/SVG.js","OpenLayers/Renderer/Canvas.js","OpenLayers/Renderer/VML.js","OpenLayers/Layer/Vector.js","OpenLayers/Layer/Vector/RootContainer.js","OpenLayers/Strategy.js","OpenLayers/Strategy/Fixed.js","OpenLayers/Strategy/Cluster.js","OpenLayers/Strategy/Paging.js","OpenLayers/Strategy/BBOX.js","OpenLayers/Strategy/Save.js","OpenLayers/Strategy/Refresh.js","OpenLayers/Filter.js","OpenLayers/Filter/FeatureId.js","OpenLayers/Filter/Logical.js","OpenLayers/Filter/Comparison.js","OpenLayers/Filter/Spatial.js","OpenLayers/Protocol.js","OpenLayers/Protocol/HTTP.js","OpenLayers/Protocol/SQL.js","OpenLayers/Protocol/SQL/Gears.js","OpenLayers/Protocol/WFS.js","OpenLayers/Protocol/WFS/v1.js","OpenLayers/Protocol/WFS/v1_0_0.js","OpenLayers/Protocol/WFS/v1_1_0.js","OpenLayers/Protocol/SOS.js","OpenLayers/Protocol/SOS/v1_0_0.js","OpenLayers/Layer/PointTrack.js","OpenLayers/Layer/GML.js","OpenLayers/Style.js","OpenLayers/StyleMap.js","OpenLayers/Rule.js","OpenLayers/Format.js","OpenLayers/Format/XML.js","OpenLayers/Format/ArcXML.js","OpenLayers/Format/ArcXML/Features.js","OpenLayers/Format/GML.js","OpenLayers/Format/GML/Base.js","OpenLayers/Format/GML/v2.js","OpenLayers/Format/GML/v3.js","OpenLayers/Format/Atom.js","OpenLayers/Format/KML.js","OpenLayers/Format/GeoRSS.js","OpenLayers/Format/WFS.js","OpenLayers/Format/WFSCapabilities.js","OpenLayers/Format/WFSCapabilities/v1.js","OpenLayers/Format/WFSCapabilities/v1_0_0.js","OpenLayers/Format/WFSCapabilities/v1_1_0.js","OpenLayers/Format/WFSDescribeFeatureType.js","OpenLayers/Format/WMSDescribeLayer.js","OpenLayers/Format/WMSDescribeLayer/v1_1.js","OpenLayers/Format/WKT.js","OpenLayers/Format/OSM.js","OpenLayers/Format/GPX.js","OpenLayers/Format/Filter.js","OpenLayers/Format/Filter/v1.js","OpenLayers/Format/Filter/v1_0_0.js","OpenLayers/Format/Filter/v1_1_0.js","OpenLayers/Format/SLD.js","OpenLayers/Format/SLD/v1.js","OpenLayers/Format/SLD/v1_0_0.js","OpenLayers/Format/CSWGetDomain.js","OpenLayers/Format/CSWGetDomain/v2_0_2.js","OpenLayers/Format/CSWGetRecords.js","OpenLayers/Format/CSWGetRecords/v2_0_2.js","OpenLayers/Format/WFST.js","OpenLayers/Format/WFST/v1.js","OpenLayers/Format/WFST/v1_0_0.js","OpenLayers/Format/WFST/v1_1_0.js","OpenLayers/Format/Text.js","OpenLayers/Format/JSON.js","OpenLayers/Format/GeoJSON.js","OpenLayers/Format/WMC.js","OpenLayers/Format/WMC/v1.js","OpenLayers/Format/WMC/v1_0_0.js","OpenLayers/Format/WMC/v1_1_0.js","OpenLayers/Format/WMSCapabilities.js","OpenLayers/Format/WMSCapabilities/v1.js","OpenLayers/Format/WMSCapabilities/v1_1.js","OpenLayers/Format/WMSCapabilities/v1_1_0.js","OpenLayers/Format/WMSCapabilities/v1_1_1.js","OpenLayers/Format/WMSCapabilities/v1_3.js","OpenLayers/Format/WMSCapabilities/v1_3_0.js","OpenLayers/Format/WMSGetFeatureInfo.js","OpenLayers/Format/OWSCommon/v1_1_0.js","OpenLayers/Format/SOSCapabilities.js","OpenLayers/Format/SOSCapabilities/v1_0_0.js","OpenLayers/Format/SOSGetObservation.js","OpenLayers/Format/SOSGetFeatureOfInterest.js","OpenLayers/Layer/WFS.js","OpenLayers/Control/GetFeature.js","OpenLayers/Control/MouseToolbar.js","OpenLayers/Control/NavToolbar.js","OpenLayers/Control/PanPanel.js","OpenLayers/Control/Pan.js","OpenLayers/Control/ZoomIn.js","OpenLayers/Control/ZoomOut.js","OpenLayers/Control/ZoomPanel.js","OpenLayers/Control/EditingToolbar.js","OpenLayers/Lang.js","OpenLayers/Lang/en.js");var agent=navigator.userAgent;var docWrite=(agent.match("MSIE")||agent.match("Safari"));if(docWrite){var allScriptTags=new Array(jsfiles.length);} var host=OpenLayers._getScriptLocation()+"lib/";for(var i=0,len=jsfiles.length;i<len;i++){if(docWrite){allScriptTags[i]="<script src='"+host+jsfiles[i]+"'></script>";}else{var s=document.createElement("script");s.src=host+jsfiles[i];var h=document.getElementsByTagName("head").length?document.getElementsByTagName("head")[0]:document.body;h.appendChild(s);}} -if(docWrite){document.write(allScriptTags.join(""));}}})();OpenLayers.VERSION_NUMBER="OpenLayers 2.9.1 -- $Revision: 10129 $";OpenLayers.String={startsWith:function(str,sub){return(str.indexOf(sub)==0);},contains:function(str,sub){return(str.indexOf(sub)!=-1);},trim:function(str){return str.replace(/^\s\s*/,'').replace(/\s\s*$/,'');},camelize:function(str){var oStringList=str.split('-');var camelizedString=oStringList[0];for(var i=1,len=oStringList.length;i<len;i++){var s=oStringList[i];camelizedString+=s.charAt(0).toUpperCase()+s.substring(1);} +if(docWrite){document.write(allScriptTags.join(""));}}})();OpenLayers.VERSION_NUMBER="OpenLayers 2.9.1 -- $Revision$";OpenLayers.String={startsWith:function(str,sub){return(str.indexOf(sub)==0);},contains:function(str,sub){return(str.indexOf(sub)!=-1);},trim:function(str){return str.replace(/^\s\s*/,'').replace(/\s\s*$/,'');},camelize:function(str){var oStringList=str.split('-');var camelizedString=oStringList[0];for(var i=1,len=oStringList.length;i<len;i++){var s=oStringList[i];camelizedString+=s.charAt(0).toUpperCase()+s.substring(1);} return camelizedString;},format:function(template,context,args){if(!context){context=window;} var replacer=function(str,match){var replacement;var subs=match.split(/\.+/);for(var i=0;i<subs.length;i++){if(i==0){replacement=context;} replacement=replacement[subs[i]];} Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/OpenLayers.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/blank.gif ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/cloud-popup-relative.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/drag-rectangle-off.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/drag-rectangle-on.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/east-mini.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/layer-switcher-maximize.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/layer-switcher-minimize.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/marker-blue.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/marker-gold.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/marker-green.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/marker.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/measuring-stick-off.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/measuring-stick-on.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/north-mini.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/panning-hand-off.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/panning-hand-on.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/slider.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/south-mini.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/west-mini.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/zoom-minus-mini.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/zoom-plus-mini.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/zoom-world-mini.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/zoombar.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/license.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/news.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/readme.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/release-license.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/repository-license.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/framedCloud.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/google.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/ie6-style.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/add_point_off.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/add_point_on.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/blank.gif ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/close.gif ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/drag-rectangle-off.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/drag-rectangle-on.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/draw_line_off.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/draw_line_on.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/draw_point_off.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/draw_point_on.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/draw_polygon_off.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/draw_polygon_on.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/editing_tool_bar.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/move_feature_off.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/move_feature_on.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/navigation_history.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/overview_replacement.gif ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/pan-panel-NOALPHA.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/pan-panel.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/pan_off.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/pan_on.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/panning-hand-off.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/panning-hand-on.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/remove_point_off.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/remove_point_on.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/ruler.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/save_features_off.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/save_features_on.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/view_next_off.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/view_next_on.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/view_previous_off.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/view_previous_on.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/zoom-panel-NOALPHA.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/zoom-panel.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/style.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/administration.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/cartography.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/contacts.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/news.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

[Suiviobsmer-commits] r808 - in trunk: src/license wao-business/src/license wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/xmi wao-business/src/test/resources wao-business/src/test/resources/import wao-ui/src/license wao-ui/src/main/assembly wao-ui/src/test/resources
by tchemit＠users.labs.libre-entreprise.org 26 Nov '10

26 Nov '10

Author: tchemit Date: 2010-11-26 15:59:59 +0000 (Fri, 26 Nov 2010) New Revision: 808 Log: add headers migrate third-party files Modified: trunk/src/license/project.xml trunk/wao-business/src/license/THIRD-PARTY.properties trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java trunk/wao-business/src/main/xmi/wao.properties trunk/wao-business/src/test/resources/WaoTest.properties trunk/wao-business/src/test/resources/import/boat_districts.kml trunk/wao-business/src/test/resources/log4j.properties trunk/wao-ui/src/license/THIRD-PARTY.properties trunk/wao-ui/src/main/assembly/Wao.properties trunk/wao-ui/src/main/assembly/bin.xml trunk/wao-ui/src/test/resources/log4j.properties Modified: trunk/src/license/project.xml =================================================================== --- trunk/src/license/project.xml 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/src/license/project.xml 2010-11-26 15:59:59 UTC (rev 808) @@ -1,4 +1,28 @@ <?xml version='1.0' encoding='UTF-8'?> + + <project xmlns="http://maven-site.nuiton.org/maven-license-plugin/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven-site.nuiton.org/maven-license-plugin/1.0.0 http://maven-site.nuiton.org/maven-license-plugin/licenseProjectDescriptor-…"> Modified: trunk/wao-business/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wao-business/src/license/THIRD-PARTY.properties 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-business/src/license/THIRD-PARTY.properties 2010-11-26 15:59:59 UTC (rev 808) @@ -1,7 +1,6 @@ # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - BSD # - BSD License # - BSD license # - BSD style @@ -22,12 +21,12 @@ # Please fill the missing licenses for dependencies : # # -#Sun Jul 11 22:47:24 CEST 2010 -antlr--antlr--2.7.6=BSD -com.sun.xml.bind--jaxb-impl--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 -com.sun.xml.bind--jaxb-xjc--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD -javassist--javassist--3.8.0.GA=Lesser General Public License (LGPL) v 2.1 -javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -javax.xml.bind--jaxb-api--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 +#Fri Nov 26 17:04:07 CET 2010 +antlr--antlr--2.7.6--jar=BSD +com.sun.xml.bind--jaxb-impl--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 +com.sun.xml.bind--jaxb-xjc--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 +commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1--jar=BSD +javassist--javassist--3.8.0.GA--jar=Lesser General Public License (LGPL) v 2.1 +javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +javax.xml.bind--jaxb-api--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java 2010-11-26 15:59:59 UTC (rev 808) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * 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% + */ package fr.ifremer.wao.entity; import static org.nuiton.i18n.I18n._; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java 2010-11-26 15:59:59 UTC (rev 808) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * 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% + */ package fr.ifremer.wao.entity; import static org.nuiton.i18n.I18n._; Modified: trunk/wao-business/src/main/xmi/wao.properties =================================================================== --- trunk/wao-business/src/main/xmi/wao.properties 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-business/src/main/xmi/wao.properties 2010-11-26 15:59:59 UTC (rev 808) @@ -1,3 +1,26 @@ +### +# #%L +# Wao :: Business +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# 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% +### model.tagvalue.copyright=/* *##%\n Copyright (C) 2009 Wao\n *##%*/ model.tagvalue.java.lang.String=text model.tagvalue.exceptionClass=fr.ifremer.wao.WaoException Modified: trunk/wao-business/src/test/resources/WaoTest.properties =================================================================== --- trunk/wao-business/src/test/resources/WaoTest.properties 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-business/src/test/resources/WaoTest.properties 2010-11-26 15:59:59 UTC (rev 808) @@ -1,3 +1,26 @@ +### +# #%L +# Wao :: Business +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# 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% +### hibernate.hbm2ddl.auto=update hibernate.show_sql=false Modified: trunk/wao-business/src/test/resources/import/boat_districts.kml =================================================================== --- trunk/wao-business/src/test/resources/import/boat_districts.kml 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-business/src/test/resources/import/boat_districts.kml 2010-11-26 15:59:59 UTC (rev 808) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="utf-8" ?> + + <kml xmlns="http://www.opengis.net/kml/2.2"> <Document> <Folder> Modified: trunk/wao-business/src/test/resources/log4j.properties =================================================================== --- trunk/wao-business/src/test/resources/log4j.properties 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-business/src/test/resources/log4j.properties 2010-11-26 15:59:59 UTC (rev 808) @@ -1,3 +1,26 @@ +### +# #%L +# Wao :: Business +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# 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% +### # Default to info level output; this is very handy if you eventually use Hibernate as well. log4j.rootCategory=warn, A1 Modified: trunk/wao-ui/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wao-ui/src/license/THIRD-PARTY.properties 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-ui/src/license/THIRD-PARTY.properties 2010-11-26 15:59:59 UTC (rev 808) @@ -17,6 +17,7 @@ # - GNU Lesser General Public License version 2.1 # - GNU Library or Lesser General Public License # - GPL, LGPL, MPL +# - Lesser General Public License (LGPL) v 2.1 # - Lesser General Public License (LGPL) v 3.0 # - MIT License # - Public Domain @@ -30,17 +31,17 @@ # Please fill the missing licenses for dependencies : # # -#Mon Oct 11 17:34:56 CEST 2010 -antlr--antlr--2.7.6=BSD -com.formos.tapestry--tapestry-testify--1.0.2=The Apache Software License, Version 2.0 -com.sun.xml.bind--jaxb-impl--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 -com.sun.xml.bind--jaxb-xjc--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 -commons-beanutils--commons-beanutils-core--1.7.0=The Apache Software License, Version 2.0 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD -javassist--javassist--3.8.0.GA=Lesser General Public License (LGPL) v 2.1 -javassist--javassist--3.9.0.GA=Lesser General Public License (LGPL) v 2.1 -javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -javax.xml.bind--jaxb-api--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 -ognl--ognl--2.7.3=The OpenSymphony Software License, Version 1.1 -org.antlr--antlr-runtime--3.1.1=BSD +#Fri Nov 26 17:05:56 CET 2010 +antlr--antlr--2.7.6--jar=BSD +com.formos.tapestry--tapestry-testify--1.0.2--jar=The Apache Software License, Version 2.0 +com.sun.xml.bind--jaxb-impl--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 +com.sun.xml.bind--jaxb-xjc--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 +commons-beanutils--commons-beanutils-core--1.7.0--jar=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1--jar=BSD +javassist--javassist--3.8.0.GA--jar=Lesser General Public License (LGPL) v 2.1 +javassist--javassist--3.9.0.GA--jar=Lesser General Public License (LGPL) v 2.1 +javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +javax.xml.bind--jaxb-api--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 +ognl--ognl--2.7.3--jar=The OpenSymphony Software License, Version 1.1 +org.antlr--antlr-runtime--3.1.1--jar=BSD Modified: trunk/wao-ui/src/main/assembly/Wao.properties =================================================================== --- trunk/wao-ui/src/main/assembly/Wao.properties 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-ui/src/main/assembly/Wao.properties 2010-11-26 15:59:59 UTC (rev 808) @@ -1,2 +1,25 @@ +### +# #%L +# Wao :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# 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% +### hibernate.hbm2ddl.auto=update Modified: trunk/wao-ui/src/main/assembly/bin.xml =================================================================== --- trunk/wao-ui/src/main/assembly/bin.xml 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-ui/src/main/assembly/bin.xml 2010-11-26 15:59:59 UTC (rev 808) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.1.xsd"> <id>bin</id> Modified: trunk/wao-ui/src/test/resources/log4j.properties =================================================================== --- trunk/wao-ui/src/test/resources/log4j.properties 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-ui/src/test/resources/log4j.properties 2010-11-26 15:59:59 UTC (rev 808) @@ -1,3 +1,26 @@ +### +# #%L +# Wao :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# 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% +### # Default to info level output; this is very handy if you eventually use Hibernate as well. log4j.rootCategory=WARN, console

1 0