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

[Git][ultreiaio/ird-observe][develop] Improve javaBean on entities (let's generate everything \o/)
by Tony CHEMIT Aug. 15, 2020

Aug. 15, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a6757019 by Tony Chemit at 2020-08-15T12:19:54+02:00 Improve javaBean on entities (let's generate everything \o/) - - - - - 2 changed files: - − persistence/src/main/java/fr/ird/observe/entities/EntityImpl.java - templates/src/main/java/fr/ird/observe/toolkit/templates/entity/EntityTransformer.java Changes: ===================================== persistence/src/main/java/fr/ird/observe/entities/EntityImpl.java deleted ===================================== @@ -1,46 +0,0 @@ -package fr.ird.observe.entities; - -/*- - * #%L - * ObServe :: Persistence - * %% - * Copyright (C) 2008 - 2020 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% - */ - - -import io.ultreia.java4all.bean.definition.JavaBeanDefinition; -import io.ultreia.java4all.bean.definition.JavaBeanDefinitionStore; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -public abstract class EntityImpl extends EntityAbstract { - - private static final long serialVersionUID = 1L; - private static final Logger log = LogManager.getLogger(EntityImpl.class); - private JavaBeanDefinition javaBeanDefinition; - - @Override - public JavaBeanDefinition javaBeanDefinition() { - if (javaBeanDefinition == null) { - Class<? extends Entity> contractClass = ObserveEntityEnum.getContractClass(getClass()); - javaBeanDefinition = JavaBeanDefinitionStore.getDefinition(contractClass).orElseThrow(IllegalStateException::new); - log.info(String.format("Loaded javaBean definition for: %s → %s", contractClass.getName(), javaBeanDefinition)); - } - return javaBeanDefinition; - } -} ===================================== templates/src/main/java/fr/ird/observe/toolkit/templates/entity/EntityTransformer.java ===================================== @@ -40,6 +40,7 @@ import fr.ird.observe.spi.context.ReferentialDtoEntityContext; import fr.ird.observe.spi.mapping.DtoToEntityContextMapping; import fr.ird.observe.spi.mapping.EntityToDtoClassMapping; import fr.ird.observe.toolkit.templates.TemplateContract; +import io.ultreia.java4all.bean.definition.JavaBeanDefinitionStore; import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; import io.ultreia.java4all.classmapping.ImmutableClassMapping; import io.ultreia.java4all.lang.Strings; @@ -369,6 +370,9 @@ public class EntityTransformer extends TopiaEntityTransformer implements Templat } } } + if (!input.isAbstract()) { + generateJavaBeanMethods(); + } generateInterfaceUsageConstant(input); } @@ -668,6 +672,21 @@ public class EntityTransformer extends TopiaEntityTransformer implements Templat return result.toString(); } + private void generateJavaBeanMethods() { + + // add JavaBeanDefinition constant + String javaBeanDefinition = outputInterface.getName()+"JavaBeanDefinition"; + addImport(outputInterface, JavaBeanDefinitionStore.class); + addConstant(outputInterface, "JAVA_BEAN_DEFINITION", javaBeanDefinition, "JavaBeanDefinitionStore.definition("+javaBeanDefinition+".class)",ObjectModelJavaModifier.PUBLIC); + + // add JavaBean method + ObjectModelOperation operation = addOperation(outputInterface, "javaBeanDefinition", javaBeanDefinition, ObjectModelJavaModifier.DEFAULT); + setOperationBody(operation, ""/*{ + return JAVA_BEAN_DEFINITION; + }*/); + addAnnotation(outputInterface, operation, Override.class); + } + private void generateSpiDelegateMethods(boolean referential, String daoName) { List<Method> methods = Arrays.stream((referential ? ReferentialDtoEntityContext.class : DataDtoEntityContext.class).getMethods()).filter(method -> { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a6757019cf4b45628c3fc8a00… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a6757019cf4b45628c3fc8a00… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] optimize dependencies
by Tony CHEMIT Aug. 14, 2020

Aug. 14, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 03be6fe8 by Tony Chemit at 2020-08-14T16:01:07+02:00 optimize dependencies - - - - - 1 changed file: - services-local/pom.xml Changes: ===================================== services-local/pom.xml ===================================== @@ -106,10 +106,6 @@ <groupId>io.ultreia.java4all</groupId> <artifactId>class-mapping</artifactId> </dependency> - <dependency> - <groupId>io.ultreia.java4all</groupId> - <artifactId>java-bean</artifactId> - </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/03be6fe8680fb982d5b4cdbf7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/03be6fe8680fb982d5b4cdbf7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Add test to be sure java bean are loaded on entities.
by Tony CHEMIT Aug. 14, 2020

Aug. 14, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 25e4e895 by Tony Chemit at 2020-08-14T15:55:29+02:00 Add test to be sure java bean are loaded on entities. - - - - - 1 changed file: - persistence/src/test/java/fr/ird/observe/entities/ObserveTopiaApplicationContextTest.java Changes: ===================================== persistence/src/test/java/fr/ird/observe/entities/ObserveTopiaApplicationContextTest.java ===================================== @@ -24,12 +24,17 @@ package fr.ird.observe.entities; import fr.ird.observe.test.TestHelper; import fr.ird.observe.test.TestSupportWithConfig; +import io.ultreia.java4all.bean.JavaBean; +import io.ultreia.java4all.bean.definition.JavaBeanDefinition; import org.junit.Assert; import org.junit.Test; +import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.service.script.table.TopiaSqlTable; import org.nuiton.topia.service.script.table.TopiaSqlTables; import java.io.File; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Modifier; import java.util.Date; import java.util.List; @@ -123,6 +128,18 @@ public class ObserveTopiaApplicationContextTest extends TestSupportWithConfig { } } + @Test + public void testGetJavaBeanDefinition() throws NoSuchMethodException, IllegalAccessException, InvocationTargetException, InstantiationException { + for (ObserveEntityEnum value : ObserveEntityEnum.values()) { + if (Modifier.isAbstract(value.getImplementation().getModifiers())) { + continue; + } + JavaBean topiaEntity = (JavaBean) value.getImplementation().getDeclaredConstructor().newInstance(); + JavaBeanDefinition javaBeanDefinition = topiaEntity.javaBeanDefinition(); + Assert.assertNotNull(javaBeanDefinition); + } + } + private void assertUpdateRequests(List<String> requests, int expectedSize) { Assert.assertNotNull(requests); Assert.assertEquals(expectedSize, requests.size()); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/25e4e8952ed2bf625a5e54d01… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/25e4e8952ed2bf625a5e54d01… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Make Entity JavaBean :)
by Tony CHEMIT Aug. 14, 2020

Aug. 14, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9e4cd83f by Tony Chemit at 2020-08-14T15:07:17+02:00 Make Entity JavaBean :) - - - - - 1c2d492a by Tony Chemit at 2020-08-14T15:36:36+02:00 Improve service delete method (now just two methods) - - - - - 18 changed files: - common-persistence/pom.xml - common-persistence/src/main/java/fr/ird/observe/entities/Entity.java - common-persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaPersistenceContextSupport.java - + persistence/src/main/java/fr/ird/observe/entities/EntityImpl.java - services-local/pom.xml - services-local/src/main/java/fr/ird/observe/services/local/service/ObserveServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/landing/LandingServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/ActivitySampleServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/ActivityServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/SetServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/TripSampleServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/ActivityServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/SetServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/ActivityServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/FloatingObjectServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/RouteServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SetServiceLocal.java - templates/src/main/java/fr/ird/observe/toolkit/templates/entity/EntityTransformer.java Changes: ===================================== common-persistence/pom.xml ===================================== @@ -70,6 +70,10 @@ <groupId>io.ultreia.java4all</groupId> <artifactId>application-context</artifactId> </dependency> + <dependency> + <groupId>io.ultreia.java4all</groupId> + <artifactId>java-bean</artifactId> + </dependency> <dependency> <groupId>io.ultreia.java4all.i18n</groupId> <artifactId>i18n-runtime</artifactId> ===================================== common-persistence/src/main/java/fr/ird/observe/entities/Entity.java ===================================== @@ -23,12 +23,15 @@ package fr.ird.observe.entities; */ import fr.ird.observe.dto.reference.DtoReferenceAware; +import io.ultreia.java4all.bean.JavaBean; +import io.ultreia.java4all.bean.definition.JavaBeanDefinition; +import io.ultreia.java4all.bean.definition.JavaBeanDefinitionStore; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.event.ListenableTopiaEntity; import java.util.Date; -public interface Entity extends TopiaEntity, ListenableTopiaEntity, DtoReferenceAware { +public interface Entity extends TopiaEntity, ListenableTopiaEntity, DtoReferenceAware, JavaBean { String PROPERTY_LAST_UPDATE_DATE = "lastUpdateDate"; ===================================== common-persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaPersistenceContextSupport.java ===================================== @@ -211,7 +211,11 @@ public abstract class ObserveTopiaPersistenceContextSupport extends AbstractTopi Class<? extends DataEntity> associationType = getTopiaIdFactory().getClassName(associationId); throw new DataAssociationParentNotFoundException(locale, DbModelHelper.fromDataEntity(associationType).toDtoType(), associationName, associationId); } - return getDao(associationContainerType).forTopiaIdEquals(Objects.requireNonNull(parentId)).findUnique(); + E result = getDao(associationContainerType).forTopiaIdEquals(Objects.requireNonNull(parentId)).findUniqueOrNull(); + if (result == null) { + throw new DataNotFoundException(locale, DbModelHelper.fromEntity(associationContainerType).toDtoType(), parentId); + } + return result; } protected class CountTableSqlWork extends TopiaSqlQuery<Long> { ===================================== persistence/src/main/java/fr/ird/observe/entities/EntityImpl.java ===================================== @@ -0,0 +1,46 @@ +package fr.ird.observe.entities; + +/*- + * #%L + * ObServe :: Persistence + * %% + * Copyright (C) 2008 - 2020 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% + */ + + +import io.ultreia.java4all.bean.definition.JavaBeanDefinition; +import io.ultreia.java4all.bean.definition.JavaBeanDefinitionStore; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +public abstract class EntityImpl extends EntityAbstract { + + private static final long serialVersionUID = 1L; + private static final Logger log = LogManager.getLogger(EntityImpl.class); + private JavaBeanDefinition javaBeanDefinition; + + @Override + public JavaBeanDefinition javaBeanDefinition() { + if (javaBeanDefinition == null) { + Class<? extends Entity> contractClass = ObserveEntityEnum.getContractClass(getClass()); + javaBeanDefinition = JavaBeanDefinitionStore.getDefinition(contractClass).orElseThrow(IllegalStateException::new); + log.info(String.format("Loaded javaBean definition for: %s → %s", contractClass.getName(), javaBeanDefinition)); + } + return javaBeanDefinition; + } +} ===================================== services-local/pom.xml ===================================== @@ -106,6 +106,10 @@ <groupId>io.ultreia.java4all</groupId> <artifactId>class-mapping</artifactId> </dependency> + <dependency> + <groupId>io.ultreia.java4all</groupId> + <artifactId>java-bean</artifactId> + </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/ObserveServiceLocal.java ===================================== @@ -218,6 +218,42 @@ public abstract class ObserveServiceLocal implements ObserveService { protected List<Species> filterByOcean(Collection<Species> speciesCollection, Ocean ocean) { return speciesCollection.stream().filter(s -> s.containsOcean(ocean)).collect(Collectors.toList()); } + + protected void deleteSingleAssociation(String idToDelete, + DataDtoEntityContext<?, ?, ?, ?> spi, + DataDtoEntityContext<?, ?, ?, ?> parentSpi, + String associationName) { + + DataEntity<?, ?> entityToDelete = spi.loadEntity(getApplicationLocale(), getTopiaPersistenceContext(), idToDelete); + DataEntity<?, ?> parentEntity = getTopiaPersistenceContext().getSingleAssociationParent(getApplicationLocale(), parentSpi.toEntityType(), associationName, idToDelete); + Object realChild = parentEntity.get(associationName); + if (!Objects.equals(entityToDelete, realChild)) { + throw new DataNotFoundException(getApplicationLocale(), spi.toDtoType(), idToDelete); + } + parentEntity.set(associationName, null); + deleteEntity(parentSpi, parentEntity, entityToDelete); + } + + protected <E extends DataEntity<?, ?>> E deleteMultipleAssociation(DataDtoEntityContext<?, ?, E, ?> parentSpi, String associationName, DataDtoEntityContext<?, ?, ?, ?> spi, String idToDelete) { + + DataEntity<?, ?> entityToDelete = spi.loadEntity(getApplicationLocale(), getTopiaPersistenceContext(), idToDelete); + E parentEntity = getTopiaPersistenceContext().getMultipleAssociationParent(getApplicationLocale(), parentSpi.toEntityType(), associationName, idToDelete); + Collection<?> realChild = parentEntity.get(associationName); + if (!realChild.contains(entityToDelete)) { + throw new DataNotFoundException(getApplicationLocale(), spi.toDtoType(), idToDelete); + } + realChild.remove(entityToDelete); + deleteEntity(parentSpi, parentEntity, entityToDelete); + return parentEntity; + } + + private <C extends Entity, E extends Entity> void deleteEntity(DataDtoEntityContext<?, ?, ?, ?> spi, E parentEntity, C deletedEntity) { + Date lastUpdateDate = now(); + getTopiaPersistenceContext().updateLastUpdateDate(parentEntity, lastUpdateDate); + spi.updateLastUpdates(getTopiaPersistenceContext(), parentEntity.getTopiaId(), lastUpdateDate); + updateLastUpdateDate(spi.toEntityType()); + updateLastUpdateDate(getTopiaPersistenceContext().getType(deletedEntity)); + } } ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/landing/LandingServiceLocal.java ===================================== @@ -29,7 +29,6 @@ import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.reference.DataDtoReferenceSet; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.dto.result.TripChildSaveResultDto; -import fr.ird.observe.entities.DataNotFoundException; import fr.ird.observe.entities.data.ll.common.Trip; import fr.ird.observe.entities.data.ll.common.TripTopiaDao; import fr.ird.observe.entities.data.ll.landing.Landing; @@ -93,13 +92,7 @@ public class LandingServiceLocal extends ObserveServiceLocal implements LandingS @Override public void delete(String landingLogbookId) { - Trip trip = getTopiaPersistenceContext().getMultipleAssociationParent(getApplicationLocale(), Trip.class, Trip.PROPERTY_LANDING, landingLogbookId); - Landing landing = Landing.loadEntity(getApplicationLocale(), getTopiaPersistenceContext(), landingLogbookId); - if (!trip.containsLanding(landing)) { - throw new DataNotFoundException(getApplicationLocale(), LandingDto.class, landingLogbookId); - } - trip.removeLanding(landing); - saveEntity(Trip.SPI, trip); + deleteMultipleAssociation(Trip.SPI, Trip.PROPERTY_LANDING, Landing.SPI, landingLogbookId); } @Override ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/ActivitySampleServiceLocal.java ===================================== @@ -69,10 +69,7 @@ public class ActivitySampleServiceLocal extends ObserveServiceLocal implements A @Override public void delete(String sampleLogbookId) { - Activity activity = getActivityLonglineLogbook(sampleLogbookId); - Sample.loadEntity(getApplicationLocale(), getTopiaPersistenceContext(), sampleLogbookId); - activity.setSample(null); - saveEntity(Activity.SPI, activity); + deleteSingleAssociation(sampleLogbookId, Sample.SPI, Activity.SPI, Activity.PROPERTY_SAMPLE); } @Override ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/ActivityServiceLocal.java ===================================== @@ -31,7 +31,6 @@ import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.reference.DataDtoReferenceSet; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.dto.result.TripChildSaveResultDto; -import fr.ird.observe.entities.DataNotFoundException; import fr.ird.observe.entities.data.ll.common.Trip; import fr.ird.observe.entities.data.ll.logbook.Activity; import fr.ird.observe.entities.data.ll.logbook.ActivityTopiaDao; @@ -120,13 +119,7 @@ public class ActivityServiceLocal extends ObserveServiceLocal implements Activit @Override public boolean delete(String activityLonglineId) { - Trip trip = getTopiaPersistenceContext().getMultipleAssociationParent(getApplicationLocale(), Trip.class, Trip.PROPERTY_ACTIVITY_LOGBOOK, activityLonglineId); - Activity activityLongline = Activity.loadEntity(getApplicationLocale(), getTopiaPersistenceContext(), activityLonglineId); - if (!trip.containsActivityLogbook(activityLongline)) { - throw new DataNotFoundException(getApplicationLocale(), ActivityDto.class, activityLonglineId); - } - trip.removeActivityLogbook(activityLongline); - saveEntity(Trip.SPI, trip); + Trip trip = deleteMultipleAssociation(Trip.SPI, Trip.PROPERTY_ACTIVITY_LOGBOOK, Activity.SPI, activityLonglineId); return Trip.getDao(getTopiaPersistenceContext()).updateEndDate(trip); } ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/SetServiceLocal.java ===================================== @@ -29,7 +29,6 @@ import fr.ird.observe.dto.data.ll.logbook.SetReference; import fr.ird.observe.dto.data.ll.logbook.SetStubDto; import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.result.SaveResultDto; -import fr.ird.observe.entities.DataNotFoundException; import fr.ird.observe.entities.data.ll.common.Trip; import fr.ird.observe.entities.data.ll.logbook.Activity; import fr.ird.observe.entities.data.ll.logbook.Set; @@ -157,13 +156,14 @@ public class SetServiceLocal extends ObserveServiceLocal implements SetService { @Override public void delete(String setLonglineId) { - Activity activityLongline = getActivityLonglineLogbook(setLonglineId); - Set setLongline = Set.loadEntity(getApplicationLocale(), getTopiaPersistenceContext(), setLonglineId); - if (!activityLongline.getSet().equals(setLongline)) { - throw new DataNotFoundException(getApplicationLocale(), SetDto.class, setLonglineId); - } - activityLongline.setSet(null); - saveEntity(Activity.SPI, activityLongline); + deleteSingleAssociation(setLonglineId, Set.SPI, Activity.SPI, Activity.PROPERTY_SET); +// Activity activityLongline = getActivityLonglineLogbook(setLonglineId); +// Set setLongline = Set.loadEntity(getApplicationLocale(), getTopiaPersistenceContext(), setLonglineId); +// if (!activityLongline.getSet().equals(setLongline)) { +// throw new DataNotFoundException(getApplicationLocale(), SetDto.class, setLonglineId); +// } +// activityLongline.setSet(null); +// saveEntity(Activity.SPI, activityLongline); } private Activity getActivityLonglineLogbook(String setToCopyId) { ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/TripSampleServiceLocal.java ===================================== @@ -30,7 +30,6 @@ import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.reference.DataDtoReferenceSet; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.dto.result.TripChildSaveResultDto; -import fr.ird.observe.entities.DataNotFoundException; import fr.ird.observe.entities.data.ll.common.Trip; import fr.ird.observe.entities.data.ll.common.TripTopiaDao; import fr.ird.observe.entities.data.ll.logbook.Activity; @@ -110,13 +109,7 @@ public class TripSampleServiceLocal extends ObserveServiceLocal implements TripS @Override public void delete(String tripLonglineId, String sampleLogbookId) { - Trip trip = Trip.loadEntity(getApplicationLocale(), getTopiaPersistenceContext(), tripLonglineId); - Sample sample = Sample.loadEntity(getApplicationLocale(), getTopiaPersistenceContext(), sampleLogbookId); - if (!trip.containsSample(sample)) { - throw new DataNotFoundException(getApplicationLocale(), SampleDto.class, sampleLogbookId); - } - trip.removeSample(sample); - saveEntity(Trip.SPI, trip); + deleteMultipleAssociation(Trip.SPI, Trip.PROPERTY_SAMPLE, Sample.SPI, tripLonglineId); } @Override ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/ActivityServiceLocal.java ===================================== @@ -30,7 +30,6 @@ import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.reference.DataDtoReferenceSet; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.dto.result.TripChildSaveResultDto; -import fr.ird.observe.entities.DataNotFoundException; import fr.ird.observe.entities.data.ll.common.Trip; import fr.ird.observe.entities.data.ll.observation.Activity; import fr.ird.observe.entities.data.ll.observation.ActivityTopiaDao; @@ -112,13 +111,7 @@ public class ActivityServiceLocal extends ObserveServiceLocal implements Activit @Override public boolean delete(String activityLonglineId) { - Trip trip = getTopiaPersistenceContext().getMultipleAssociationParent(getApplicationLocale(), Trip.class, Trip.PROPERTY_ACTIVITY_OBS, activityLonglineId); - Activity activityLongline = Activity.loadEntity(getApplicationLocale(), getTopiaPersistenceContext(), activityLonglineId); - if (!trip.containsActivityObs(activityLongline)) { - throw new DataNotFoundException(getApplicationLocale(), ActivityDto.class, activityLonglineId); - } - trip.removeActivityObs(activityLongline); - saveEntity(Trip.SPI, trip); + Trip trip = deleteMultipleAssociation(Trip.SPI, Trip.PROPERTY_ACTIVITY_OBS, Activity.SPI, activityLonglineId); return Trip.getDao(getTopiaPersistenceContext()).updateEndDate(trip); } ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/SetServiceLocal.java ===================================== @@ -28,7 +28,6 @@ import fr.ird.observe.dto.data.ll.observation.SetReference; import fr.ird.observe.dto.data.ll.observation.SetStubDto; import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.result.SaveResultDto; -import fr.ird.observe.entities.DataNotFoundException; import fr.ird.observe.entities.data.ll.common.Trip; import fr.ird.observe.entities.data.ll.observation.Activity; import fr.ird.observe.entities.data.ll.observation.Set; @@ -104,13 +103,7 @@ public class SetServiceLocal extends ObserveServiceLocal implements SetService { @Override public void delete(String setLonglineId) { - Activity activityLongline = getTopiaPersistenceContext().getSingleAssociationParent(getApplicationLocale(), Activity.class, Activity.PROPERTY_SET, setLonglineId); - Set setLongline = Set.loadEntity(getApplicationLocale(), getTopiaPersistenceContext(), setLonglineId); - if (!activityLongline.getSet().equals(setLongline)) { - throw new DataNotFoundException(getApplicationLocale(), SetDto.class, setLonglineId); - } - activityLongline.setSet(null); - saveEntity(Activity.SPI, activityLongline); + deleteSingleAssociation(setLonglineId, Set.SPI, Activity.SPI, Activity.PROPERTY_SET); } private java.util.Set<SetStubDto> getOtherSetLonglineDtoSet(Activity currentActivityLongline, Set setLongline) { ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/ActivityServiceLocal.java ===================================== @@ -30,7 +30,6 @@ import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.reference.DataDtoReferenceSet; import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.dto.result.SaveResultDto; -import fr.ird.observe.entities.DataNotFoundException; import fr.ird.observe.entities.data.ps.observation.Activity; import fr.ird.observe.entities.data.ps.observation.Route; import fr.ird.observe.entities.referential.common.FpaZone; @@ -118,13 +117,7 @@ public class ActivityServiceLocal extends ObserveServiceLocal implements Activit @Override public void delete(String activitySeineId) { - Route route = getTopiaPersistenceContext().getMultipleAssociationParent(getApplicationLocale(), Route.class, Route.PROPERTY_ACTIVITY, activitySeineId); - Activity activity = Activity.loadEntity(getApplicationLocale(), getTopiaPersistenceContext(), activitySeineId); - if (!route.containsActivity(activity)) { - throw new DataNotFoundException(getApplicationLocale(), ActivityDto.class, activitySeineId); - } - route.removeActivity(activity); - saveEntity(Route.SPI, route); + deleteMultipleAssociation(Route.SPI, Route.PROPERTY_ACTIVITY, Activity.SPI, activitySeineId); } @Override ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/FloatingObjectServiceLocal.java ===================================== @@ -36,7 +36,6 @@ import fr.ird.observe.dto.reference.DataDtoReferenceSet; import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.dto.referential.ps.observation.ObjectMaterialDto; import fr.ird.observe.dto.result.SaveResultDto; -import fr.ird.observe.entities.DataNotFoundException; import fr.ird.observe.entities.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.data.ps.observation.Activity; import fr.ird.observe.entities.data.ps.observation.FloatingObject; @@ -201,13 +200,7 @@ public class FloatingObjectServiceLocal extends ObserveServiceLocal implements F @Override public void delete(String floatingObjectId) { - Activity activity = getTopiaPersistenceContext().getMultipleAssociationParent(getApplicationLocale(), Activity.class, Activity.PROPERTY_FLOATING_OBJECT, floatingObjectId); - FloatingObject floatingObject = FloatingObject.loadEntity(getApplicationLocale(), getTopiaPersistenceContext(), floatingObjectId); - if (!activity.containsFloatingObject(floatingObject)) { - throw new DataNotFoundException(getApplicationLocale(), FloatingObjectDto.class, floatingObjectId); - } - activity.removeFloatingObject(floatingObject); - saveEntity(Activity.SPI, activity); + deleteMultipleAssociation(Activity.SPI, Activity.PROPERTY_FLOATING_OBJECT, FloatingObject.SPI, floatingObjectId); } private List<ObjectMaterialHierarchyDto> getObjectMaterialHierarchyDtos(List<ObjectMaterial> objectMaterials) { ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/RouteServiceLocal.java ===================================== @@ -31,7 +31,6 @@ import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.reference.DataDtoReferenceSet; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.dto.result.TripChildSaveResultDto; -import fr.ird.observe.entities.DataNotFoundException; import fr.ird.observe.entities.data.ps.common.Trip; import fr.ird.observe.entities.data.ps.observation.Activity; import fr.ird.observe.entities.data.ps.observation.ActivityImpl; @@ -140,13 +139,7 @@ public class RouteServiceLocal extends ObserveServiceLocal implements RouteServi @Override public boolean delete(String routeId) { - Trip trip = getTopiaPersistenceContext().getMultipleAssociationParent(getApplicationLocale(), Trip.class, Trip.PROPERTY_ROUTE, routeId); - Route route = Route.loadEntity(getApplicationLocale(), getTopiaPersistenceContext(), routeId); - if (!trip.containsRoute(route)) { - throw new DataNotFoundException(getApplicationLocale(), RouteDto.class, routeId); - } - trip.removeRoute(route); - saveEntity(Trip.SPI, trip); + Trip trip = deleteMultipleAssociation(Trip.SPI, Trip.PROPERTY_ROUTE, Route.SPI, routeId); return Trip.getDao(getTopiaPersistenceContext()).updateEndDate(trip); } ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SetServiceLocal.java ===================================== @@ -103,16 +103,7 @@ public class SetServiceLocal extends ObserveServiceLocal implements SetService { @Override public void delete(String setSeineId) { - Set set = Set.loadEntity(getApplicationLocale(), getTopiaPersistenceContext(), setSeineId); - Activity activity = getTopiaPersistenceContext().getSingleAssociationParent(getApplicationLocale(), Activity.class, Activity.PROPERTY_SET, setSeineId); - if (!activity.getSet().equals(set)) { - throw new DataNotFoundException(getApplicationLocale(), SetDto.class, setSeineId); - } - activity.setSet(null); - saveEntity(Activity.SPI, activity); - //FIXME Do this in update entity method - updateLastUpdateDate(Set.class); - updateLastUpdateDate(Activity.class); + deleteSingleAssociation(setSeineId, Set.SPI, Activity.SPI, Activity.PROPERTY_SET); } } ===================================== templates/src/main/java/fr/ird/observe/toolkit/templates/entity/EntityTransformer.java ===================================== @@ -40,6 +40,7 @@ import fr.ird.observe.spi.context.ReferentialDtoEntityContext; import fr.ird.observe.spi.mapping.DtoToEntityContextMapping; import fr.ird.observe.spi.mapping.EntityToDtoClassMapping; import fr.ird.observe.toolkit.templates.TemplateContract; +import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; import io.ultreia.java4all.classmapping.ImmutableClassMapping; import io.ultreia.java4all.lang.Strings; import org.apache.commons.lang3.StringUtils; @@ -227,7 +228,7 @@ public class EntityTransformer extends TopiaEntityTransformer implements Templat if (GeneratorUtil.hasDocumentation(input)) { setDocumentation(outputInterface, input.getDocumentation()); } - + addAnnotation(outputInterface, outputInterface, GenerateJavaBeanDefinition.class); boolean oneParentContainsEntity = false; List<String> interfaceAlreadyDone = new LinkedList<>(); for (ObjectModelClassifier parent : input.getInterfaces()) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/df94f73b810b012feb74bf0e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/df94f73b810b012feb74bf0e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Gestion du versionning des marées - See #1512
by Tony CHEMIT Aug. 14, 2020

Aug. 14, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: be45eb6d by Tony Chemit at 2020-08-14T12:02:33+02:00 Gestion du versionning des marées - See #1512 * Improve TopiaApplicationContext * Introduce UpdateEntityScript object and implements it for main data entity - - - - - 6b592da8 by Tony Chemit at 2020-08-14T12:28:45+02:00 Gestion du versionning des marées - Closes #1512 * Improve save API in services (but need to be better...) - - - - - df94f73b by Tony Chemit at 2020-08-14T12:28:53+02:00 Add Fixme - - - - - 30 changed files: - common-persistence/pom.xml - persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaPersistenceContextConstructorParameter.java → common-persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaPersistenceContextConstructorParameter.java - + common-persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaPersistenceContextSupport.java - + common-persistence/src/main/java/fr/ird/observe/entities/UpdateEntityScript.java - common-persistence/src/main/java/fr/ird/observe/spi/context/DataDtoEntityContext.java - persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaPersistenceContext.java - persistence/src/main/java/fr/ird/observe/entities/data/ps/observation/RouteTopiaDao.java - persistence/src/main/models/Observe-00-common.model - + persistence/src/main/resources/fr/ird/observe/entities/data/ll/common/Trip-update.sql - + persistence/src/main/resources/fr/ird/observe/entities/data/ll/logbook/Activity-update.sql - + persistence/src/main/resources/fr/ird/observe/entities/data/ll/logbook/Set-update.sql - + persistence/src/main/resources/fr/ird/observe/entities/data/ll/observation/Activity-update.sql - + persistence/src/main/resources/fr/ird/observe/entities/data/ll/observation/Set-update.sql - + persistence/src/main/resources/fr/ird/observe/entities/data/ps/common/Trip-update.sql - + persistence/src/main/resources/fr/ird/observe/entities/data/ps/observation/Activity-update.sql - + persistence/src/main/resources/fr/ird/observe/entities/data/ps/observation/FloatingObject-update.sql - + persistence/src/main/resources/fr/ird/observe/entities/data/ps/observation/Route-update.sql - + persistence/src/main/resources/fr/ird/observe/entities/data/ps/observation/Set-update.sql - persistence/src/test/java/fr/ird/observe/entities/ObserveTopiaApplicationContextTest.java - services-local/src/main/java/fr/ird/observe/services/local/service/LastUpdateDateServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/ObserveServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/common/TripGearUseFeaturesServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/common/TripServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/landing/LandingServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/ActivitySampleServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/ActivityServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/SetCatchServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/SetGlobalCompositionServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/SetServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/TripSampleServiceLocal.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1671f0d9c24165e409f90662… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1671f0d9c24165e409f90662… 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 Aug. 10, 2020

Aug. 10, 2020

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 05deba01 by 166231 at 2020-08-10T13:11:23+00:00 Site checkin for project ObServe :: Pom - - - - - 13 changed files: - administration-web.html - architecture-logicielle.html - − css/apache-maven-fluido-1.8.min.css - + css/apache-maven-fluido-1.9.min.css - − img/logo-small.png - img/logo.png - img/logo_ird.png - index.html - install-serverPG.html - install.html - js/apache-maven-fluido-1.8.min.js → js/apache-maven-fluido-1.9.min.js - + referential-filter.html - synchro-referential.html Changes: ===================================== administration-web.html ===================================== @@ -1,7 +1,7 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> <head> @@ -9,16 +9,16 @@ <meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" /> <title>ObServe :: Pom – Installation de lapplication web</title> - <link rel="stylesheet" href="./css/apache-maven-fluido-1.8.min.css" /> + <link rel="stylesheet" href="./css/apache-maven-fluido-1.9.min.css" /> <link rel="stylesheet" href="./css/site.css" /> <link rel="stylesheet" href="./css/print.css" media="print" /> - <script src="./js/apache-maven-fluido-1.8.min.js"></script> + <script src="./js/apache-maven-fluido-1.9.min.js"></script> </head> <body class="topBarDisabled"> <div class="container-fluid"> <header> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> <div class="clear"><hr/></div> </div> @@ -28,7 +28,7 @@ <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation de lapplication web</li> <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-08-10</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.6.5</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0.0</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -46,6 +46,7 @@ <li class="active"><a href="#"><span class="none"></span>Administration Web</a></li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a></li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a></li> + <li><a href="./referential-filter.html" title="Filtrage des référentiels"><span class="none"></span>Filtrage des référentiels</a></li> <li><a href="./synchro-referential.html" title="Synchronisation référentiel avancée"><span class="none"></span>Synchronisation référentiel avancée</a></li> <li class="nav-header">Modélisation</li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a></li> @@ -71,7 +72,7 @@ <div class="clear"></div> <div class="clear"></div> <div class="clear"></div> -<a href="http://jaxx.nuiton.org" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> +<a href="https://ultreiaio.gitlab.io/jaxx" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> <a href="http://topia.nuiton.org" title="ToPIA" class="builtBy"><img class="builtBy" alt="ToPIA" src="./img/topia-logo.png" width="120" /></a> <a href="http://argouml.tigris.org/" title="ArgoUML" class="builtBy"><img class="builtBy" alt="ArgoUML" src="./img/argouml-logo.png" width="120" /></a> </div> @@ -102,8 +103,8 @@ <div class="source"><pre class="prettyprint linenums"> /var/local/observeweb/{contextPath} |-- databases.yml # configuration des bases de données |-- log - | `-- observeweb-7.6.5.log # logs de l'application - |-- observeweb-log4j2.xml # configuration des logs + | `-- observeweb-8.0.0.log # logs de l'application + |-- observeweb-log4j.conf # configuration des logs |-- temp # répertoire temporaire `-- users.yml # configuration des utilisateurs </pre></div></div> @@ -190,6 +191,13 @@ <div class="source"> <div class="source"><pre class="prettyprint linenums"> http://localhost:8080/observeweb/admin/resetAuthenticationTokens?adminApiKe… (ou la clef que vous avez configuré) +</pre></div></div> + +<p>Par défaut le proxy_ajp a un timeout de 5 minutes, il faut augmenter cette valeur sinon les appels dépassant ce temps seront rejettés.</p> +<p>Dans le fichier de configuration <code>httpd.conf</code> ajouter la ligne : (timeout de 1200 secondes = 20 minutes)</p> + +<div class="source"> +<div class="source"><pre class="prettyprint linenums">ProxyTimeout 1200 </pre></div></div> </main> </div> @@ -198,8 +206,9 @@ <footer> <div class="container-fluid"> <div class="row-fluid"> - <p>Copyright © 2008–2020<a href="http://www.ird.fr/">IRD</a>. -.</p> + <p>© 2008–2020 +<a href="http://www.ird.fr/">IRD</a> +</p> </div> </div> </footer> ===================================== architecture-logicielle.html ===================================== @@ -1,7 +1,7 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> <head> @@ -9,16 +9,16 @@ <meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" /> <title>ObServe :: Pom – Architecture logicielle dObServe</title> - <link rel="stylesheet" href="./css/apache-maven-fluido-1.8.min.css" /> + <link rel="stylesheet" href="./css/apache-maven-fluido-1.9.min.css" /> <link rel="stylesheet" href="./css/site.css" /> <link rel="stylesheet" href="./css/print.css" media="print" /> - <script src="./js/apache-maven-fluido-1.8.min.js"></script> + <script src="./js/apache-maven-fluido-1.9.min.js"></script> </head> <body class="topBarDisabled"> <div class="container-fluid"> <header> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> <div class="clear"><hr/></div> </div> @@ -28,7 +28,7 @@ <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Architecture logicielle dObServe</li> <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-08-10</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.6.5</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0.0</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -46,6 +46,7 @@ <li><a href="administration-web.html" title="Administration Web"><span class="none"></span>Administration Web</a></li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a></li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a></li> + <li><a href="./referential-filter.html" title="Filtrage des référentiels"><span class="none"></span>Filtrage des référentiels</a></li> <li><a href="./synchro-referential.html" title="Synchronisation référentiel avancée"><span class="none"></span>Synchronisation référentiel avancée</a></li> <li class="nav-header">Modélisation</li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a></li> @@ -71,7 +72,7 @@ <div class="clear"></div> <div class="clear"></div> <div class="clear"></div> -<a href="http://jaxx.nuiton.org" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> +<a href="https://ultreiaio.gitlab.io/jaxx" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> <a href="http://topia.nuiton.org" title="ToPIA" class="builtBy"><img class="builtBy" alt="ToPIA" src="./img/topia-logo.png" width="120" /></a> <a href="http://argouml.tigris.org/" title="ArgoUML" class="builtBy"><img class="builtBy" alt="ArgoUML" src="./img/argouml-logo.png" width="120" /></a> </div> @@ -147,8 +148,9 @@ <footer> <div class="container-fluid"> <div class="row-fluid"> - <p>Copyright © 2008–2020<a href="http://www.ird.fr/">IRD</a>. -.</p> + <p>© 2008–2020 +<a href="http://www.ird.fr/">IRD</a> +</p> </div> </div> </footer> ===================================== css/apache-maven-fluido-1.8.min.css deleted ===================================== The diff for this file was not included because it is too large. ===================================== css/apache-maven-fluido-1.9.min.css ===================================== The diff for this file was not included because it is too large. ===================================== img/logo-small.png deleted ===================================== Binary files a/img/logo-small.png and /dev/null differ ===================================== img/logo.png ===================================== Binary files a/img/logo.png and b/img/logo.png differ ===================================== img/logo_ird.png ===================================== Binary files a/img/logo_ird.png and b/img/logo_ird.png differ ===================================== index.html ===================================== @@ -1,7 +1,7 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> <head> @@ -9,16 +9,16 @@ <meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" /> <title>ObServe :: Pom – ObServe</title> - <link rel="stylesheet" href="./css/apache-maven-fluido-1.8.min.css" /> + <link rel="stylesheet" href="./css/apache-maven-fluido-1.9.min.css" /> <link rel="stylesheet" href="./css/site.css" /> <link rel="stylesheet" href="./css/print.css" media="print" /> - <script src="./js/apache-maven-fluido-1.8.min.js"></script> + <script src="./js/apache-maven-fluido-1.9.min.js"></script> </head> <body class="topBarDisabled"> <div class="container-fluid"> <header> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> <div class="clear"><hr/></div> </div> @@ -28,7 +28,7 @@ <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">ObServe</li> <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-08-10</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.6.5</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0.0</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -46,6 +46,7 @@ <li><a href="administration-web.html" title="Administration Web"><span class="none"></span>Administration Web</a></li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a></li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a></li> + <li><a href="./referential-filter.html" title="Filtrage des référentiels"><span class="none"></span>Filtrage des référentiels</a></li> <li><a href="./synchro-referential.html" title="Synchronisation référentiel avancée"><span class="none"></span>Synchronisation référentiel avancée</a></li> <li class="nav-header">Modélisation</li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a></li> @@ -87,7 +88,7 @@ <div class="clear"></div> <div class="clear"></div> <div class="clear"></div> -<a href="http://jaxx.nuiton.org" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> +<a href="https://ultreiaio.gitlab.io/jaxx" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> <a href="http://topia.nuiton.org" title="ToPIA" class="builtBy"><img class="builtBy" alt="ToPIA" src="./img/topia-logo.png" width="120" /></a> <a href="http://argouml.tigris.org/" title="ArgoUML" class="builtBy"><img class="builtBy" alt="ArgoUML" src="./img/argouml-logo.png" width="120" /></a> </div> @@ -112,8 +113,9 @@ <footer> <div class="container-fluid"> <div class="row-fluid"> - <p>Copyright © 2008–2020<a href="http://www.ird.fr/">IRD</a>. -.</p> + <p>© 2008–2020 +<a href="http://www.ird.fr/">IRD</a> +</p> </div> </div> </footer> ===================================== install-serverPG.html ===================================== @@ -1,7 +1,7 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> <head> @@ -9,16 +9,16 @@ <meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" /> <title>ObServe :: Pom – Installation du serveur Obstuna</title> - <link rel="stylesheet" href="./css/apache-maven-fluido-1.8.min.css" /> + <link rel="stylesheet" href="./css/apache-maven-fluido-1.9.min.css" /> <link rel="stylesheet" href="./css/site.css" /> <link rel="stylesheet" href="./css/print.css" media="print" /> - <script src="./js/apache-maven-fluido-1.8.min.js"></script> + <script src="./js/apache-maven-fluido-1.9.min.js"></script> </head> <body class="topBarDisabled"> <div class="container-fluid"> <header> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> <div class="clear"><hr/></div> </div> @@ -28,7 +28,7 @@ <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation du serveur Obstuna</li> <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-08-10</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.6.5</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0.0</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -46,6 +46,7 @@ <li><a href="administration-web.html" title="Administration Web"><span class="none"></span>Administration Web</a></li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a></li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a></li> + <li><a href="./referential-filter.html" title="Filtrage des référentiels"><span class="none"></span>Filtrage des référentiels</a></li> <li><a href="./synchro-referential.html" title="Synchronisation référentiel avancée"><span class="none"></span>Synchronisation référentiel avancée</a></li> <li class="nav-header">Modélisation</li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a></li> @@ -71,7 +72,7 @@ <div class="clear"></div> <div class="clear"></div> <div class="clear"></div> -<a href="http://jaxx.nuiton.org" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> +<a href="https://ultreiaio.gitlab.io/jaxx" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> <a href="http://topia.nuiton.org" title="ToPIA" class="builtBy"><img class="builtBy" alt="ToPIA" src="./img/topia-logo.png" width="120" /></a> <a href="http://argouml.tigris.org/" title="ArgoUML" class="builtBy"><img class="builtBy" alt="ArgoUML" src="./img/argouml-logo.png" width="120" /></a> </div> @@ -311,8 +312,9 @@ <footer> <div class="container-fluid"> <div class="row-fluid"> - <p>Copyright © 2008–2020<a href="http://www.ird.fr/">IRD</a>. -.</p> + <p>© 2008–2020 +<a href="http://www.ird.fr/">IRD</a> +</p> </div> </div> </footer> ===================================== install.html ===================================== @@ -1,7 +1,7 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> <head> @@ -9,16 +9,16 @@ <meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" /> <title>ObServe :: Pom – Installation dObServe</title> - <link rel="stylesheet" href="./css/apache-maven-fluido-1.8.min.css" /> + <link rel="stylesheet" href="./css/apache-maven-fluido-1.9.min.css" /> <link rel="stylesheet" href="./css/site.css" /> <link rel="stylesheet" href="./css/print.css" media="print" /> - <script src="./js/apache-maven-fluido-1.8.min.js"></script> + <script src="./js/apache-maven-fluido-1.9.min.js"></script> </head> <body class="topBarDisabled"> <div class="container-fluid"> <header> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> <div class="clear"><hr/></div> </div> @@ -28,7 +28,7 @@ <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation dObServe</li> <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-08-10</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.6.5</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0.0</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -46,6 +46,7 @@ <li><a href="administration-web.html" title="Administration Web"><span class="none"></span>Administration Web</a></li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a></li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a></li> + <li><a href="./referential-filter.html" title="Filtrage des référentiels"><span class="none"></span>Filtrage des référentiels</a></li> <li><a href="./synchro-referential.html" title="Synchronisation référentiel avancée"><span class="none"></span>Synchronisation référentiel avancée</a></li> <li class="nav-header">Modélisation</li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a></li> @@ -71,7 +72,7 @@ <div class="clear"></div> <div class="clear"></div> <div class="clear"></div> -<a href="http://jaxx.nuiton.org" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> +<a href="https://ultreiaio.gitlab.io/jaxx" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> <a href="http://topia.nuiton.org" title="ToPIA" class="builtBy"><img class="builtBy" alt="ToPIA" src="./img/topia-logo.png" width="120" /></a> <a href="http://argouml.tigris.org/" title="ArgoUML" class="builtBy"><img class="builtBy" alt="ArgoUML" src="./img/argouml-logo.png" width="120" /></a> </div> @@ -109,8 +110,9 @@ <footer> <div class="container-fluid"> <div class="row-fluid"> - <p>Copyright © 2008–2020<a href="http://www.ird.fr/">IRD</a>. -.</p> + <p>© 2008–2020 +<a href="http://www.ird.fr/">IRD</a> +</p> </div> </div> </footer> ===================================== js/apache-maven-fluido-1.8.min.js → js/apache-maven-fluido-1.9.min.js ===================================== ===================================== referential-filter.html ===================================== @@ -0,0 +1,281 @@ +<!DOCTYPE html> + +<html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> + <head> + <meta charset="UTF-8" /> + <meta name="viewport" content="width=device-width, initial-scale=1" /> + <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" /> + <title>ObServe :: Pom – List of specialized referential filters used in GUI</title> + <link rel="stylesheet" href="./css/apache-maven-fluido-1.9.min.css" /> + <link rel="stylesheet" href="./css/site.css" /> + <link rel="stylesheet" href="./css/print.css" media="print" /> + <script src="./js/apache-maven-fluido-1.9.min.js"></script> + </head> + <body class="topBarDisabled"> + <div class="container-fluid"> + <header> + <div id="banner"> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> + <div class="clear"><hr/></div> + </div> + + <div id="breadcrumbs"> + <ul class="breadcrumb"> + <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> + <li class="active ">List of specialized referential filters used in GUI</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-08-10</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0.0</li> + <li class="pull-right"><span class="divider">|</span> +<a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> + <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> + </ul> + </div> + </header> + <div class="row-fluid"> + <header id="leftColumn" class="span2"> + <nav class="well sidebar-nav"> + <ul class="nav nav-list"> + <li class="nav-header">Utilisateur</li> + <li><a href="index.html" title="Accueil"><span class="none"></span>Accueil</a></li> + <li><a href="install.html" title="Installation"><span class="none"></span>Installation</a></li> + <li><a href="install-serverPG.html" title="Administration Obstuna"><span class="none"></span>Administration Obstuna</a></li> + <li><a href="administration-web.html" title="Administration Web"><span class="none"></span>Administration Web</a></li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a></li> + <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a></li> + <li><a href="./referential-filter.html" title="Filtrage des référentiels"><span class="none"></span>Filtrage des référentiels</a></li> + <li><a href="./synchro-referential.html" title="Synchronisation référentiel avancée"><span class="none"></span>Synchronisation référentiel avancée</a></li> + <li class="nav-header">Modélisation</li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a></li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v7"><span class="none"></span>Fichier argoUML (Seine) v7</a></li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v7"><span class="none"></span>Fichier argoUML (Palangre) v7</a></li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v5"><span class="none"></span>Fichier argoUML (commun) v5</a></li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v5"><span class="none"></span>Fichier argoUML (Seine) v5</a></li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v5"><span class="none"></span>Fichier argoUML (Palangre) v5</a></li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…" class="externalLink" title="Modèle physique"><span class="none"></span>Modèle physique</a></li> + <li class="nav-header">Documentation sur le projet</li> + <li><a href="project-info.html" title="Info Projet"><span class="icon-chevron-right"></span>Info Projet</a></li> + <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-right"></span>Rapports Projet</a></li> + </ul> + </nav> + <div class="well sidebar-nav"> +<form id="search-form" action="https://www.google.com/search" method="get" > + <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> + <input class="search-query" name="q" id="query" type="text" /> +</form> +<script>asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> + <hr /> + <div id="poweredBy"> + <div class="clear"></div> + <div class="clear"></div> + <div class="clear"></div> +<a href="https://ultreiaio.gitlab.io/jaxx" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> +<a href="http://topia.nuiton.org" title="ToPIA" class="builtBy"><img class="builtBy" alt="ToPIA" src="./img/topia-logo.png" width="120" /></a> +<a href="http://argouml.tigris.org/" title="ArgoUML" class="builtBy"><img class="builtBy" alt="ArgoUML" src="./img/argouml-logo.png" width="120" /></a> + </div> + </div> + </header> + <main id="bodyColumn" class="span10" > +<h1>List of specialized referential filters used in GUI</h1> +<p>This document enumerates all specialized referential filters used in data source forms.</p><section> +<h2><a name="Data_PS"></a>Data PS</h2><section> +<h3><a name="Common_Trip"></a>Common Trip</h3> +<ul> + +<li>CAPTAIN:</li> +</ul> +<p><code>Person filter on captain flag</code></p> +<ul> + +<li>OBSERVER:</li> +</ul> +<p><code>Person filter on observer flag</code></p> +<ul> + +<li>DATA_ENTRY_OPERATOR:</li> +</ul> +<p><code>Person filter on dataEntryOperator flag</code></p> +<ul> + +<li>VESSEL:</li> +</ul> +<p><code>Vessel filter on vessel type within config[vesselType.seine.common.trip]</code></p></section><section> +<h3><a name="Observation_Activity"></a>Observation Activity</h3> +<p>See how to make generic accessibility to Add Set (Add new flag <code>allowSet</code>)</p></section><section> +<h3><a name="Observation_TargetCatch"></a>Observation TargetCatch</h3> +<ul> + +<li>SPECIES:</li> +</ul> +<p><code>Species filter on trip ocean and within config[speciesList.seine.observation.targetCatch]</code></p></section><section> +<h3><a name="Observation_TargetDiscardCatch"></a>Observation TargetDiscardCatch</h3> +<ul> + +<li>SPECIES:</li> +</ul> +<p><code>Species filter on trip ocean and within config[speciesList.seine.observation.targetCatch]</code></p></section><section> +<h3><a name="Observation_TargetSample"></a>Observation TargetSample</h3> +<ul> + +<li>SPECIES:</li> +</ul> +<p><code>Species filter on all species in Set targetCatches and discarded</code></p> +<ul> + +<li>SIZE_MEASURE_TYPE:</li> +</ul> +<p><code>SizeMeasureType filter on config[sizeMeasureType.seine.observation.targetSample] (LD1 or LF)</code></p></section><section> +<h3><a name="Observation_NonTargetCatchRelease"></a>Observation NonTargetCatchRelease</h3> +<ul> + +<li>SPECIES:</li> +</ul> +<p><code>Species filter on all species in NonTargetCatch where SpeciesGroup within config[speciesGroup.seine.observation.nonTargetCatchRelease]</code></p> +<p>FIXME add it</p></section><section> +<h3><a name="Observation_NonTargetCatch"></a>Observation NonTargetCatch</h3> +<ul> + +<li>SPECIES:</li> +</ul> +<p><code>Species filter on trip ocean and within config[speciesList.seine.observation.nonTargetCatch]</code></p></section><section> +<h3><a name="Observation_NonTargetSample"></a>Observation NonTargetSample</h3> +<ul> + +<li>SPECIES:</li> +</ul> +<p><code>Species filter on NonTargetCatch species</code></p> +<ul> + +<li>SPECIES_FATE:</li> +</ul> +<p><code>SpeciesFate filter on NonTargetCatch species fate</code></p></section><section> +<h3><a name="Observation_ObjectSchoolEstimate"></a>Observation ObjectSchoolEstimate</h3> +<ul> + +<li>SPECIES:</li> +</ul> +<p><code>Species filter on config[speciesList.seine.observation.objectSchoolEstimate]</code></p></section><section> +<h3><a name="Observation_SchoolEstimate"></a>Observation SchoolEstimate</h3> +<ul> + +<li>SPECIES:</li> +</ul> +<p><code>Species filter on trip ocean and within config[speciesList.seine.observation.schoolEstimate]</code></p></section><section> +<h3><a name="Observation_ObjectObservedSpecies"></a>Observation ObjectObservedSpecies</h3> +<ul> + +<li>SPECIES:</li> +</ul> +<p><code>Species filter on config[speciesList.seine.observation.objectObservedSpecies]</code></p></section></section><section> +<h2><a name="Longline"></a>Longline</h2><section> +<h3><a name="Common_Trip"></a>Common Trip</h3> +<ul> + +<li>CAPTAIN:</li> +</ul> +<p><code>Person filter on captain flag</code></p> +<ul> + +<li>OBSERVER:</li> +</ul> +<p><code>Person filter on observer flag</code></p> +<ul> + +<li>OBSERVATIONS_DATA_ENTRY_OPERATOR:</li> +</ul> +<p><code>Person filter on dataEntryOperator flag</code></p> +<ul> + +<li>LOGBOOK_DATA_ENTRY_OPERATOR:</li> +</ul> +<p><code>Person filter on dataEntryOperator flag</code></p> +<ul> + +<li>VESSEL:</li> +</ul> +<p><code>Vessel filter on vessel type within config[vesselType.longline.common.trip]</code></p> +<ul> + +<li>SPECIES:</li> +</ul> +<p><code>Species filter on trip ocean and within config[speciesList.longline.common.trip]</code></p></section><section> +<h3><a name="Observation_Activity"></a>Observation Activity</h3> +<p>See how to make generic accessibility to Add Set (Add new flag <code>allowSet</code>)</p></section><section> +<h3><a name="Observation_Catch"></a>Observation Catch</h3> +<ul> + +<li>SPECIES_CATCH:</li> +</ul> +<p><code>Species filter on trip ocean and within config[speciesList.longline.observation.catch]</code></p> +<p>FIXME rename to LlObservationCatchSpeciesId</p> +<ul> + +<li>PREDATOR:</li> +</ul> +<p><code>Species filter on trip ocean and within config[speciesList.longline.depredator]</code></p></section><section> +<h3><a name="Observation_Encounter"></a>Observation Encounter</h3> +<ul> + +<li>SPECIES:</li> +</ul> +<p><code>Species filter on config[speciesList.longline.observation.encounter]</code></p></section><section> +<h3><a name="Observation_Tdr"></a>Observation Tdr</h3> +<ul> + +<li>SPECIES:</li> +</ul> +<p><code>Species filter on trip ocean and within config[speciesList.longline.observation.catch]</code></p></section><section> +<h3><a name="Landing"></a>Landing</h3> +<ul> + +<li>PERSON:</li> +</ul> +<p><code>Person filter on dataSource flag</code></p> +<ul> + +<li>VESSEL:</li> +</ul> +<p><code>Vessel filter on vessel type within config[vesselType.longline.landing]</code></p></section><section> +<h3><a name="LandingPart"></a>LandingPart</h3> +<ul> + +<li>SPECIES:</li> +</ul> +<p><code>Species filter on trip ocean and within config[speciesList.longline.landing]</code></p></section><section> +<h3><a name="Logbook_Activity"></a>Logbook Activity</h3> +<p>See how to make generic accessibility to Add Set (Add new flag <code>allowSet</code>)</p></section><section> +<h3><a name="Logbook_Sample"></a>Logbook Sample</h3> +<ul> + +<li>SPECIES:</li> +</ul> +<p><code>Species filter on trip ocean and within config[speciesList.longline.logbook.sample]</code></p></section><section> +<h3><a name="Logbook_Catch"></a>Logbook Catch</h3> +<ul> + +<li>SPECIES_CATCH:</li> +</ul> +<p><code>Species filter on trip ocean and within config[sepeciesList.longline.logbook.catch]</code></p> +<ul> + +<li>PREDATOR:</li> +</ul> +<p><code>Species filter on trip ocean and within config[sepeciesList.longline.depredator]</code></p></section></section> + </main> + </div> + </div> + <hr/> + <footer> + <div class="container-fluid"> + <div class="row-fluid"> + <p>© 2008–2020 +<a href="http://www.ird.fr/">IRD</a> +</p> + </div> + </div> + </footer> + </body> +</html> \ No newline at end of file ===================================== synchro-referential.html ===================================== @@ -1,7 +1,7 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> <head> @@ -9,16 +9,16 @@ <meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" /> <title>ObServe :: Pom – Synchronisation avancée du référentiel</title> - <link rel="stylesheet" href="./css/apache-maven-fluido-1.8.min.css" /> + <link rel="stylesheet" href="./css/apache-maven-fluido-1.9.min.css" /> <link rel="stylesheet" href="./css/site.css" /> <link rel="stylesheet" href="./css/print.css" media="print" /> - <script src="./js/apache-maven-fluido-1.8.min.js"></script> + <script src="./js/apache-maven-fluido-1.9.min.js"></script> </head> <body class="topBarDisabled"> <div class="container-fluid"> <header> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> <div class="clear"><hr/></div> </div> @@ -28,7 +28,7 @@ <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Synchronisation avancée du référentiel</li> <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-08-10</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.6.5</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0.0</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -46,6 +46,7 @@ <li><a href="administration-web.html" title="Administration Web"><span class="none"></span>Administration Web</a></li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a></li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a></li> + <li><a href="./referential-filter.html" title="Filtrage des référentiels"><span class="none"></span>Filtrage des référentiels</a></li> <li><a href="./synchro-referential.html" title="Synchronisation référentiel avancée"><span class="none"></span>Synchronisation référentiel avancée</a></li> <li class="nav-header">Modélisation</li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a></li> @@ -71,7 +72,7 @@ <div class="clear"></div> <div class="clear"></div> <div class="clear"></div> -<a href="http://jaxx.nuiton.org" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> +<a href="https://ultreiaio.gitlab.io/jaxx" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> <a href="http://topia.nuiton.org" title="ToPIA" class="builtBy"><img class="builtBy" alt="ToPIA" src="./img/topia-logo.png" width="120" /></a> <a href="http://argouml.tigris.org/" title="ArgoUML" class="builtBy"><img class="builtBy" alt="ArgoUML" src="./img/argouml-logo.png" width="120" /></a> </div> @@ -123,8 +124,9 @@ <footer> <div class="container-fluid"> <div class="row-fluid"> - <p>Copyright © 2008–2020<a href="http://www.ird.fr/">IRD</a>. -.</p> + <p>© 2008–2020 +<a href="http://www.ird.fr/">IRD</a> +</p> </div> </div> </footer> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/05deba010fad1342bf67b7d6a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/05deba010fad1342bf67b7d6a… 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 Aug. 10, 2020

Aug. 10, 2020

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 078fb2e9 by 166231 at 2020-08-10T12:35:46+00:00 Site checkin for project ObServe :: Pom - - - - - 13 changed files: - administration-web.html - architecture-logicielle.html - + css/apache-maven-fluido-1.8.min.css - − css/apache-maven-fluido-1.9.min.css - + img/logo-small.png - img/logo.png - img/logo_ird.png - index.html - install-serverPG.html - install.html - js/apache-maven-fluido-1.9.min.js → js/apache-maven-fluido-1.8.min.js - − referential-filter.html - synchro-referential.html Changes: ===================================== administration-web.html ===================================== @@ -1,7 +1,7 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> <head> @@ -9,16 +9,16 @@ <meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" /> <title>ObServe :: Pom – Installation de lapplication web</title> - <link rel="stylesheet" href="./css/apache-maven-fluido-1.9.min.css" /> + <link rel="stylesheet" href="./css/apache-maven-fluido-1.8.min.css" /> <link rel="stylesheet" href="./css/site.css" /> <link rel="stylesheet" href="./css/print.css" media="print" /> - <script src="./js/apache-maven-fluido-1.9.min.js"></script> + <script src="./js/apache-maven-fluido-1.8.min.js"></script> </head> <body class="topBarDisabled"> <div class="container-fluid"> <header> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> <div class="clear"><hr/></div> </div> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation de lapplication web</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-07-10</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0.0-RC-8</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-08-10</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.6.5</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -46,7 +46,6 @@ <li class="active"><a href="#"><span class="none"></span>Administration Web</a></li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a></li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a></li> - <li><a href="./referential-filter.html" title="Filtrage des référentiels"><span class="none"></span>Filtrage des référentiels</a></li> <li><a href="./synchro-referential.html" title="Synchronisation référentiel avancée"><span class="none"></span>Synchronisation référentiel avancée</a></li> <li class="nav-header">Modélisation</li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a></li> @@ -72,7 +71,7 @@ <div class="clear"></div> <div class="clear"></div> <div class="clear"></div> -<a href="https://ultreiaio.gitlab.io/jaxx" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> +<a href="http://jaxx.nuiton.org" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> <a href="http://topia.nuiton.org" title="ToPIA" class="builtBy"><img class="builtBy" alt="ToPIA" src="./img/topia-logo.png" width="120" /></a> <a href="http://argouml.tigris.org/" title="ArgoUML" class="builtBy"><img class="builtBy" alt="ArgoUML" src="./img/argouml-logo.png" width="120" /></a> </div> @@ -103,8 +102,8 @@ <div class="source"><pre class="prettyprint linenums"> /var/local/observeweb/{contextPath} |-- databases.yml # configuration des bases de données |-- log - | `-- observeweb-8.0.0-RC-8.log # logs de l'application - |-- observeweb-log4j.conf # configuration des logs + | `-- observeweb-7.6.5.log # logs de l'application + |-- observeweb-log4j2.xml # configuration des logs |-- temp # répertoire temporaire `-- users.yml # configuration des utilisateurs </pre></div></div> @@ -191,13 +190,6 @@ <div class="source"> <div class="source"><pre class="prettyprint linenums"> http://localhost:8080/observeweb/admin/resetAuthenticationTokens?adminApiKe… (ou la clef que vous avez configuré) -</pre></div></div> - -<p>Par défaut le proxy_ajp a un timeout de 5 minutes, il faut augmenter cette valeur sinon les appels dépassant ce temps seront rejettés.</p> -<p>Dans le fichier de configuration <code>httpd.conf</code> ajouter la ligne : (timeout de 1200 secondes = 20 minutes)</p> - -<div class="source"> -<div class="source"><pre class="prettyprint linenums">ProxyTimeout 1200 </pre></div></div> </main> </div> @@ -206,9 +198,8 @@ <footer> <div class="container-fluid"> <div class="row-fluid"> - <p>© 2008–2020 -<a href="http://www.ird.fr/">IRD</a> -</p> + <p>Copyright © 2008–2020<a href="http://www.ird.fr/">IRD</a>. +.</p> </div> </div> </footer> ===================================== architecture-logicielle.html ===================================== @@ -1,7 +1,7 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> <head> @@ -9,16 +9,16 @@ <meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" /> <title>ObServe :: Pom – Architecture logicielle dObServe</title> - <link rel="stylesheet" href="./css/apache-maven-fluido-1.9.min.css" /> + <link rel="stylesheet" href="./css/apache-maven-fluido-1.8.min.css" /> <link rel="stylesheet" href="./css/site.css" /> <link rel="stylesheet" href="./css/print.css" media="print" /> - <script src="./js/apache-maven-fluido-1.9.min.js"></script> + <script src="./js/apache-maven-fluido-1.8.min.js"></script> </head> <body class="topBarDisabled"> <div class="container-fluid"> <header> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> <div class="clear"><hr/></div> </div> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Architecture logicielle dObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-07-10</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0.0-RC-8</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-08-10</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.6.5</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -46,7 +46,6 @@ <li><a href="administration-web.html" title="Administration Web"><span class="none"></span>Administration Web</a></li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a></li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a></li> - <li><a href="./referential-filter.html" title="Filtrage des référentiels"><span class="none"></span>Filtrage des référentiels</a></li> <li><a href="./synchro-referential.html" title="Synchronisation référentiel avancée"><span class="none"></span>Synchronisation référentiel avancée</a></li> <li class="nav-header">Modélisation</li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a></li> @@ -72,7 +71,7 @@ <div class="clear"></div> <div class="clear"></div> <div class="clear"></div> -<a href="https://ultreiaio.gitlab.io/jaxx" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> +<a href="http://jaxx.nuiton.org" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> <a href="http://topia.nuiton.org" title="ToPIA" class="builtBy"><img class="builtBy" alt="ToPIA" src="./img/topia-logo.png" width="120" /></a> <a href="http://argouml.tigris.org/" title="ArgoUML" class="builtBy"><img class="builtBy" alt="ArgoUML" src="./img/argouml-logo.png" width="120" /></a> </div> @@ -148,9 +147,8 @@ <footer> <div class="container-fluid"> <div class="row-fluid"> - <p>© 2008–2020 -<a href="http://www.ird.fr/">IRD</a> -</p> + <p>Copyright © 2008–2020<a href="http://www.ird.fr/">IRD</a>. +.</p> </div> </div> </footer> ===================================== css/apache-maven-fluido-1.8.min.css ===================================== The diff for this file was not included because it is too large. ===================================== css/apache-maven-fluido-1.9.min.css deleted ===================================== The diff for this file was not included because it is too large. ===================================== img/logo-small.png ===================================== Binary files /dev/null and b/img/logo-small.png differ ===================================== img/logo.png ===================================== Binary files a/img/logo.png and b/img/logo.png differ ===================================== img/logo_ird.png ===================================== Binary files a/img/logo_ird.png and b/img/logo_ird.png differ ===================================== index.html ===================================== @@ -1,7 +1,7 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> <head> @@ -9,16 +9,16 @@ <meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" /> <title>ObServe :: Pom – ObServe</title> - <link rel="stylesheet" href="./css/apache-maven-fluido-1.9.min.css" /> + <link rel="stylesheet" href="./css/apache-maven-fluido-1.8.min.css" /> <link rel="stylesheet" href="./css/site.css" /> <link rel="stylesheet" href="./css/print.css" media="print" /> - <script src="./js/apache-maven-fluido-1.9.min.js"></script> + <script src="./js/apache-maven-fluido-1.8.min.js"></script> </head> <body class="topBarDisabled"> <div class="container-fluid"> <header> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> <div class="clear"><hr/></div> </div> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">ObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-07-10</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0.0-RC-8</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-08-10</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.6.5</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -46,7 +46,6 @@ <li><a href="administration-web.html" title="Administration Web"><span class="none"></span>Administration Web</a></li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a></li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a></li> - <li><a href="./referential-filter.html" title="Filtrage des référentiels"><span class="none"></span>Filtrage des référentiels</a></li> <li><a href="./synchro-referential.html" title="Synchronisation référentiel avancée"><span class="none"></span>Synchronisation référentiel avancée</a></li> <li class="nav-header">Modélisation</li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a></li> @@ -88,7 +87,7 @@ <div class="clear"></div> <div class="clear"></div> <div class="clear"></div> -<a href="https://ultreiaio.gitlab.io/jaxx" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> +<a href="http://jaxx.nuiton.org" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> <a href="http://topia.nuiton.org" title="ToPIA" class="builtBy"><img class="builtBy" alt="ToPIA" src="./img/topia-logo.png" width="120" /></a> <a href="http://argouml.tigris.org/" title="ArgoUML" class="builtBy"><img class="builtBy" alt="ArgoUML" src="./img/argouml-logo.png" width="120" /></a> </div> @@ -113,9 +112,8 @@ <footer> <div class="container-fluid"> <div class="row-fluid"> - <p>© 2008–2020 -<a href="http://www.ird.fr/">IRD</a> -</p> + <p>Copyright © 2008–2020<a href="http://www.ird.fr/">IRD</a>. +.</p> </div> </div> </footer> ===================================== install-serverPG.html ===================================== @@ -1,7 +1,7 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> <head> @@ -9,16 +9,16 @@ <meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" /> <title>ObServe :: Pom – Installation du serveur Obstuna</title> - <link rel="stylesheet" href="./css/apache-maven-fluido-1.9.min.css" /> + <link rel="stylesheet" href="./css/apache-maven-fluido-1.8.min.css" /> <link rel="stylesheet" href="./css/site.css" /> <link rel="stylesheet" href="./css/print.css" media="print" /> - <script src="./js/apache-maven-fluido-1.9.min.js"></script> + <script src="./js/apache-maven-fluido-1.8.min.js"></script> </head> <body class="topBarDisabled"> <div class="container-fluid"> <header> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> <div class="clear"><hr/></div> </div> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation du serveur Obstuna</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-07-10</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0.0-RC-8</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-08-10</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.6.5</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -46,7 +46,6 @@ <li><a href="administration-web.html" title="Administration Web"><span class="none"></span>Administration Web</a></li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a></li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a></li> - <li><a href="./referential-filter.html" title="Filtrage des référentiels"><span class="none"></span>Filtrage des référentiels</a></li> <li><a href="./synchro-referential.html" title="Synchronisation référentiel avancée"><span class="none"></span>Synchronisation référentiel avancée</a></li> <li class="nav-header">Modélisation</li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a></li> @@ -72,7 +71,7 @@ <div class="clear"></div> <div class="clear"></div> <div class="clear"></div> -<a href="https://ultreiaio.gitlab.io/jaxx" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> +<a href="http://jaxx.nuiton.org" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> <a href="http://topia.nuiton.org" title="ToPIA" class="builtBy"><img class="builtBy" alt="ToPIA" src="./img/topia-logo.png" width="120" /></a> <a href="http://argouml.tigris.org/" title="ArgoUML" class="builtBy"><img class="builtBy" alt="ArgoUML" src="./img/argouml-logo.png" width="120" /></a> </div> @@ -312,9 +311,8 @@ <footer> <div class="container-fluid"> <div class="row-fluid"> - <p>© 2008–2020 -<a href="http://www.ird.fr/">IRD</a> -</p> + <p>Copyright © 2008–2020<a href="http://www.ird.fr/">IRD</a>. +.</p> </div> </div> </footer> ===================================== install.html ===================================== @@ -1,7 +1,7 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> <head> @@ -9,16 +9,16 @@ <meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" /> <title>ObServe :: Pom – Installation dObServe</title> - <link rel="stylesheet" href="./css/apache-maven-fluido-1.9.min.css" /> + <link rel="stylesheet" href="./css/apache-maven-fluido-1.8.min.css" /> <link rel="stylesheet" href="./css/site.css" /> <link rel="stylesheet" href="./css/print.css" media="print" /> - <script src="./js/apache-maven-fluido-1.9.min.js"></script> + <script src="./js/apache-maven-fluido-1.8.min.js"></script> </head> <body class="topBarDisabled"> <div class="container-fluid"> <header> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> <div class="clear"><hr/></div> </div> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation dObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-07-10</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0.0-RC-8</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-08-10</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.6.5</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -46,7 +46,6 @@ <li><a href="administration-web.html" title="Administration Web"><span class="none"></span>Administration Web</a></li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a></li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a></li> - <li><a href="./referential-filter.html" title="Filtrage des référentiels"><span class="none"></span>Filtrage des référentiels</a></li> <li><a href="./synchro-referential.html" title="Synchronisation référentiel avancée"><span class="none"></span>Synchronisation référentiel avancée</a></li> <li class="nav-header">Modélisation</li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a></li> @@ -72,7 +71,7 @@ <div class="clear"></div> <div class="clear"></div> <div class="clear"></div> -<a href="https://ultreiaio.gitlab.io/jaxx" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> +<a href="http://jaxx.nuiton.org" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> <a href="http://topia.nuiton.org" title="ToPIA" class="builtBy"><img class="builtBy" alt="ToPIA" src="./img/topia-logo.png" width="120" /></a> <a href="http://argouml.tigris.org/" title="ArgoUML" class="builtBy"><img class="builtBy" alt="ArgoUML" src="./img/argouml-logo.png" width="120" /></a> </div> @@ -110,9 +109,8 @@ <footer> <div class="container-fluid"> <div class="row-fluid"> - <p>© 2008–2020 -<a href="http://www.ird.fr/">IRD</a> -</p> + <p>Copyright © 2008–2020<a href="http://www.ird.fr/">IRD</a>. +.</p> </div> </div> </footer> ===================================== js/apache-maven-fluido-1.9.min.js → js/apache-maven-fluido-1.8.min.js ===================================== ===================================== referential-filter.html deleted ===================================== @@ -1,281 +0,0 @@ -<!DOCTYPE html> - -<html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> - <head> - <meta charset="UTF-8" /> - <meta name="viewport" content="width=device-width, initial-scale=1" /> - <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" /> - <title>ObServe :: Pom – List of specialized referential filters used in GUI</title> - <link rel="stylesheet" href="./css/apache-maven-fluido-1.9.min.css" /> - <link rel="stylesheet" href="./css/site.css" /> - <link rel="stylesheet" href="./css/print.css" media="print" /> - <script src="./js/apache-maven-fluido-1.9.min.js"></script> - </head> - <body class="topBarDisabled"> - <div class="container-fluid"> - <header> - <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> - <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> - <div class="clear"><hr/></div> - </div> - - <div id="breadcrumbs"> - <ul class="breadcrumb"> - <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> - <li class="active ">List of specialized referential filters used in GUI</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-07-10</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0.0-RC-8</li> - <li class="pull-right"><span class="divider">|</span> -<a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> - <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> - </ul> - </div> - </header> - <div class="row-fluid"> - <header id="leftColumn" class="span2"> - <nav class="well sidebar-nav"> - <ul class="nav nav-list"> - <li class="nav-header">Utilisateur</li> - <li><a href="index.html" title="Accueil"><span class="none"></span>Accueil</a></li> - <li><a href="install.html" title="Installation"><span class="none"></span>Installation</a></li> - <li><a href="install-serverPG.html" title="Administration Obstuna"><span class="none"></span>Administration Obstuna</a></li> - <li><a href="administration-web.html" title="Administration Web"><span class="none"></span>Administration Web</a></li> - <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a></li> - <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a></li> - <li><a href="./referential-filter.html" title="Filtrage des référentiels"><span class="none"></span>Filtrage des référentiels</a></li> - <li><a href="./synchro-referential.html" title="Synchronisation référentiel avancée"><span class="none"></span>Synchronisation référentiel avancée</a></li> - <li class="nav-header">Modélisation</li> - <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a></li> - <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v7"><span class="none"></span>Fichier argoUML (Seine) v7</a></li> - <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v7"><span class="none"></span>Fichier argoUML (Palangre) v7</a></li> - <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v5"><span class="none"></span>Fichier argoUML (commun) v5</a></li> - <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v5"><span class="none"></span>Fichier argoUML (Seine) v5</a></li> - <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v5"><span class="none"></span>Fichier argoUML (Palangre) v5</a></li> - <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…" class="externalLink" title="Modèle physique"><span class="none"></span>Modèle physique</a></li> - <li class="nav-header">Documentation sur le projet</li> - <li><a href="project-info.html" title="Info Projet"><span class="icon-chevron-right"></span>Info Projet</a></li> - <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-right"></span>Rapports Projet</a></li> - </ul> - </nav> - <div class="well sidebar-nav"> -<form id="search-form" action="https://www.google.com/search" method="get" > - <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> - <input class="search-query" name="q" id="query" type="text" /> -</form> -<script>asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> - <hr /> - <div id="poweredBy"> - <div class="clear"></div> - <div class="clear"></div> - <div class="clear"></div> -<a href="https://ultreiaio.gitlab.io/jaxx" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> -<a href="http://topia.nuiton.org" title="ToPIA" class="builtBy"><img class="builtBy" alt="ToPIA" src="./img/topia-logo.png" width="120" /></a> -<a href="http://argouml.tigris.org/" title="ArgoUML" class="builtBy"><img class="builtBy" alt="ArgoUML" src="./img/argouml-logo.png" width="120" /></a> - </div> - </div> - </header> - <main id="bodyColumn" class="span10" > -<h1>List of specialized referential filters used in GUI</h1> -<p>This document enumerates all specialized referential filters used in data source forms.</p><section> -<h2><a name="Data_PS"></a>Data PS</h2><section> -<h3><a name="Common_Trip"></a>Common Trip</h3> -<ul> - -<li>CAPTAIN:</li> -</ul> -<p><code>Person filter on captain flag</code></p> -<ul> - -<li>OBSERVER:</li> -</ul> -<p><code>Person filter on observer flag</code></p> -<ul> - -<li>DATA_ENTRY_OPERATOR:</li> -</ul> -<p><code>Person filter on dataEntryOperator flag</code></p> -<ul> - -<li>VESSEL:</li> -</ul> -<p><code>Vessel filter on vessel type within config[vesselType.seine.common.trip]</code></p></section><section> -<h3><a name="Observation_Activity"></a>Observation Activity</h3> -<p>See how to make generic accessibility to Add Set (Add new flag <code>allowSet</code>)</p></section><section> -<h3><a name="Observation_TargetCatch"></a>Observation TargetCatch</h3> -<ul> - -<li>SPECIES:</li> -</ul> -<p><code>Species filter on trip ocean and within config[speciesList.seine.observation.targetCatch]</code></p></section><section> -<h3><a name="Observation_TargetDiscardCatch"></a>Observation TargetDiscardCatch</h3> -<ul> - -<li>SPECIES:</li> -</ul> -<p><code>Species filter on trip ocean and within config[speciesList.seine.observation.targetCatch]</code></p></section><section> -<h3><a name="Observation_TargetSample"></a>Observation TargetSample</h3> -<ul> - -<li>SPECIES:</li> -</ul> -<p><code>Species filter on all species in Set targetCatches and discarded</code></p> -<ul> - -<li>SIZE_MEASURE_TYPE:</li> -</ul> -<p><code>SizeMeasureType filter on config[sizeMeasureType.seine.observation.targetSample] (LD1 or LF)</code></p></section><section> -<h3><a name="Observation_NonTargetCatchRelease"></a>Observation NonTargetCatchRelease</h3> -<ul> - -<li>SPECIES:</li> -</ul> -<p><code>Species filter on all species in NonTargetCatch where SpeciesGroup within config[speciesGroup.seine.observation.nonTargetCatchRelease]</code></p> -<p>FIXME add it</p></section><section> -<h3><a name="Observation_NonTargetCatch"></a>Observation NonTargetCatch</h3> -<ul> - -<li>SPECIES:</li> -</ul> -<p><code>Species filter on trip ocean and within config[speciesList.seine.observation.nonTargetCatch]</code></p></section><section> -<h3><a name="Observation_NonTargetSample"></a>Observation NonTargetSample</h3> -<ul> - -<li>SPECIES:</li> -</ul> -<p><code>Species filter on NonTargetCatch species</code></p> -<ul> - -<li>SPECIES_FATE:</li> -</ul> -<p><code>SpeciesFate filter on NonTargetCatch species fate</code></p></section><section> -<h3><a name="Observation_ObjectSchoolEstimate"></a>Observation ObjectSchoolEstimate</h3> -<ul> - -<li>SPECIES:</li> -</ul> -<p><code>Species filter on config[speciesList.seine.observation.objectSchoolEstimate]</code></p></section><section> -<h3><a name="Observation_SchoolEstimate"></a>Observation SchoolEstimate</h3> -<ul> - -<li>SPECIES:</li> -</ul> -<p><code>Species filter on trip ocean and within config[speciesList.seine.observation.schoolEstimate]</code></p></section><section> -<h3><a name="Observation_ObjectObservedSpecies"></a>Observation ObjectObservedSpecies</h3> -<ul> - -<li>SPECIES:</li> -</ul> -<p><code>Species filter on config[speciesList.seine.observation.objectObservedSpecies]</code></p></section></section><section> -<h2><a name="Longline"></a>Longline</h2><section> -<h3><a name="Common_Trip"></a>Common Trip</h3> -<ul> - -<li>CAPTAIN:</li> -</ul> -<p><code>Person filter on captain flag</code></p> -<ul> - -<li>OBSERVER:</li> -</ul> -<p><code>Person filter on observer flag</code></p> -<ul> - -<li>OBSERVATIONS_DATA_ENTRY_OPERATOR:</li> -</ul> -<p><code>Person filter on dataEntryOperator flag</code></p> -<ul> - -<li>LOGBOOK_DATA_ENTRY_OPERATOR:</li> -</ul> -<p><code>Person filter on dataEntryOperator flag</code></p> -<ul> - -<li>VESSEL:</li> -</ul> -<p><code>Vessel filter on vessel type within config[vesselType.longline.common.trip]</code></p> -<ul> - -<li>SPECIES:</li> -</ul> -<p><code>Species filter on trip ocean and within config[speciesList.longline.common.trip]</code></p></section><section> -<h3><a name="Observation_Activity"></a>Observation Activity</h3> -<p>See how to make generic accessibility to Add Set (Add new flag <code>allowSet</code>)</p></section><section> -<h3><a name="Observation_Catch"></a>Observation Catch</h3> -<ul> - -<li>SPECIES_CATCH:</li> -</ul> -<p><code>Species filter on trip ocean and within config[speciesList.longline.observation.catch]</code></p> -<p>FIXME rename to LlObservationCatchSpeciesId</p> -<ul> - -<li>PREDATOR:</li> -</ul> -<p><code>Species filter on trip ocean and within config[speciesList.longline.depredator]</code></p></section><section> -<h3><a name="Observation_Encounter"></a>Observation Encounter</h3> -<ul> - -<li>SPECIES:</li> -</ul> -<p><code>Species filter on config[speciesList.longline.observation.encounter]</code></p></section><section> -<h3><a name="Observation_Tdr"></a>Observation Tdr</h3> -<ul> - -<li>SPECIES:</li> -</ul> -<p><code>Species filter on trip ocean and within config[speciesList.longline.observation.catch]</code></p></section><section> -<h3><a name="Landing"></a>Landing</h3> -<ul> - -<li>PERSON:</li> -</ul> -<p><code>Person filter on dataSource flag</code></p> -<ul> - -<li>VESSEL:</li> -</ul> -<p><code>Vessel filter on vessel type within config[vesselType.longline.landing]</code></p></section><section> -<h3><a name="LandingPart"></a>LandingPart</h3> -<ul> - -<li>SPECIES:</li> -</ul> -<p><code>Species filter on trip ocean and within config[speciesList.longline.landing]</code></p></section><section> -<h3><a name="Logbook_Activity"></a>Logbook Activity</h3> -<p>See how to make generic accessibility to Add Set (Add new flag <code>allowSet</code>)</p></section><section> -<h3><a name="Logbook_Sample"></a>Logbook Sample</h3> -<ul> - -<li>SPECIES:</li> -</ul> -<p><code>Species filter on trip ocean and within config[speciesList.longline.logbook.sample]</code></p></section><section> -<h3><a name="Logbook_Catch"></a>Logbook Catch</h3> -<ul> - -<li>SPECIES_CATCH:</li> -</ul> -<p><code>Species filter on trip ocean and within config[sepeciesList.longline.logbook.catch]</code></p> -<ul> - -<li>PREDATOR:</li> -</ul> -<p><code>Species filter on trip ocean and within config[sepeciesList.longline.depredator]</code></p></section></section> - </main> - </div> - </div> - <hr/> - <footer> - <div class="container-fluid"> - <div class="row-fluid"> - <p>© 2008–2020 -<a href="http://www.ird.fr/">IRD</a> -</p> - </div> - </div> - </footer> - </body> -</html> \ No newline at end of file ===================================== synchro-referential.html ===================================== @@ -1,7 +1,7 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> <head> @@ -9,16 +9,16 @@ <meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" /> <title>ObServe :: Pom – Synchronisation avancée du référentiel</title> - <link rel="stylesheet" href="./css/apache-maven-fluido-1.9.min.css" /> + <link rel="stylesheet" href="./css/apache-maven-fluido-1.8.min.css" /> <link rel="stylesheet" href="./css/site.css" /> <link rel="stylesheet" href="./css/print.css" media="print" /> - <script src="./js/apache-maven-fluido-1.9.min.js"></script> + <script src="./js/apache-maven-fluido-1.8.min.js"></script> </head> <body class="topBarDisabled"> <div class="container-fluid"> <header> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> <div class="clear"><hr/></div> </div> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Synchronisation avancée du référentiel</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-07-10</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0.0-RC-8</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-08-10</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.6.5</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -46,7 +46,6 @@ <li><a href="administration-web.html" title="Administration Web"><span class="none"></span>Administration Web</a></li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a></li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a></li> - <li><a href="./referential-filter.html" title="Filtrage des référentiels"><span class="none"></span>Filtrage des référentiels</a></li> <li><a href="./synchro-referential.html" title="Synchronisation référentiel avancée"><span class="none"></span>Synchronisation référentiel avancée</a></li> <li class="nav-header">Modélisation</li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a></li> @@ -72,7 +71,7 @@ <div class="clear"></div> <div class="clear"></div> <div class="clear"></div> -<a href="https://ultreiaio.gitlab.io/jaxx" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> +<a href="http://jaxx.nuiton.org" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> <a href="http://topia.nuiton.org" title="ToPIA" class="builtBy"><img class="builtBy" alt="ToPIA" src="./img/topia-logo.png" width="120" /></a> <a href="http://argouml.tigris.org/" title="ArgoUML" class="builtBy"><img class="builtBy" alt="ArgoUML" src="./img/argouml-logo.png" width="120" /></a> </div> @@ -124,9 +123,8 @@ <footer> <div class="container-fluid"> <div class="row-fluid"> - <p>© 2008–2020 -<a href="http://www.ird.fr/">IRD</a> -</p> + <p>Copyright © 2008–2020<a href="http://www.ird.fr/">IRD</a>. +.</p> </div> </div> </footer> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/078fb2e96d9a42188780bad29… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/078fb2e96d9a42188780bad29… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/8.0.0
by Tony CHEMIT Aug. 10, 2020

Aug. 10, 2020

Tony CHEMIT deleted branch release/8.0.0 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v8.0.0
by Tony CHEMIT Aug. 10, 2020

Aug. 10, 2020

Tony CHEMIT pushed new tag v8.0.0 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/v8.0.0 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][release/8.0.0] [jgitflow-maven-plugin]updating poms for branch'release/8.0.0' with non-snapshot versions[skip ci]
by Tony CHEMIT Aug. 10, 2020

Aug. 10, 2020

Tony CHEMIT pushed to branch release/8.0.0 at ultreiaio / ird-observe Commits: df940cba by Tony Chemit at 2020-08-10T14:12:20+02:00 [jgitflow-maven-plugin]updating poms for branch'release/8.0.0' with non-snapshot versions[skip ci] - - - - - 30 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-datasource-actions/pom.xml - client-datasource-editor-api/pom.xml - client-datasource-editor-common/pom.xml - client-datasource-editor-ll/pom.xml - client-datasource-editor-ps/pom.xml - client-runner/pom.xml - common-dto/pom.xml - common-persistence/pom.xml - common-service/pom.xml - common-validation/pom.xml - dto-spi/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence-spi/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services-validation/pom.xml - services/pom.xml - templates/pom.xml - test-config/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/df940cba2975456021ddd0934… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/df940cba2975456021ddd0934… You're receiving this email because of your account on gitlab.com.

1 0