July 2017 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] Re-add supportVesselName on FloatingObject (See #803)
by Tony CHEMIT 28 Jul '17

28 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7fc8b728 by Tony CHEMIT at 2017-07-28T17:37:47+02:00 Re-add supportVesselName on FloatingObject (See #803) - - - - - 12 changed files: - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-error-validation.xml - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java - persistence/src/main/models/Observe.model - − persistence/src/main/resources/db/migration/6.0/03_evol_6997_delete_supportVesselName-H2.sql - − persistence/src/main/resources/db/migration/6.0/03_evol_6997_delete_supportVesselName-PG.sql - persistence/src/main/resources/db/migration/6.901/01_add_object_operation-PG.sql - services-topia/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectBinder.java - services-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-error-validation.xml - services/src/main/models/Observe.model Changes: ===================================== application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-error-validation.xml ===================================== --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-error-validation.xml @@ -60,6 +60,19 @@ </field> + <field name="supportVesselName"> + +  + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">maxLength:32</param> + <param name="expression"> + <![CDATA[ supportVesselName == null || supportVesselName.length() < ints.maxLength ]]> + </param> + <message>validator.ui.floatingObject.size.supportVesselName##${ints.maxLength}</message> + </field-validator> + + </field> + <field name="comment">  ===================================== application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-error-validation.xml ===================================== --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-error-validation.xml @@ -60,6 +60,19 @@ </field> + <field name="supportVesselName"> + +  + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">maxLength:32</param> + <param name="expression"> + <![CDATA[ supportVesselName == null || supportVesselName.length() < ints.maxLength ]]> + </param> + <message>validator.ui.floatingObject.size.supportVesselName##${ints.maxLength}</message> + </field-validator> + + </field> + <field name="comment">  ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx @@ -92,6 +92,19 @@ </cell> </row> <row> + <cell anchor="west"> + <JLabel id='supportVesselNameLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JPanel layout='{new BorderLayout()}'> + <JToolBar id='supportVesselNameToolbar' constraints='BorderLayout.WEST'> + <JButton id='resetSupportVesselName' constraints='BorderLayout.WEST' styleClass='resetButton'/> + </JToolBar> + <JTextField id='supportVesselName' constraints='BorderLayout.CENTER'/> + </JPanel> + </cell> + </row> + <row> <cell columns='2'> <JPanel id='floatingObjectReferencePanel' layout="{new BorderLayout()}"> <JLabel id='floatingObjectReferenceLabel' constraints='BorderLayout.CENTER'/> ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss @@ -82,6 +82,22 @@ BeanComboBox { selectedItem:{bean.getObjectType()}; } +#supportVesselNameLabel { + text:"observe.common.supportVesselName"; + labelFor:{supportVesselName}; +} + +#supportVesselName { + _propertyName:{FloatingObjectDto.PROPERTY_SUPPORT_VESSEL_NAME}; + text:{getStringValue(bean.getSupportVesselName())}; + _validatorLabel:{t("observe.common.supportVesselName")}; +} + +#resetSupportVesselName{ + toolTipText:"observe.content.action.reset.supportVesselName.tip"; + _resetPropertyName:{FloatingObjectDto.PROPERTY_SUPPORT_VESSEL_NAME}; +} + #comment { title:"observe.common.comment.floatingObject"; } ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java @@ -60,7 +60,6 @@ public class DataSourceMigrationForVersion_6_0 extends AbstractObserveMigrationC addScript("01", "evol_8374_delete_sonarUsed", queries); addScript("02", "evol_7886_catch_add_set_idx", queries); - addScript("03", "evol_6997_delete_supportVesselName", queries); addScript("04", "evol_6832_branchlineComposition_add_tracelineLength", queries); addScript("05", "evol_6999_nonTargetCatch_add_well", queries); addScript("06", "evol_8375_setSeine_add_booleans", queries); ===================================== persistence/src/main/models/Observe.model ===================================== --- a/persistence/src/main/models/Observe.model +++ b/persistence/src/main/models/Observe.model @@ -727,6 +727,7 @@ objectSchoolEstimate + {*} seine.ObjectSchoolEstimate objectObservedSpecies + {*} seine.ObjectObservedSpecies objectType {*:0..1} referentiel.seine.ObjectType objectOperation {*:1} referentiel.seine.ObjectOperation +supportVesselName + {*:1} String transmittingBuoy + {*} seine.TransmittingBuoy | unique floatingObjectPart + {*} seine.FloatingObjectPart | unique getTypeTransmittingBuoyOperation() !fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation ===================================== persistence/src/main/resources/db/migration/6.0/03_evol_6997_delete_supportVesselName-H2.sql deleted ===================================== --- a/persistence/src/main/resources/db/migration/6.0/03_evol_6997_delete_supportVesselName-H2.sql +++ /dev/null @@ -1,22 +0,0 @@ ---- --- #%L --- ObServe :: Persistence --- %% --- Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io --- %% --- This program is free software: you can redistribute it and/or modify --- it under the terms of the GNU 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 General Public --- License along with this program. If not, see --- <http://www.gnu.org/licenses/gpl-3.0.html>. --- #L% ---- -ALTER TABLE observe_seine.floatingobject DROP COLUMN supportVesselName; ===================================== persistence/src/main/resources/db/migration/6.0/03_evol_6997_delete_supportVesselName-PG.sql deleted ===================================== --- a/persistence/src/main/resources/db/migration/6.0/03_evol_6997_delete_supportVesselName-PG.sql +++ /dev/null @@ -1,22 +0,0 @@ ---- --- #%L --- ObServe :: Persistence --- %% --- Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io --- %% --- This program is free software: you can redistribute it and/or modify --- it under the terms of the GNU 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 General Public --- License along with this program. If not, see --- <http://www.gnu.org/licenses/gpl-3.0.html>. --- #L% ---- -ALTER TABLE observe_seine.floatingobject DROP COLUMN supportVesselName CASCADE; ===================================== persistence/src/main/resources/db/migration/6.901/01_add_object_operation-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/6.901/01_add_object_operation-PG.sql +++ b/persistence/src/main/resources/db/migration/6.901/01_add_object_operation-PG.sql @@ -44,9 +44,9 @@ UPDATE observe_seine.floatingObject set objectOperation2 = 'fr.ird.observe.entit UPDATE observe_seine.floatingObject set objectOperation2 = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' WHERE objectOperation = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.8431519556575698' AND objectFate = 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1396860761530#0.8869464242156488'; UPDATE observe_seine.floatingObject set objectOperation2 = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' WHERE objectOperation = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.8431519556575698' AND objectFate not in ('fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683674#0.32469201752917276','fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683675#0.7559688295127481','fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683675#0.88526017739943','fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683675#0.190123844350496', 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1396860761530#0.8869464242156488'); -alter table observe_seine.floatingObject drop COLUMN objectOperation; -alter table observe_seine.floatingObject drop COLUMN objectFate; -drop table observe_seine.objectFate; +alter table observe_seine.floatingObject drop COLUMN objectOperation CASCADE; +alter table observe_seine.floatingObject drop COLUMN objectFate CASCADE; +drop table observe_seine.objectFate CASCADE; delete from observe_seine.objectOperation; ===================================== services-topia/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectBinder.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectBinder.java @@ -50,6 +50,7 @@ public class FloatingObjectBinder extends DataBinderSupport<FloatingObject, Floa entity.setObjectOperation(toEntity(dto.getObjectOperation(), ObjectOperation.class)); entity.setObjectType(toEntity(dto.getObjectType(), ObjectType.class)); + entity.setSupportVesselName(dto.getSupportVesselName()); } @@ -60,6 +61,7 @@ public class FloatingObjectBinder extends DataBinderSupport<FloatingObject, Floa dto.setObjectOperation(toReferentialReference(referentialLocale, entity.getObjectOperation(), ObjectOperationDto.class)); dto.setObjectType(toReferentialReference(referentialLocale, entity.getObjectType(), ObjectTypeDto.class)); + dto.setSupportVesselName(entity.getSupportVesselName()); } ===================================== services-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-error-validation.xml ===================================== --- a/services-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-error-validation.xml +++ b/services-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-error-validation.xml @@ -60,6 +60,19 @@ </field> + <field name="supportVesselName"> + +  + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">maxLength:32</param> + <param name="expression"> + <![CDATA[ supportVesselName == null || supportVesselName.length() < ints.maxLength ]]> + </param> + <message>validator.service.floatingObject.size.supportVesselName##${ints.maxLength}</message> + </field-validator> + + </field> + <field name="comment">  ===================================== services/src/main/models/Observe.model ===================================== --- a/services/src/main/models/Observe.model +++ b/services/src/main/models/Observe.model @@ -623,6 +623,7 @@ activityFinDeVeille + {*:1} boolean seine.FloatingObject > Commentable objectType {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.seine.ObjectTypeDto objectOperation {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.seine.ObjectOperationDto +supportVesselName + {*:1} String seine.FloatingObjectObservedSpecies > Commentable objectObservedSpecies {*} seine.ObjectObservedSpecies View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7fc8b728e45c16da682aad8f602… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7fc8b728e45c16da682aad8f602… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Assainissement des API (See #802)
by Tony CHEMIT 28 Jul '17

28 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c8475fd6 by Tony CHEMIT at 2017-07-28T15:05:00+02:00 Assainissement des API (See #802) - - - - - 30 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivityLonglinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivitySeinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveMultipleDataUIActionSupport.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveRoutesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripLonglinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripSeinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripsUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/ObstunaAdminAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SecurityModel.java - application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceRestApi.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/DataSourceServiceTopia.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/ActivityLonglineServiceTopia.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineServiceTopia.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/ActivitySeineServiceTopia.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/NonTargetCatchReleaseServiceTopia.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/NonTargetSampleServiceTopia.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/RouteServiceTopia.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopia.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java - services/src/main/java/fr/ird/observe/services/service/DataSourceService.java - services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java - services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService.java - services/src/main/java/fr/ird/observe/services/service/data/longline/ActivityLonglineService.java - services/src/main/java/fr/ird/observe/services/service/data/longline/TripLonglineService.java - services/src/main/java/fr/ird/observe/services/service/data/seine/ActivitySeineService.java - services/src/main/java/fr/ird/observe/services/service/data/seine/NonTargetCatchReleaseService.java - services/src/main/java/fr/ird/observe/services/service/data/seine/NonTargetSampleService.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c8475fd6be9a1ad50960d6c2ac8… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c8475fd6be9a1ad50960d6c2ac8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] optimiser la détection des objets flottants de référence (See #796)
by Tony CHEMIT 26 Jul '17

26 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3a843b55 by Tony CHEMIT at 2017-07-27T00:49:40+02:00 optimiser la détection des objets flottants de référence (See #796) - - - - - 8 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/FloatingObjectReferencesManager.java - application-web/src/main/filtered-resources/mapping - application-web/src/main/java/fr/ird/observe/application/web/injector/ImmutableSetInjector.java - pom.xml - services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java - services/src/main/java/fr/ird/observe/services/service/data/seine/FloatingObjectService.java - services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/FloatingObjectReferencesManager.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/FloatingObjectReferencesManager.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/FloatingObjectReferencesManager.java @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing; * #L% */ +import com.google.common.collect.ImmutableSet; import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.FloatingObjectReference; @@ -71,10 +72,14 @@ public class FloatingObjectReferencesManager { return references.stream().filter(r -> floatingObjectId.equals(r.getFloatingObjectId())).findFirst(); } + ImmutableSet<String> getIds() { + return ImmutableSet.copyOf(references.stream().map(FloatingObjectReference::getFloatingObjectId).collect(Collectors.toSet())); + } + void sanitize(ObserveSwingDataSource dataSource) { - Set<String> existingIds = references.stream().map(FloatingObjectReference::getFloatingObjectId).collect(Collectors.toSet()); - Set<String> ids = dataSource.newFloatingObjectService().retainExistingIds(existingIds); + ImmutableSet<String> existingIds = getIds(); + ImmutableSet<String> ids = dataSource.newFloatingObjectService().retainExistingIds(existingIds); int beforeSize = references.size(); references.removeIf(reference -> !ids.contains(reference.getFloatingObjectId())); ===================================== application-web/src/main/filtered-resources/mapping ===================================== --- a/application-web/src/main/filtered-resources/mapping +++ b/application-web/src/main/filtered-resources/mapping @@ -221,7 +221,6 @@ GET /api/v1/data/seine/TripSeineService/preCreate POST /api/v1/data/seine/TripSeineService/save v1.data.seine.TripSeineServiceRestApi.save POST /api/v1/referential/ReferentialService/computeMissingReferentials v1.referential.ReferentialServiceRestApi.computeMissingReferentials DELETE /api/v1/referential/ReferentialService/delete v1.referential.ReferentialServiceRestApi.delete -DELETE /api/v1/referential/ReferentialService/delete v1.referential.ReferentialServiceRestApi.delete GET /api/v1/referential/ReferentialService/exists v1.referential.ReferentialServiceRestApi.exists GET /api/v1/referential/ReferentialService/findAllUsages v1.referential.ReferentialServiceRestApi.findAllUsages GET /api/v1/referential/ReferentialService/getReferenceSet v1.referential.ReferentialServiceRestApi.getReferenceSet ===================================== application-web/src/main/java/fr/ird/observe/application/web/injector/ImmutableSetInjector.java ===================================== --- a/application-web/src/main/java/fr/ird/observe/application/web/injector/ImmutableSetInjector.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/injector/ImmutableSetInjector.java @@ -60,15 +60,16 @@ public class ImmutableSetInjector implements ExecutorParametersInjectorHandler.I ImmutableSet.Builder builder = ImmutableSet.builder(); - Call.ParameterTree parameterTree = call.getParameterTree().getObject().get(name); + if (call.getParameterTree().getObject() != null) { + Call.ParameterTree parameterTree = call.getParameterTree().getObject().get(name); - Objects.requireNonNull(parameterTree, "Le paramètre " + name + " n'as pas été trouvé, recompiler (parameter)!"); + Objects.requireNonNull(parameterTree, "Le paramètre " + name + " n'as pas été trouvé, recompiler (parameter)!"); - String[] values = (String[]) parameterTree.getValue(); - for (String value : values) { - builder.add(value); + String[] values = (String[]) parameterTree.getValue(); + for (String value : values) { + builder.add(value); + } } - result = builder.build(); if (log.isInfoEnabled()) { ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -180,7 +180,7 @@ <nuitonUtilsVersion>3.0-rc-18</nuitonUtilsVersion> <nuitonConverterVersion>1.0</nuitonConverterVersion> <nuitonVersionVersion>1.0-rc-2</nuitonVersionVersion> - <httpVersion>1.0.1</httpVersion> + <httpVersion>1.0.2-SNAPSHOT</httpVersion> <xworkVersion>2.3.33</xworkVersion> <flexmarkVersion>0.22.14</flexmarkVersion> <hibernateVersion>5.1.8.Final</hibernateVersion> ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.topia.service.data.seine; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; @@ -102,10 +103,10 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F } @Override - public Set<String> retainExistingIds(Set<String> existingIds) { - LinkedHashSet<String> result = new LinkedHashSet<>(existingIds); - result.retainAll(getTopiaPersistenceContext().getFloatingObjectDao().findAllIds()); - return result; + public ImmutableSet<String> retainExistingIds(ImmutableSet<String> existingIds) { + LinkedHashSet<String> result = new LinkedHashSet<>(getTopiaPersistenceContext().getFloatingObjectDao().findAllIds()); + result.retainAll(existingIds); + return ImmutableSet.copyOf(result); } @Override ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java @@ -62,7 +62,6 @@ import fr.ird.observe.services.service.sql.SqlScriptProducerService; import fr.ird.observe.services.topia.service.ObserveServiceTopia; import fr.ird.observe.services.topia.service.actions.synchro.referential.sql.ReplaceSqlStatementGenerator; import java.util.Arrays; -import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.List; @@ -246,16 +245,6 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe } @Override - public <D extends ReferentialDto> void delete(Class<D> type, Collection<String> ids) { - if (log.isTraceEnabled()) { - log.trace("delete(" + type.getName() + ", [" + Joiner.on(", ").join(ids) + "])"); - } - - Class<? extends ObserveReferentialEntity> entityType = getReferentialEntityType(type); - deleteEntity(type, entityType, ids); - } - - @Override public <E extends ReferentialDto> void replaceReference(Class<E> beanType, String idToReplace, String replaceId) { if (log.isTraceEnabled()) { log.trace("replaceReference(" + beanType.getName() + ", " + idToReplace + "," + replaceId + ")"); ===================================== services/src/main/java/fr/ird/observe/services/service/data/seine/FloatingObjectService.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/data/seine/FloatingObjectService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/FloatingObjectService.java @@ -22,6 +22,7 @@ package fr.ird.observe.services.service.data.seine; * #L% */ +import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.reference.DataReferenceSet; @@ -38,7 +39,6 @@ import io.ultreia.java4all.http.spi.Delete; import io.ultreia.java4all.http.spi.Get; import io.ultreia.java4all.http.spi.Post; import java.util.List; -import java.util.Set; /** * @author Sylvain Bavencoff - bavencoff(a)codelutin.com @@ -63,7 +63,7 @@ public interface FloatingObjectService extends ObserveService { @Get @ReadDataPermission - Set<String> retainExistingIds(Set<String> existingIds); + ImmutableSet<String> retainExistingIds(ImmutableSet<String> existingIds); @Get @ReadDataPermission ===================================== services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java +++ b/services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java @@ -97,11 +97,6 @@ public interface ReferentialService extends ObserveService { @Delete <R extends ReferentialDto> void delete(Class<R> type, String id) throws DataNotFoundException; - @WriteReferentialPermission - @Write - @Delete - <R extends ReferentialDto> void delete(Class<R> type, Collection<String> ids) throws DataNotFoundException; - @Post @WriteReferentialPermission @WriteDataPermission View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3a843b558edd843d28c339d7717… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3a843b558edd843d28c339d7717… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Correction d'un paramètre nullable sur une méthode de service
by Tony CHEMIT 26 Jul '17

26 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 49deffc4 by Tony CHEMIT at 2017-07-26T14:15:21+02:00 Correction d'un paramètre nullable sur une méthode de service - - - - - 1 changed file: - services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java Changes: ===================================== services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java +++ b/services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java @@ -41,6 +41,7 @@ import fr.ird.observe.services.spi.WriteDataPermission; import fr.ird.observe.services.spi.WriteReferentialPermission; import io.ultreia.java4all.http.spi.Delete; import io.ultreia.java4all.http.spi.Get; +import io.ultreia.java4all.http.spi.Nullable; import io.ultreia.java4all.http.spi.Post; import java.util.Collection; import java.util.Date; @@ -54,7 +55,7 @@ public interface ReferentialService extends ObserveService { @Get @ReadReferentialPermission - <R extends ReferentialDto> ReferentialReferenceSet<R> getReferenceSet(Class<R> type, Date lastUpdateDate); + <R extends ReferentialDto> ReferentialReferenceSet<R> getReferenceSet(Class<R> type, @Nullable Date lastUpdateDate); @Get @ReadReferentialPermission View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/49deffc4daca6af779656497169… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/49deffc4daca6af779656497169… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: optimiser la détection des objets flottants de référence (See #796)
by Tony CHEMIT 26 Jul '17

26 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2cade367 by Tony CHEMIT at 2017-07-26T13:43:11+02:00 optimiser la détection des objets flottants de référence (See #796) - - - - - 90699b0c by Tony CHEMIT at 2017-07-26T13:47:43+02:00 Ajouter une option pour ne pas demander une correspondance exacte entre la version du client et serveur (See #800) - - - - - 8a625d36 by Tony CHEMIT at 2017-07-26T13:48:18+02:00 Improve contributing guide - - - - - 11 changed files: - CONTRIBUTING.md - application-swing-configuration/src/main/config/ObserveSwingApplication.ini - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties - application-swing/src/main/java/fr/ird/observe/application/swing/FloatingObjectReferencesManager.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ShowConfigAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java - application-web/src/main/filtered-resources/mapping - services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java - services/src/main/java/fr/ird/observe/services/service/data/seine/FloatingObjectService.java Changes: ===================================== CONTRIBUTING.md ===================================== --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -48,6 +48,14 @@ wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-chan mvn clean verify site -DperformRelease scm-publish:publish-scm ``` +# Deploy latest demo + +``` +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/-Padd-git-commit-id-to-project-version -N/' | bash +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/install -am -pl application-web -DskipTests -Pdeploy-demo -Dclassifier=latest/' | bash +``` + + # Add a referential Example for *seine.ObjectMaterialType* on version *6.901* ===================================== application-swing-configuration/src/main/config/ObserveSwingApplication.ini ===================================== --- a/application-swing-configuration/src/main/config/ObserveSwingApplication.ini +++ b/application-swing-configuration/src/main/config/ObserveSwingApplication.ini @@ -520,6 +520,12 @@ key = http.timeout type = int defaultValue = 30000 +[option checkServerVersion] +description = observe.config.checkServerVersion.description +key = server.checkServerVersion +type = Boolean +defaultValue = true + [action help] description = observe.action.commandline.help action = "fr.ird.observe.application.swing.ObserveCLAction#help" ===================================== application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties ===================================== --- a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties +++ b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties @@ -15,6 +15,7 @@ observe.config.backupsFile.description=File to store backups informations observe.config.build.date=Build date observe.config.build.number=Build number observe.config.build.version=Build version +observe.config.checkServerVersion.description=Should we check client and server version exact match ? observe.config.configFileName.description=Configuration filename observe.config.coordinate.format=Position format (DMD, DD, DMS) observe.config.db.locale=Language of data source ===================================== application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties ===================================== --- a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties +++ b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties @@ -15,6 +15,7 @@ observe.config.backupsFile.description=File to store backups informations \#TODO observe.config.build.date=Build date \#TODO observe.config.build.number=Build number \#TODO observe.config.build.version=Build version \#TODO +observe.config.checkServerVersion.description=Should we check client and server version exact match ? \#TODO observe.config.configFileName.description=Nombre del archivo de configuración observe.config.coordinate.format=Position format (DMD, DD, DMS) \#TODO observe.config.db.locale=Idioma del referencial ===================================== application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties ===================================== --- a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties +++ b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties @@ -15,6 +15,7 @@ observe.config.backupsFile.description=Fichier des informations des sauvegardes observe.config.build.date=Date de version observe.config.build.number=Numéro de build observe.config.build.version=Numéro de version +observe.config.checkServerVersion.description=Vérifier la correspondance exacte entre les versions du client et serveur REST ? observe.config.configFileName.description=Le nom du fichier de configuration observe.config.coordinate.format=Format des positions (DMD, DD, DMS) observe.config.db.locale=La langue du référentiel ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/FloatingObjectReferencesManager.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/FloatingObjectReferencesManager.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/FloatingObjectReferencesManager.java @@ -73,7 +73,8 @@ public class FloatingObjectReferencesManager { void sanitize(ObserveSwingDataSource dataSource) { - Set<String> ids = dataSource.newFloatingObjectService().getAllIds(); + Set<String> existingIds = references.stream().map(FloatingObjectReference::getFloatingObjectId).collect(Collectors.toSet()); + Set<String> ids = dataSource.newFloatingObjectService().retainExistingIds(existingIds); int beforeSize = references.size(); references.removeIf(reference -> !ids.contains(reference.getFloatingObjectId())); ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ShowConfigAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ShowConfigAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ShowConfigAction.java @@ -268,6 +268,7 @@ public class ShowConfigAction extends AbstractUIAction { helper.addOption(ObserveSwingApplicationConfigOption.BACKUP_USE); helper.addOption(ObserveSwingApplicationConfigOption.BACKUP_DELAY); helper.addOption(ObserveSwingApplicationConfigOption.BACKUP_AT_CLOSE); + helper.addOption(ObserveSwingApplicationConfigOption.CHECK_SERVER_VERSION); helper.addOption(ObserveSwingApplicationConfigOption.CHANGE_SYNCHRO_SRC); helper.addOption(ObserveSwingApplicationConfigOption.H2_CAN_MIGRATE); ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java @@ -1690,7 +1690,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { if (clientVersion.isSnapshot()) { clientVersion = Versions.removeSnapshot(clientVersion); } - if (!Objects.equals(serverVersion, clientVersion)) { + if (ObserveSwingApplicationContext.get().getConfig().isCheckServerVersion() && !Objects.equals(serverVersion, clientVersion)) { connexionStatusError = t("observe.storage.error.serverVersionMismatch", serverVersion, clientVersion); ===================================== application-web/src/main/filtered-resources/mapping ===================================== --- a/application-web/src/main/filtered-resources/mapping +++ b/application-web/src/main/filtered-resources/mapping @@ -152,7 +152,6 @@ GET /api/v1/data/seine/ActivitySeineService/preCreate POST /api/v1/data/seine/ActivitySeineService/save v1.data.seine.ActivitySeineServiceRestApi.save DELETE /api/v1/data/seine/FloatingObjectService/delete v1.data.seine.FloatingObjectServiceRestApi.delete GET /api/v1/data/seine/FloatingObjectService/exists v1.data.seine.FloatingObjectServiceRestApi.exists -GET /api/v1/data/seine/FloatingObjectService/getAllIds v1.data.seine.FloatingObjectServiceRestApi.getAllIds GET /api/v1/data/seine/FloatingObjectService/getFloatingObjectByActivitySeine v1.data.seine.FloatingObjectServiceRestApi.getFloatingObjectByActivitySeine GET /api/v1/data/seine/FloatingObjectService/getFloatingObjectPartByFloatingObject v1.data.seine.FloatingObjectServiceRestApi.getFloatingObjectPartByFloatingObject GET /api/v1/data/seine/FloatingObjectService/getObjectMaterialHierarchyForDetailedForm v1.data.seine.FloatingObjectServiceRestApi.getObjectMaterialHierarchyForDetailedForm @@ -161,6 +160,7 @@ GET /api/v1/data/seine/FloatingObjectService/loadDto GET /api/v1/data/seine/FloatingObjectService/loadForm v1.data.seine.FloatingObjectServiceRestApi.loadForm GET /api/v1/data/seine/FloatingObjectService/loadReferenceToRead v1.data.seine.FloatingObjectServiceRestApi.loadReferenceToRead GET /api/v1/data/seine/FloatingObjectService/preCreate v1.data.seine.FloatingObjectServiceRestApi.preCreate +GET /api/v1/data/seine/FloatingObjectService/retainExistingIds v1.data.seine.FloatingObjectServiceRestApi.retainExistingIds POST /api/v1/data/seine/FloatingObjectService/save v1.data.seine.FloatingObjectServiceRestApi.save POST /api/v1/data/seine/FloatingObjectService/save v1.data.seine.FloatingObjectServiceRestApi.save GET /api/v1/data/seine/NonTargetCatchReleaseService/getSampleSpecies v1.data.seine.NonTargetCatchReleaseServiceRestApi.getSampleSpecies ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java @@ -102,8 +102,10 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F } @Override - public Set<String> getAllIds() { - return new LinkedHashSet<>(getTopiaPersistenceContext().getFloatingObjectDao().findAllIds()); + public Set<String> retainExistingIds(Set<String> existingIds) { + LinkedHashSet<String> result = new LinkedHashSet<>(existingIds); + result.retainAll(getTopiaPersistenceContext().getFloatingObjectDao().findAllIds()); + return result; } @Override ===================================== services/src/main/java/fr/ird/observe/services/service/data/seine/FloatingObjectService.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/data/seine/FloatingObjectService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/FloatingObjectService.java @@ -63,7 +63,7 @@ public interface FloatingObjectService extends ObserveService { @Get @ReadDataPermission - Set<String> getAllIds(); + Set<String> retainExistingIds(Set<String> existingIds); @Get @ReadDataPermission View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/3b8b5d1a4b5830712a0ecf3038… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/3b8b5d1a4b5830712a0ecf3038… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] lors de l'ouverture d'une base, l'écran de la liste des marées n'est pas bien…
by Tony CHEMIT 26 Jul '17

26 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3b8b5d1a by Tony CHEMIT at 2017-07-26T13:07:47+02:00 lors de l'ouverture d'une base, l'écran de la liste des marées n'est pas bien décorée (See #797) + reformat code - - - - - 3 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseOpenUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseOpenUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseOpenUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseOpenUIAction.java @@ -63,7 +63,7 @@ public class CloseOpenUIAction extends AbstractContentUIAction { public void actionPerformed(ContentUI<?, ?> ui) { if (ui instanceof ContentOpenableUI) { ((ContentOpenableUI<?, ?>) ui).closeData(); - getMainUI().getSplitpane2().setDividerLocation(getMainUI().getSplitpane2().getMinimumDividerLocation() +25); + getMainUI().getSplitpane2().setDividerLocation(getMainUI().getSplitpane2().getMinimumDividerLocation() + 25); return; } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java @@ -125,7 +125,7 @@ public class ContentUIManager { getLayout().show(getLayoutContent(), constraints); - getMainUI().getSplitpane2().setDividerLocation(getMainUI().getSplitpane2().getMinimumDividerLocation()+25); + getMainUI().getSplitpane2().setDividerLocation(getMainUI().getSplitpane2().getMinimumDividerLocation() + 25); } } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java @@ -98,7 +98,7 @@ public abstract class ContentListUIHandler<E extends IdDto, C extends DataDto, U model.addPropertyChangeListener(ContentListUIModel.PROPERTY_DATA, e -> updateList((List) e.getNewValue())); } - protected void updateList(List<DataReference<C>> data) { + private void updateList(List<DataReference<C>> data) { BeanListHeader<DataReference<C>> list = ui.getListHeader(); if (CollectionUtils.isNotEmpty(data)) { if (log.isDebugEnabled()) { @@ -182,7 +182,7 @@ public abstract class ContentListUIHandler<E extends IdDto, C extends DataDto, U getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED); } else { -getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); + getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); } }); @@ -262,7 +262,7 @@ getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SC private final transient NavigationTree treeHelper; - private final ThreadLocal<NavigationTreeNodeSupport> containerNode = new ThreadLocal<>(); + private NavigationTreeNodeSupport containerNode; EntityListCellRenderer(ListCellRenderer<?> delegate, NavigationTree treeHelper) { this.delegate = delegate; @@ -270,7 +270,7 @@ getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SC } public void init() { - containerNode.set(treeHelper.getSelectedNode()); + containerNode =treeHelper.getSelectedNode(); } @Override @@ -283,14 +283,14 @@ getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SC // obtain the text from the delegate renderer JLabel comp = (JLabel) delegate.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); - if (value == null || !(value instanceof AbstractReference) || containerNode.get() == null) { + if (value == null || !(value instanceof AbstractReference) || containerNode == null) { // rien de plus a faire return comp; } // recuperation du noeud correspondant dans l'arbre - NavigationTreeNodeSupport node = treeHelper.getChild(containerNode.get(), ((AbstractReference) value).getId()); + NavigationTreeNodeSupport node = treeHelper.getChild(containerNode , ((AbstractReference) value).getId()); if (node == null) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3b8b5d1a4b5830712a0ecf30383… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3b8b5d1a4b5830712a0ecf30383… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Amélioration de l'organisation lors des action Open/Close (See #799)
by Tony CHEMIT 26 Jul '17

26 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e1efbe00 by Tony CHEMIT at 2017-07-26T12:05:17+02:00 Amélioration de l'organisation lors des action Open/Close (See #799) - - - - - 2 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseOpenUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ReOpenUIAction.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseOpenUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseOpenUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseOpenUIAction.java @@ -63,6 +63,7 @@ public class CloseOpenUIAction extends AbstractContentUIAction { public void actionPerformed(ContentUI<?, ?> ui) { if (ui instanceof ContentOpenableUI) { ((ContentOpenableUI<?, ?>) ui).closeData(); + getMainUI().getSplitpane2().setDividerLocation(getMainUI().getSplitpane2().getMinimumDividerLocation() +25); return; } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ReOpenUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ReOpenUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ReOpenUIAction.java @@ -85,6 +85,7 @@ public class ReOpenUIAction extends AbstractContentUIAction { if (openUI != null) { openUI.openData(); + getMainUI().getSplitpane2().setDividerLocation(getMainUI().getSplitpane2().getMinimumDividerLocation() + 75); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e1efbe00b339fa5130fb0ac307e… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e1efbe00b339fa5130fb0ac307e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Les formulaires ne sont pas bien organisé lors de leur ouverture (See #798)
by Tony CHEMIT 26 Jul '17

26 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: de1c054b by Tony CHEMIT at 2017-07-26T11:50:52+02:00 Les formulaires ne sont pas bien organisé lors de leur ouverture (See #798) - - - - - 6 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx @@ -95,7 +95,7 @@ org.jdesktop.swingx.JXTitledPanel java.util.Locale - + java.awt.Dimension javax.swing.BoxLayout javax.swing.JComponent javax.swing.UIManager ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss @@ -452,6 +452,10 @@ JSplitPane { //enabled: {!model.isBusy()}; } +#emptySelection { + preferredSize:{new Dimension(200,400)}; +} + #emptySelectionLabel { horizontalAlignment : {JLabel.CENTER}; verticalAlignment : {JLabel.CENTER}; ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java @@ -349,6 +349,9 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U grabFocusOnform(); + // we want to see the hole form on screen + ui.setMinimumSize(ui.getPreferredSize()); + } /** ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java @@ -123,8 +123,9 @@ public class ContentUIManager { UIHelper.handlingError(e); } finally { - // on affiche l'ui quoi qu'il arrive ? getLayout().show(getLayoutContent(), constraints); + + getMainUI().getSplitpane2().setDividerLocation(getMainUI().getSplitpane2().getMinimumDividerLocation()+25); } } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jcss ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jcss @@ -39,7 +39,7 @@ #emptyLabel { text: {getEmptyListMessage()}; horizontalAlignment: center; - //enabled:false; + preferredSize:{new Dimension(200,400)}; } #listHeader { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java @@ -43,6 +43,7 @@ import javax.swing.Icon; import javax.swing.JLabel; import javax.swing.JList; import javax.swing.ListCellRenderer; +import javax.swing.ScrollPaneConstants; import javax.swing.SwingUtilities; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; @@ -178,6 +179,10 @@ public abstract class ContentListUIHandler<E extends IdDto, C extends DataDto, U getUi().getListSelectionModel().clearSelection(); if (!getModel().isEmpty()) { getUi().getListSelectionModel().setSelectionInterval(0, 0); + getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED); + } else { + +getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); } }); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/de1c054b8440da7a643eeb7b565… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/de1c054b8440da7a643eeb7b565… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe :: Pom
by Tony CHEMIT 25 Jul '17

25 Jul '17

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 1a43b0d8 by 166231 at 2017-07-25T20:54:05+00:00 Site checkin for project ObServe :: Pom - - - - - 7 changed files: - aggregate-third-party-report.html - changelog.html - dependency-convergence.html - dependency-updates-report.html - dev-activity.html - file-activity.html - property-updates-report.html Changes: ===================================== aggregate-third-party-report.html ===================================== --- a/aggregate-third-party-report.html +++ b/aggregate-third-party-report.html @@ -97,11 +97,11 @@ <tr class="a"> <td><img src="images/icon_info_sml.gif" alt="" /></td> <td># de dépendances</td> -<td>210</td></tr> +<td>209</td></tr> <tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /></td> <td># de dépendances avec une licence bien définie (dans son pom)</td> -<td>205</td></tr> +<td>204</td></tr> <tr class="a"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td># de dépendances avec une licence ajouté via le fichier de consolidation des licenses</td> @@ -948,649 +948,642 @@ <td>The Apache Software License, Version 2.0</td></tr> <tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> -<td><a href="./third-party-report.html#fr.ird.observe:test:7.0-RC-2">fr.ird.observe:test:7.0-RC-2</a></td> -<td>test</td> +<td><a href="./third-party-report.html#fr.ird.observe:services-validation:7.0-RC-2">fr.ird.observe:services-validation:7.0-RC-2</a></td> +<td>runtime</td> <td></td> <td>jar</td> <td>General Public License (GPL)</td></tr> <tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> -<td><a href="./third-party-report.html#fr.ird.observe:services-binder:7.0-RC-2">fr.ird.observe:services-binder:7.0-RC-2</a></td> -<td>compile</td> +<td><a href="./third-party-report.html#fr.ird.observe:test:7.0-RC-2">fr.ird.observe:test:7.0-RC-2</a></td> +<td>test</td> <td></td> <td>jar</td> <td>General Public License (GPL)</td></tr> <tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> -<td><a href="./third-party-report.html#fr.ird.observe:services-validation:7.0-RC-2">fr.ird.observe:services-validation:7.0-RC-2</a></td> -<td>runtime</td> -<td></td> -<td>jar</td> -<td>General Public License (GPL)</td></tr> -<tr class="a"> -<td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#commons-jxpath:commons-jxpath:1.3">commons-jxpath:commons-jxpath:1.3</a></td> <td>compile</td> <td></td> <td>jar</td> <td>The Apache Software License, Version 2.0</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.nuiton:nuiton-decorator:3.0">org.nuiton:nuiton-decorator:3.0</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL) v 3.0</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#fr.ird.observe:application-swing-decoration:7.0-RC-2">fr.ird.observe:application-swing-decoration:7.0-RC-2</a></td> <td>compile</td> <td></td> <td>jar</td> <td>General Public License (GPL)</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#io.ultreia.java4all.jaxx:jaxx-runtime:3.0-alpha-8">io.ultreia.java4all.jaxx:jaxx-runtime:3.0-alpha-8</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL) v 3.0</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#io.ultreia.java4all.jaxx:jaxx-validator:3.0-alpha-8">io.ultreia.java4all.jaxx:jaxx-validator:3.0-alpha-8</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL) v 3.0</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#io.ultreia.java4all.jaxx:jaxx-widgets-common:3.0-alpha-8">io.ultreia.java4all.jaxx:jaxx-widgets-common:3.0-alpha-8</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL) v 3.0</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#io.ultreia.java4all.jaxx:jaxx-widgets-gis:3.0-alpha-8">io.ultreia.java4all.jaxx:jaxx-widgets-gis:3.0-alpha-8</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL) v 3.0</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.swinglabs:jxlayer:3.0.4">org.swinglabs:jxlayer:3.0.4</a></td> <td>compile</td> <td></td> <td>jar</td> <td>BSD</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.swinglabs.swingx:swingx-action:1.6.5-1">org.swinglabs.swingx:swingx-action:1.6.5-1</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL)</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.swinglabs.swingx:swingx-autocomplete:1.6.5-1">org.swinglabs.swingx:swingx-autocomplete:1.6.5-1</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL)</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.swinglabs.swingx:swingx-core:1.6.5-1">org.swinglabs.swingx:swingx-core:1.6.5-1</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL)</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.swinglabs.swingx:swingx-graphics:1.6.5-1">org.swinglabs.swingx:swingx-graphics:1.6.5-1</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL)</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.swinglabs.swingx:swingx-painters:1.6.5-1">org.swinglabs.swingx:swingx-painters:1.6.5-1</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL)</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.swinglabs.swingx:swingx-plaf:1.6.5-1">org.swinglabs.swingx:swingx-plaf:1.6.5-1</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL)</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#fr.ird.observe:application-swing-validation:7.0-RC-2">fr.ird.observe:application-swing-validation:7.0-RC-2</a></td> <td>runtime</td> <td></td> <td>jar</td> <td>General Public License (GPL)</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#fr.ird.observe:services-rest:7.0-RC-2">fr.ird.observe:services-rest:7.0-RC-2</a></td> <td>runtime</td> <td></td> <td>jar</td> <td>General Public License (GPL)</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#fr.ird.observe:services-topia:7.0-RC-2">fr.ird.observe:services-topia:7.0-RC-2</a></td> <td>runtime</td> <td></td> <td>jar</td> <td>General Public License (GPL)</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.javassist:javassist:3.22.0-CR2">org.javassist:javassist:3.22.0-CR2</a></td> <td>runtime</td> <td></td> <td>bundle</td> <td>Apache License 2.0<br />LGPL 2.1<br />MPL 1.1</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#com.esotericsoftware.yamlbeans:yamlbeans:1.08">com.esotericsoftware.yamlbeans:yamlbeans:1.08</a></td> <td>compile</td> <td></td> <td>jar</td> <td>New BSD License</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#asm:asm-analysis:3.3.1">asm:asm-analysis:3.3.1</a></td> <td>compile</td> <td></td> <td>jar</td> <td>BSD</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#asm:asm-tree:3.3.1">asm:asm-tree:3.3.1</a></td> <td>compile</td> <td></td> <td>jar</td> <td>BSD</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#asm:asm-util:3.3.1">asm:asm-util:3.3.1</a></td> <td>compile</td> <td></td> <td>jar</td> <td>BSD</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#com.rometools:rome:1.5.0">com.rometools:rome:1.5.0</a></td> <td>compile</td> <td></td> <td>jar</td> <td>The Apache Software License, Version 2.0</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#com.rometools:rome-utils:1.5.0">com.rometools:rome-utils:1.5.0</a></td> <td>compile</td> <td></td> <td>jar</td> <td>The Apache Software License, Version 2.0</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#com.thoughtworks.paranamer:paranamer:2.4">com.thoughtworks.paranamer:paranamer:2.4</a></td> <td>compile</td> <td></td> <td>jar</td> <td>BSD</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#com.thoughtworks.xstream:xstream:1.4.2">com.thoughtworks.xstream:xstream:1.4.2</a></td> <td>compile</td> <td></td> <td>jar</td> <td>BSD style</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#commons-configuration:commons-configuration:1.8">commons-configuration:commons-configuration:1.8</a></td> <td>compile</td> <td></td> <td>jar</td> <td>The Apache Software License, Version 2.0</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#commons-fileupload:commons-fileupload:1.2.2">commons-fileupload:commons-fileupload:1.2.2</a></td> <td>compile</td> <td></td> <td>jar</td> <td>The Apache Software License, Version 2.0</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#commons-lang:commons-lang:2.6">commons-lang:commons-lang:2.6</a></td> <td>compile</td> <td></td> <td>jar</td> <td>The Apache Software License, Version 2.0</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#fr.ird.observe:application-web-configuration:7.0-RC-2">fr.ird.observe:application-web-configuration:7.0-RC-2</a></td> <td>compile</td> <td></td> <td>jar</td> <td>General Public License (GPL)</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#fr.ird.observe:services-runner:7.0-RC-2">fr.ird.observe:services-runner:7.0-RC-2</a></td> <td>compile</td> <td></td> <td>jar</td> <td>General Public License (GPL)</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#javax.servlet:javax.servlet-api:4.0.0-b07">javax.servlet:javax.servlet-api:4.0.0-b07</a></td> <td>provided</td> <td></td> <td>jar</td> <td>CDDL + GPLv2 with classpath exception</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#javax.validation:validation-api:1.0.0.GA">javax.validation:validation-api:1.0.0.GA</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Apache License, Version 2.0</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.antlr:ST4:4.0.4">org.antlr:ST4:4.0.4</a></td> <td>compile</td> <td></td> <td>jar</td> <td>BSD licence</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_error_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.antlr:antlr-runtime:3.3">org.antlr:antlr-runtime:3.3</a></td> <td>compile</td> <td></td> <td>jar</td> <td>-</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.antlr:stringtemplate:3.2.1">org.antlr:stringtemplate:3.2.1</a></td> <td>compile</td> <td></td> <td>jar</td> <td>BSD licence</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.apache.httpcomponents:fluent-hc:4.2.3">org.apache.httpcomponents:fluent-hc:4.2.3</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Apache License</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.bouncycastle:bcprov-jdk16:1.46">org.bouncycastle:bcprov-jdk16:1.46</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Bouncy Castle Licence</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.debux.webmotion:webmotion:2.5.3">org.debux.webmotion:webmotion:2.5.3</a></td> <td>compile</td> <td></td> <td>jar</td> <td>LGPL</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.debux.webmotion:webmotion-unittest:2.5.3">org.debux.webmotion:webmotion-unittest:2.5.3</a></td> <td>test</td> <td></td> <td>jar</td> <td>LGPL</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.eclipse.jetty:jetty-http:8.1.1.v20120215">org.eclipse.jetty:jetty-http:8.1.1.v20120215</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Apache Software License - Version 2.0<br />Eclipse Public License - Version 1.0</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.eclipse.jetty:jetty-io:8.1.1.v20120215">org.eclipse.jetty:jetty-io:8.1.1.v20120215</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Apache Software License - Version 2.0<br />Eclipse Public License - Version 1.0</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.eclipse.jetty:jetty-util:8.1.1.v20120215">org.eclipse.jetty:jetty-util:8.1.1.v20120215</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Apache Software License - Version 2.0<br />Eclipse Public License - Version 1.0</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.eclipse.jetty:jetty-websocket:8.1.1.v20120215">org.eclipse.jetty:jetty-websocket:8.1.1.v20120215</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Apache Software License - Version 2.0<br />Eclipse Public License - Version 1.0</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.hibernate:hibernate-validator:4.2.0.Final">org.hibernate:hibernate-validator:4.2.0.Final</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Apache License, Version 2.0</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.jdom:jdom:2.0.2">org.jdom:jdom:2.0.2</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Similar to Apache License but with the acknowledgment clause removed</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.parboiled:parboiled-core:1.0.2">org.parboiled:parboiled-core:1.0.2</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Apache 2</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.parboiled:parboiled-java:1.0.2">org.parboiled:parboiled-java:1.0.2</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Apache 2</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.slf4j:slf4j-log4j12:1.7.25">org.slf4j:slf4j-log4j12:1.7.25</a></td> <td>runtime</td> <td></td> <td>jar</td> <td>MIT License</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#xmlpull:xmlpull:1.1.3.1">xmlpull:xmlpull:1.1.3.1</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Public Domain</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#xpp3:xpp3_min:1.1.4c">xpp3:xpp3_min:1.1.4c</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Indiana University Extreme! Lab Software License, vesion 1.1.1<br />Public Domain</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#com.googlecode.efficient-java-matrix-library:core:0.26">com.googlecode.efficient-java-matrix-library:core:0.26</a></td> <td>compile</td> <td></td> <td>jar</td> <td>The Apache Software License, Version 2.0</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#com.miglayout:miglayout:3.7">com.miglayout:miglayout:3.7</a></td> <td>compile</td> <td></td> <td>jar</td> <td>BSD</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#com.vividsolutions:jts:1.13">com.vividsolutions:jts:1.13</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL)</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#com.vladsch.flexmark:flexmark:0.22.14">com.vladsch.flexmark:flexmark:0.22.14</a></td> <td>compile</td> <td></td> <td>jar</td> <td>BSD 2-Clause License</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#com.vladsch.flexmark:flexmark-util:0.22.14">com.vladsch.flexmark:flexmark-util:0.22.14</a></td> <td>compile</td> <td></td> <td>jar</td> <td>BSD 2-Clause License</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#commons-pool:commons-pool:1.5.4">commons-pool:commons-pool:1.5.4</a></td> <td>compile</td> <td></td> <td>jar</td> <td>The Apache Software License, Version 2.0</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#fr.ird.observe:application-swing-configuration:7.0-RC-2">fr.ird.observe:application-swing-configuration:7.0-RC-2</a></td> <td>compile</td> <td></td> <td>jar</td> <td>General Public License (GPL)</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#io.ultreia.java4all.i18n:i18n-editor:4.0-alpha-3">io.ultreia.java4all.i18n:i18n-editor:4.0-alpha-3</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL) v 3.0</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#io.ultreia.java4all.jaxx:jaxx-runtime-swing-application:3.0-alpha-8">io.ultreia.java4all.jaxx:jaxx-runtime-swing-application:3.0-alpha-8</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL) v 3.0</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#io.ultreia.java4all.jaxx:jaxx-runtime-swing-session:3.0-alpha-8">io.ultreia.java4all.jaxx:jaxx-runtime-swing-session:3.0-alpha-8</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL) v 3.0</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#io.ultreia.java4all.jaxx:jaxx-runtime-swing-wizard:3.0-alpha-8">io.ultreia.java4all.jaxx:jaxx-runtime-swing-wizard:3.0-alpha-8</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL) v 3.0</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#io.ultreia.java4all.jaxx:jaxx-widgets-about:3.0-alpha-8">io.ultreia.java4all.jaxx:jaxx-widgets-about:3.0-alpha-8</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL) v 3.0</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#io.ultreia.java4all.jaxx:jaxx-widgets-config:3.0-alpha-8">io.ultreia.java4all.jaxx:jaxx-widgets-config:3.0-alpha-8</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL) v 3.0</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#io.ultreia.java4all.jaxx:jaxx-widgets-datetime:3.0-alpha-8">io.ultreia.java4all.jaxx:jaxx-widgets-datetime:3.0-alpha-8</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL) v 3.0</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#io.ultreia.java4all.jaxx:jaxx-widgets-error:3.0-alpha-8">io.ultreia.java4all.jaxx:jaxx-widgets-error:3.0-alpha-8</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL) v 3.0</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#io.ultreia.java4all.jaxx:jaxx-widgets-file:3.0-alpha-8">io.ultreia.java4all.jaxx:jaxx-widgets-file:3.0-alpha-8</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL) v 3.0</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#io.ultreia.java4all.jaxx:jaxx-widgets-hidor:3.0-alpha-8">io.ultreia.java4all.jaxx:jaxx-widgets-hidor:3.0-alpha-8</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL) v 3.0</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#io.ultreia.java4all.jaxx:jaxx-widgets-number:3.0-alpha-8">io.ultreia.java4all.jaxx:jaxx-widgets-number:3.0-alpha-8</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL) v 3.0</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#io.ultreia.java4all.jaxx:jaxx-widgets-select:3.0-alpha-8">io.ultreia.java4all.jaxx:jaxx-widgets-select:3.0-alpha-8</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL) v 3.0</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#io.ultreia.java4all.jaxx:jaxx-widgets-status:3.0-alpha-8">io.ultreia.java4all.jaxx:jaxx-widgets-status:3.0-alpha-8</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL) v 3.0</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#javax.media:jai_core:1.1.3">javax.media:jai_core:1.1.3</a></td> <td>compile</td> <td></td> <td>jar</td> <td>JDL (Java Distribution License)</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#net.java.dev.jsr-275:jsr-275:1.0-beta-2">net.java.dev.jsr-275:jsr-275:1.0-beta-2</a></td> <td>compile</td> <td></td> <td>jar</td> <td>BSD License</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#net.sf.geographiclib:GeographicLib-Java:1.44">net.sf.geographiclib:GeographicLib-Java:1.44</a></td> <td>compile</td> <td></td> <td>jar</td> <td>The MIT License(MIT)</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.freemarker:freemarker:2.3.23">org.freemarker:freemarker:2.3.23</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Apache License, Version 2.0</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.geotools:gt-api:17.1">org.geotools:gt-api:17.1</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL)</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.geotools:gt-coverage:17.1">org.geotools:gt-coverage:17.1</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL)</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.geotools:gt-cql:17.1">org.geotools:gt-cql:17.1</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL)</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.geotools:gt-data:17.1">org.geotools:gt-data:17.1</a></td> <td>runtime</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL)</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.geotools:gt-epsg-hsql:17.1">org.geotools:gt-epsg-hsql:17.1</a></td> <td>runtime</td> <td></td> <td>jar</td> <td>BSD License for HSQL<br />EPSG database distribution license<br />Lesser General Public License (LGPL)</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.geotools:gt-main:17.1">org.geotools:gt-main:17.1</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL)</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.geotools:gt-metadata:17.1">org.geotools:gt-metadata:17.1</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL)</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.geotools:gt-opengis:17.1">org.geotools:gt-opengis:17.1</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL)<br />OGC copyright</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.geotools:gt-referencing:17.1">org.geotools:gt-referencing:17.1</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL)</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.geotools:gt-render:17.1">org.geotools:gt-render:17.1</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL)</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.geotools:gt-shapefile:17.1">org.geotools:gt-shapefile:17.1</a></td> <td>runtime</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL)</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.geotools:gt-swing:17.1">org.geotools:gt-swing:17.1</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Lesser General Public License (LGPL)</td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.hsqldb:hsqldb:2.3.0">org.hsqldb:hsqldb:2.3.0</a></td> <td>runtime</td> <td></td> <td>jar</td> <td>HSQLDB License, a BSD open source license</td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> <td><a href="./third-party-report.html#org.jdom:jdom:1.1.3">org.jdom:jdom:1.1.3</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Similar to Apache License but with the acknowledgment clause removed</td></tr> -<tr class="b"> +<tr class="a"> <th>Statut</th> <th>GroupId:ArtifactId:Version</th> <th>Scope</th> @@ -1603,22 +1596,22 @@ <div class="section"> <h3><a name="org.antlr:antlr-runtime:3.3"></a>org.antlr:antlr-runtime:3.3</h3> <table border="0" class="table table-striped"> -<tr class="a"> +<tr class="b"> <th width="20%">Statut</th> <td width="80%"><img src="images/icon_error_sml.gif" alt="" /> Aucune license pour cette dépendance</td></tr> -<tr class="b"> +<tr class="a"> <th width="20%">GroupId:ArtifactId:Version</th> <td width="80%">org.antlr:antlr-runtime:3.3</td></tr> -<tr class="a"> +<tr class="b"> <th width="20%">Scope</th> <td width="80%">compile</td></tr> -<tr class="b"> +<tr class="a"> <th width="20%">Classifier</th> <td width="80%"></td></tr> -<tr class="a"> +<tr class="b"> <th width="20%">Type</th> <td width="80%">jar</td></tr> -<tr class="b"> +<tr class="a"> <th width="20%">License(s)</th> <td width="80%">Aucune license pour cette dépendance, veuiller renseigner le fichier de consolidation des licenses.</td></tr></table><a href="./third-party-report.html#Description">Retour en haut de la page.</a><br /></div></div> <div class="section"> @@ -4106,38 +4099,17 @@ <th width="20%">License(s)</th> <td width="80%">The Apache Software License, Version 2.0</td></tr></table><a href="./third-party-report.html#Description">Retour en haut de la page.</a><br /></div> <div class="section"> -<h3><a name="fr.ird.observe:test:7.0-RC-2"></a>fr.ird.observe:test:7.0-RC-2</h3> -<table border="0" class="table table-striped"> -<tr class="a"> -<th width="20%">Statut</th> -<td width="80%"><img src="images/icon_success_sml.gif" alt="" /> License clairement définie dans le pom de cette dépendance</td></tr> -<tr class="b"> -<th width="20%">GroupId:ArtifactId:Version</th> -<td width="80%">fr.ird.observe:test:7.0-RC-2</td></tr> -<tr class="a"> -<th width="20%">Scope</th> -<td width="80%">test</td></tr> -<tr class="b"> -<th width="20%">Classifier</th> -<td width="80%"></td></tr> -<tr class="a"> -<th width="20%">Type</th> -<td width="80%">jar</td></tr> -<tr class="b"> -<th width="20%">License(s)</th> -<td width="80%">General Public License (GPL)</td></tr></table><a href="./third-party-report.html#Description">Retour en haut de la page.</a><br /></div> -<div class="section"> -<h3><a name="fr.ird.observe:services-binder:7.0-RC-2"></a>fr.ird.observe:services-binder:7.0-RC-2</h3> +<h3><a name="fr.ird.observe:services-validation:7.0-RC-2"></a>fr.ird.observe:services-validation:7.0-RC-2</h3> <table border="0" class="table table-striped"> <tr class="a"> <th width="20%">Statut</th> <td width="80%"><img src="images/icon_success_sml.gif" alt="" /> License clairement définie dans le pom de cette dépendance</td></tr> <tr class="b"> <th width="20%">GroupId:ArtifactId:Version</th> -<td width="80%">fr.ird.observe:services-binder:7.0-RC-2</td></tr> +<td width="80%">fr.ird.observe:services-validation:7.0-RC-2</td></tr> <tr class="a"> <th width="20%">Scope</th> -<td width="80%">compile</td></tr> +<td width="80%">runtime</td></tr> <tr class="b"> <th width="20%">Classifier</th> <td width="80%"></td></tr> @@ -4148,17 +4120,17 @@ <th width="20%">License(s)</th> <td width="80%">General Public License (GPL)</td></tr></table><a href="./third-party-report.html#Description">Retour en haut de la page.</a><br /></div> <div class="section"> -<h3><a name="fr.ird.observe:services-validation:7.0-RC-2"></a>fr.ird.observe:services-validation:7.0-RC-2</h3> +<h3><a name="fr.ird.observe:test:7.0-RC-2"></a>fr.ird.observe:test:7.0-RC-2</h3> <table border="0" class="table table-striped"> <tr class="a"> <th width="20%">Statut</th> <td width="80%"><img src="images/icon_success_sml.gif" alt="" /> License clairement définie dans le pom de cette dépendance</td></tr> <tr class="b"> <th width="20%">GroupId:ArtifactId:Version</th> -<td width="80%">fr.ird.observe:services-validation:7.0-RC-2</td></tr> +<td width="80%">fr.ird.observe:test:7.0-RC-2</td></tr> <tr class="a"> <th width="20%">Scope</th> -<td width="80%">runtime</td></tr> +<td width="80%">test</td></tr> <tr class="b"> <th width="20%">Classifier</th> <td width="80%"></td></tr> ===================================== changelog.html ===================================== The diff for this file was not included because it is too large. ===================================== dependency-convergence.html ===================================== --- a/dependency-convergence.html +++ b/dependency-convergence.html @@ -104,13 +104,13 @@ </caption> <tr class="b"> <th>Nombre de sous-projets :</th> -<td>20</td></tr> +<td>19</td></tr> <tr class="a"> <th>Nombre de dépendances (NOD) :</th> -<td>196</td></tr> +<td>195</td></tr> <tr class="b"> <th>Nombre d'artefacts uniques (NOA) :</th> -<td>204</td></tr> +<td>203</td></tr> <tr class="a"> <th>Number of version-conflicting artifacts (NOC):</th> <td>4</td></tr> ===================================== dependency-updates-report.html ===================================== --- a/dependency-updates-report.html +++ b/dependency-updates-report.html @@ -163,7 +163,7 @@ <td>jar</td> <td><b>22.0-android</b></td> <td></td> -<td></td> +<td><b>23.0-rc1</b></td> <td></td></tr> <tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /></td> @@ -1136,7 +1136,7 @@ <td>jar</td></tr> <tr class="b"> <th width="80%">Newer versions</th> -<td><b>22.0-android</b> <i>Next Version</i></td></tr></table></div> +<td><b>22.0-android</b> <i>Next Version</i><br /><b>23.0-rc1</b> <i>Next Minor</i><br /><b>23.0-rc1-android</b> <i>Latest Minor</i></td></tr></table></div> <div class="section"> <h3><a name="com.h2database:h2"></a>com.h2database:h2</h3> <table border="0" class="table table-striped"> ===================================== dev-activity.html ===================================== --- a/dev-activity.html +++ b/dev-activity.html @@ -94,7 +94,7 @@ <h2><a name="Developer_Activity_Report"></a>Developer Activity Report</h2> <div class="section"> <h3><a name="Changes_between_2017-06-25_and_2017-07-26"></a>Changes between 2017-06-25 and 2017-07-26</h3> -<p>Total commits: 46<br />Total number of files changed: 444</p> +<p>Total commits: 68<br />Total number of files changed: 1307</p> <table border="0" class="table table-striped"> <tr class="a"> <th>Developer</th> @@ -102,12 +102,12 @@ <th>Total Number of Files Changed</th></tr> <tr class="b"> <td>166231 <dev(a)tchemit.fr></td> -<td>2</td> -<td>20</td></tr> +<td>8</td> +<td>21</td></tr> <tr class="a"> <td>Tony CHEMIT <dev(a)tchemit.fr></td> -<td>35</td> -<td>369</td></tr> +<td>51</td> +<td>1272</td></tr> <tr class="b"> <td>Tony Chemit <dev(a)tchemit.fr></td> <td>9</td> ===================================== file-activity.html ===================================== The diff for this file was not included because it is too large. ===================================== property-updates-report.html ===================================== --- a/property-updates-report.html +++ b/property-updates-report.html @@ -155,7 +155,7 @@ <td>22.0</td> <td><b>22.0-android</b></td> <td></td> -<td></td> +<td><b>23.0-rc1</b></td> <td></td></tr> <tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /></td> @@ -381,7 +381,7 @@ <td>22.0</td></tr> <tr class="a"> <th width="80%">Newer versions</th> -<td><b>22.0-android</b> <i>Next Version</i></td></tr> +<td><b>22.0-android</b> <i>Next Version</i><br /><b>23.0-rc1</b> <i>Next Minor</i><br /><b>23.0-rc1-android</b> <i>Latest Minor</i></td></tr> <tr class="b"> <th width="80%">Allowed version range</th> <td>[,)</td></tr> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1a43b0d87a562ab2f609cc483be… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1a43b0d87a562ab2f609cc483be… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog after stage of milestone 7.0-RC-2 [skip ci]
by Tony CHEMIT 25 Jul '17

25 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: df2f4f7d by Tony CHEMIT at 2017-07-25T22:52:40+02:00 Update changelog after stage of milestone 7.0-RC-2 [skip ci] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,15 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2017-07-25 12:45. + * Last generated at 2017-07-25 22:52. ## Version [7.0-RC-2](https://gitlab.com/ultreiaio/ird-observe/milestones/96) **Closed at 2017-07-25.** ### Download -* [Application (observe-7.0-RC-2.zip)](https://oss.sonatype.org/content/repositories/frirdo…) -* [Serveur (observe-7.0-RC-2.war)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Application (observe-7.0-RC-2.zip)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Serveur (observe-7.0-RC-2.war)](https://oss.sonatype.org/content/repositories/frirdo…) ### Issues * [[Anomalie 510]](https://gitlab.com/ultreiaio/ird-observe/issues/510) **[SECURITE] L'assistant sécurité semble ne pas donner correctement l'accès au schéma public** (Thanks to Tony CHEMIT) (Reported by ) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/df2f4f7d2feee96a42fd6a6a8a2… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/df2f4f7d2feee96a42fd6a6a8a2… You're receiving this email because of your account on gitlab.com.

1 0