Fix PR - Multiple fix: (6a820b22) · Commits · dad / Cines Vitamui

Commit 6a820b22 authored 4 years ago by

ludovic Blanchet

Fix PR - Multiple fix:

* Remove local certs for vitam-ui <-> vitam (+ update referential git ignore)
* Fix multiple merge error
* Update Logbook DTO
* use /atr common /manifest

parent 462bf2ec

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
api/api-iam/iam-internal/src/main/config/dev-vitam/backup/access-external-client.conf 0 additions, 11 deletions

.../main/config/dev-vitam/backup/access-external-client.conf
api/api-iam/iam-internal/src/main/config/dev-vitam/backup/ingest-external-client.conf 0 additions, 11 deletions

.../main/config/dev-vitam/backup/ingest-external-client.conf
api/api-iam/iam-internal/src/main/config/dev-vitam/backup/keystore_ihm-demo.p12 0 additions, 917 deletions

...al/src/main/config/dev-vitam/backup/keystore_ihm-demo.p12
api/api-iam/iam-internal/src/main/config/dev-vitam/backup/truststore_ihm-demo.jks 0 additions, 917 deletions

.../src/main/config/dev-vitam/backup/truststore_ihm-demo.jks
api/api-ingest/ingest-commons/src/main/java/fr/gouv/vitamui/ingest/common/dto/LogbookEventDto.java 0 additions, 49 deletions

...va/fr/gouv/vitamui/ingest/common/dto/LogbookEventDto.java
api/api-ingest/ingest-commons/src/main/java/fr/gouv/vitamui/ingest/common/dto/LogbookEventModel.java 0 additions, 101 deletions

.../fr/gouv/vitamui/ingest/common/dto/LogbookEventModel.java
api/api-ingest/ingest-commons/src/main/java/fr/gouv/vitamui/ingest/common/dto/LogbookOperationDto.java 0 additions, 54 deletions

...r/gouv/vitamui/ingest/common/dto/LogbookOperationDto.java
api/api-ingest/ingest-commons/src/main/java/fr/gouv/vitamui/ingest/common/dto/LogbookOperationModel.java 0 additions, 57 deletions

...gouv/vitamui/ingest/common/dto/LogbookOperationModel.java
api/api-ingest/ingest-commons/src/main/java/fr/gouv/vitamui/ingest/common/dto/LogbookOperationsResponseDto.java 0 additions, 7 deletions

...tamui/ingest/common/dto/LogbookOperationsResponseDto.java
api/api-ingest/ingest-external-client/src/main/java/fr/gouv/vitamui/ingest/external/client/IngestExternalRestClient.java 1 addition, 13 deletions

...amui/ingest/external/client/IngestExternalRestClient.java
api/api-ingest/ingest-external/pom.xml 0 additions, 12 deletions

api/api-ingest/ingest-external/pom.xml
api/api-ingest/ingest-external/src/main/java/fr/gouv/vitamui/ingest/external/server/rest/IngestExternalController.java 1 addition, 13 deletions

...ingest/external/server/rest/IngestExternalController.java
api/api-ingest/ingest-external/src/main/java/fr/gouv/vitamui/ingest/external/server/service/IngestExternalService.java 1 addition, 9 deletions

...ingest/external/server/service/IngestExternalService.java
api/api-ingest/ingest-internal-client/src/main/java/fr/gouv/vitamui/ingest/internal/client/IngestInternalRestClient.java 1 addition, 12 deletions

...amui/ingest/internal/client/IngestInternalRestClient.java
api/api-ingest/ingest-internal/pom.xml 0 additions, 16 deletions

api/api-ingest/ingest-internal/pom.xml
api/api-ingest/ingest-internal/src/main/config/dev-vitam/access-external-client.conf 0 additions, 11 deletions

...nal/src/main/config/dev-vitam/access-external-client.conf
api/api-ingest/ingest-internal/src/main/config/dev-vitam/ingest-external-client.conf 0 additions, 11 deletions

...nal/src/main/config/dev-vitam/ingest-external-client.conf
api/api-ingest/ingest-internal/src/main/config/dev-vitam/keystore_ihm-demo.p12 0 additions, 0 deletions

...-internal/src/main/config/dev-vitam/keystore_ihm-demo.p12
api/api-ingest/ingest-internal/src/main/config/dev-vitam/truststore_ihm-demo.jks 0 additions, 0 deletions

...nternal/src/main/config/dev-vitam/truststore_ihm-demo.jks

with 5 additions and 2221 deletions

Please register or to comment