[webanno/webanno] 320c1b: #914 - Modularize project import/export

2 views
Skip to first unread message

GitHub

unread,
May 15, 2018, 5:40:18 AM5/15/18
to webanno...@googlegroups.com
Branch: refs/heads/feature/914-modular-export
Home: https://github.com/webanno/webanno
Commit: 320c1b22c4deba8c824b8ebbba97f68dc65f7b85
https://github.com/webanno/webanno/commit/320c1b22c4deba8c824b8ebbba97f68dc65f7b85
Author: Richard Eckart de Castilho <richard...@gmail.com>
Date: 2018-04-15 (Sun, 15 Apr 2018)

Changed paths:
M webanno-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/ProjectService.java
M webanno-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/ProjectImportEvent.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ExportServiceImpl.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ExportUtil.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ImportServiceImpl.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ImportUtil.java
A webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/ProjectSettingsExporter.java
R webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/AnnotationDocument.java
R webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/AnnotationFeature.java
R webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/AnnotationLayer.java
A webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ExportedAnnotationDocument.java
A webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ExportedAnnotationFeature.java
A webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ExportedAnnotationLayer.java
A webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ExportedMiraTemplate.java
A webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ExportedProject.java
A webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ExportedProjectPermission.java
A webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ExportedSourceDocument.java
M webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ExportedTag.java
A webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ExportedTrainingDocument.java
R webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/MiraTemplate.java
R webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/Project.java
R webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ProjectPermission.java
R webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/SourceDocument.java
R webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/TrainingDocument.java
M webanno-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/ProjectServiceImpl.java
M webanno-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/component/DocumentNamePanel.java
M webanno-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/ProjectLayersPanel.java

Log Message:
-----------
#914 - Modularize project import/export

- Rename export DTO classes to not clash with entity classes.


Commit: 2c1c45f5f297117e07077399198ed9bf68ab08da
https://github.com/webanno/webanno/commit/2c1c45f5f297117e07077399198ed9bf68ab08da
Author: Richard Eckart de Castilho <richard...@gmail.com>
Date: 2018-04-15 (Sun, 15 Apr 2018)

Changed paths:
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ExportUtil.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ImportServiceImpl.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ImportUtil.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/LegacyProjectInitializer.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/ProjectSettingsExporter.java
A webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ExportedAnnotationFeatureReference.java
M webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ExportedAnnotationLayer.java
A webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ExportedAnnotationLayerReference.java
M webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ExportedMiraTemplate.java
M webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ExportedTrainingDocument.java
M webanno-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/ProjectLayersPanel.java

Log Message:
-----------
#914 - Modularize project import/export

- INCOMPATIBLE CHANGE: JSON format for per-layer exports has changed; does not affect full-project export
- Export only references for features/layers instead of embedding their full specification wherever they are used
- Marked existing import/export methods as deprecated


Commit: a471e85c69a54c264476c831f5b4bd7f9c3a0c08
https://github.com/webanno/webanno/commit/a471e85c69a54c264476c831f5b4bd7f9c3a0c08
Author: Richard Eckart de Castilho <richard...@gmail.com>
Date: 2018-04-16 (Mon, 16 Apr 2018)

Changed paths:
M webanno-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/ProjectService.java
M webanno-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/ProjectImportEvent.java
M webanno-constraints/src/main/java/de/tudarmstadt/ukp/clarin/webanno/constraints/ConstraintsServiceEventAdapter.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ExportService.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ExportServiceImpl.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ExportUtil.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ImportService.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ImportServiceImpl.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ImportUtil.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ProjectExportException.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ProjectExportRequest.java
A webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ProjectExportService.java
A webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ProjectExportServiceImpl.java
A webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ProjectImportRequest.java
A webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/AnnotationDocumentExporter.java
A webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/AutomationMiraTemplateExporter.java
A webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/AutomationTrainingDocumentExporter.java
A webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/ConstraintsExporter.java
A webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/CuratedDocumentsExporter.java
A webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/GuildelinesExporter.java
A webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/LayerExporter.java
A webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/PermissionsExporter.java
A webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/ProjectExporter.java
A webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/ProjectLogExporter.java
A webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/ProjectMetaInfExporter.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/ProjectSettingsExporter.java
A webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/SourceDocumentExporter.java
A webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/TagSetExporter.java
M webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ExportedAnnotationFeatureReference.java
M webanno-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/ProjectServiceImpl.java
M webanno-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/RemoteApiController2.java
M webanno-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/ProjectImportPanel.java
M webanno-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/export/ProjectExportPanel.java

Log Message:
-----------
#914 - Modularize project import/export

- INCOMPATIBLE CHANGE: automation export format changed; however, previous format was broken anyhow because it did not consider which features belong to which layers
- Split import/export code over a number of exporter classes
- Introduced new modular ProjectExportService
- Use the new service instead of the old one


Commit: 839a27a302d29456748b80e3df609bfecc53419a
https://github.com/webanno/webanno/commit/839a27a302d29456748b80e3df609bfecc53419a
Author: Richard Eckart de Castilho <richard...@gmail.com>
Date: 2018-04-16 (Mon, 16 Apr 2018)

Changed paths:
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/LayerExporter.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/TagSetExporter.java

Log Message:
-----------
#914 - Modularize project import/export

- Moved legacy tagset code from layer exporter into tagset exporter where it belongs


Commit: 98b25c0aa716b91a60f2fccea80caf76e6ae8fe7
https://github.com/webanno/webanno/commit/98b25c0aa716b91a60f2fccea80caf76e6ae8fe7
Author: Richard Eckart de Castilho <richard...@gmail.com>
Date: 2018-04-16 (Mon, 16 Apr 2018)

Changed paths:
M webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ExportedProject.java

Log Message:
-----------
#914 - Modularize project import/export

- Avoid NPEs with old project exports where e.g. no layers existed yet.


Commit: 9ef9f4bd9eba24f069f7a38e5ba12d238106da8d
https://github.com/webanno/webanno/commit/9ef9f4bd9eba24f069f7a38e5ba12d238106da8d
Author: Richard Eckart de Castilho <richard...@gmail.com>
Date: 2018-04-16 (Mon, 16 Apr 2018)

Changed paths:
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ExportUtil.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ImportUtil.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/AutomationMiraTemplateExporter.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/AutomationTrainingDocumentExporter.java
M webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ExportedProject.java

Log Message:
-----------
#914 - Modularize project import/export

- Introduce generic mechanism to attach/retrieve arbitrary data on the export model so plugins can truely manage their own import/export
- Used the mechanism on the automation data


Commit: 1ffe8966c16aacdd885a3ca5d6d3657a0206273b
https://github.com/webanno/webanno/commit/1ffe8966c16aacdd885a3ca5d6d3657a0206273b
Author: Richard Eckart de Castilho <richard...@gmail.com>
Date: 2018-04-16 (Mon, 16 Apr 2018)

Changed paths:
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ImportUtil.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/LayerExporter.java
M webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ExportedAnnotationFeature.java

Log Message:
-----------
#898 - Allow feature-type specific configurations

- Import/export traits


Commit: 1a7445568c74b83e7b06fb7feadcd38a9244b2bd
https://github.com/webanno/webanno/commit/1a7445568c74b83e7b06fb7feadcd38a9244b2bd
Author: Richard Eckart de Castilho <richard...@gmail.com>
Date: 2018-04-16 (Mon, 16 Apr 2018)

Changed paths:
A webanno-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExportException.java
A webanno-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExportRequest.java
A webanno-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExportService.java
A webanno-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExporter.java
A webanno-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectImportRequest.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ExportService.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ExportServiceImpl.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ExportUtil.java
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ProjectExportException.java
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ProjectExportRequest.java
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ProjectExportService.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ProjectExportServiceImpl.java
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ProjectImportRequest.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/AnnotationDocumentExporter.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/AutomationMiraTemplateExporter.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/AutomationTrainingDocumentExporter.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/ConstraintsExporter.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/CuratedDocumentsExporter.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/GuildelinesExporter.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/LayerExporter.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/PermissionsExporter.java
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/ProjectExporter.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/ProjectLogExporter.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/ProjectMetaInfExporter.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/ProjectSettingsExporter.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/SourceDocumentExporter.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/TagSetExporter.java
M webanno-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/RemoteApiController2.java
M webanno-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/ProjectImportPanel.java
M webanno-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/export/ProjectExportPanel.java

Log Message:
-----------
#914 - Modularize project import/export

- Move export API into API module


Commit: c8b94c6706049315e2144f7f342a665cdb610a32
https://github.com/webanno/webanno/commit/c8b94c6706049315e2144f7f342a665cdb610a32
Author: Richard Eckart de Castilho <richard...@gmail.com>
Date: 2018-04-16 (Mon, 16 Apr 2018)

Changed paths:
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ImportService.java
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ImportServiceImpl.java
M webanno-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/RemoteApiController2.java
M webanno-remote/src/test/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/RemoteApiController2Test.java
M webanno-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/tagsets/TagSetImportPanel.java

Log Message:
-----------
#914 - Modularize project import/export

- Remove legacy ImportService


Commit: 18c4d4189e7f952e3a086f72ce46855c940696cf
https://github.com/webanno/webanno/commit/18c4d4189e7f952e3a086f72ce46855c940696cf
Author: Richard Eckart de Castilho <richard...@gmail.com>
Date: 2018-04-16 (Mon, 16 Apr 2018)

Changed paths:
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ExportService.java
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ExportServiceImpl.java

Log Message:
-----------
#914 - Modularize project import/export

- Remove legacy ExportService


Commit: ec79e2294f69dd9d0358af1554feea5cc53e41ac
https://github.com/webanno/webanno/commit/ec79e2294f69dd9d0358af1554feea5cc53e41ac
Author: Richard Eckart de Castilho <richard...@gmail.com>
Date: 2018-04-16 (Mon, 16 Apr 2018)

Changed paths:
A webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/export/LayerExporter.java
A webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/export/LegacyProjectInitializer.java
A webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/export/TagSetExporter.java
M webanno-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExporter.java
M webanno-automation/pom.xml
A webanno-automation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/automation/service/export/AutomationMiraTemplateExporter.java
A webanno-automation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/automation/service/export/AutomationTrainingDocumentExporter.java
A webanno-automation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/automation/service/export/model/ExportedMiraTemplate.java
A webanno-automation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/automation/service/export/model/ExportedTrainingDocument.java
M webanno-export/pom.xml
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ExportUtil.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ImportUtil.java
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/LegacyProjectInitializer.java
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/AutomationMiraTemplateExporter.java
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/AutomationTrainingDocumentExporter.java
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/LayerExporter.java
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/TagSetExporter.java
R webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ExportedMiraTemplate.java
R webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ExportedTrainingDocument.java

Log Message:
-----------
#914 - Modularize project import/export

- Moved automation export to automation module
- Relocated prerequisite exporters to api-dao module


Commit: 7baf27e08765a0b2a0bf06018012b29447c445d4
https://github.com/webanno/webanno/commit/7baf27e08765a0b2a0bf06018012b29447c445d4
Author: Richard Eckart de Castilho <richard...@gmail.com>
Date: 2018-04-16 (Mon, 16 Apr 2018)

Changed paths:
M webanno-api-dao/pom.xml
R webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/export/LayerExporter.java
R webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/export/LegacyProjectInitializer.java
A webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/export/ProjectExportServiceImpl.java
R webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/export/TagSetExporter.java
A webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/export/exporters/AnnotationDocumentExporter.java
A webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/export/exporters/CuratedDocumentsExporter.java
A webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/export/exporters/GuildelinesExporter.java
A webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/export/exporters/LayerExporter.java
A webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/export/exporters/LegacyProjectInitializer.java
A webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/export/exporters/PermissionsExporter.java
A webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/export/exporters/ProjectLogExporter.java
A webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/export/exporters/ProjectMetaInfExporter.java
A webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/export/exporters/ProjectSettingsExporter.java
A webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/export/exporters/SourceDocumentExporter.java
A webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/export/exporters/TagSetExporter.java
M webanno-automation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/automation/service/export/AutomationMiraTemplateExporter.java
M webanno-automation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/automation/service/export/AutomationTrainingDocumentExporter.java
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ProjectExportServiceImpl.java
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/AnnotationDocumentExporter.java
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/CuratedDocumentsExporter.java
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/GuildelinesExporter.java
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/PermissionsExporter.java
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/ProjectLogExporter.java
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/ProjectMetaInfExporter.java
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/ProjectSettingsExporter.java
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/SourceDocumentExporter.java
M webanno-remote/src/test/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/RemoteApiController2Test.java
M webanno-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/export/ProjectExportPanel.java

Log Message:
-----------
#914 - Modularize project import/export

- Relocated rest of the core exporters to the api-dao module


Commit: 377c065163d4b9c589ef8848393ed5f34982d383
https://github.com/webanno/webanno/commit/377c065163d4b9c589ef8848393ed5f34982d383
Author: Richard Eckart de Castilho <richard...@gmail.com>
Date: 2018-04-16 (Mon, 16 Apr 2018)

Changed paths:
A webanno-constraints/src/main/java/de/tudarmstadt/ukp/clarin/webanno/constraints/export/ConstraintsExporter.java
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/exporers/ConstraintsExporter.java

Log Message:
-----------
#914 - Modularize project import/export

- Move constraints exporter to constraints module


Commit: 764f9fd489ccc8ce2cca117f76707f7402ce7dba
https://github.com/webanno/webanno/commit/764f9fd489ccc8ce2cca117f76707f7402ce7dba
Author: Richard Eckart de Castilho <richard...@gmail.com>
Date: 2018-04-16 (Mon, 16 Apr 2018)

Changed paths:
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ExportUtil.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ImportUtil.java

Log Message:
-----------
#914 - Modularize project import/export

- Removed unused code from ImportUtil/ExportUtil


Commit: d39ea3784da1f5cb0b347bdcc7757da380dded8a
https://github.com/webanno/webanno/commit/d39ea3784da1f5cb0b347bdcc7757da380dded8a
Author: Richard Eckart de Castilho <richard...@gmail.com>
Date: 2018-04-16 (Mon, 16 Apr 2018)

Changed paths:
M webanno-automation/pom.xml
M webanno-constraints/pom.xml
M webanno-export/pom.xml
M webanno-model-export/pom.xml

Log Message:
-----------
#914 - Modularize project import/export

- Fixed dependencies


Compare: https://github.com/webanno/webanno/compare/320c1b22c4de^...d39ea3784da1
**NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

Functionality will be removed from GitHub.com on January 31st, 2019.

GitHub

unread,
May 15, 2018, 7:48:07 AM5/15/18
to webanno...@googlegroups.com
Branch: refs/heads/master
Commit: f67c5a45d7ad730451d1a894d32ce1c814374f9a
https://github.com/webanno/webanno/commit/f67c5a45d7ad730451d1a894d32ce1c814374f9a
Author: Richard Eckart de Castilho <richard...@gmail.com>
Date: 2018-05-15 (Tue, 15 May 2018)

Changed paths:
M webanno-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/AnnotationSchemaService.java
M webanno-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/feature/FeatureSupport.java
M webanno-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/feature/FeatureSupportRegistry.java
M webanno-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/feature/FeatureType.java
M webanno-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/feature/SlotFeatureSupport.java
M webanno-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/feature/editor/BooleanFeatureEditor.java
M webanno-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/feature/editor/FeatureEditor.java
M webanno-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/feature/editor/KendoAutoCompleteTextFeatureEditor.html
M webanno-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/feature/editor/KendoAutoCompleteTextFeatureEditor.java
A webanno-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/feature/editor/KendoChoiceDescriptionScriptReference.java
A webanno-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/feature/editor/KendoChoiceDescriptionScriptReference.js
M webanno-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/feature/editor/KendoComboboxTextFeatureEditor.html
M webanno-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/feature/editor/KendoComboboxTextFeatureEditor.java
M webanno-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/feature/editor/LinkFeatureEditor.java
A webanno-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/feature/editor/LinkFeatureTraits.java
A webanno-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/feature/editor/LinkFeatureTraitsEditor.html
A webanno-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/feature/editor/LinkFeatureTraitsEditor.java
M webanno-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/feature/editor/NumberFeatureEditor.java
M webanno-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/feature/editor/TextFeatureEditorBase.java
M webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/AnnotationSchemaServiceImpl.java
M webanno-diag/src/main/resources/META-INF/asciidoc/developer-guide/casdoctor.adoc
M webanno-doc/src/main/resources/META-INF/asciidoc/admin-guide.adoc
M webanno-doc/src/main/resources/META-INF/asciidoc/developer-guide.adoc
M webanno-remote/pom.xml
M webanno-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AnnotationDetailEditorPanel.java
M webanno-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AnnotationFeatureForm.java
A webanno-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/event/AjaxAfterAnnotationUpdateEvent.java
M webanno-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/ProjectLayersPanel.java
M webanno-ui-project/src/main/resources/META-INF/asciidoc/user-guide/projects.adoc

Log Message:
-----------
Merge branch 'master' into feature/914-modular-export

* master: (21 commits)
#934 - Move ID-setting code from feature editors into FeatureEditorPanelContent (via #935)
#930 - Project initialization does not take into account the missing dependencies of a layer (via #931)
#933 - Description tooltips may not disappear
#932 - Cannot import legacy projects
No issue. Fixed bad conflict resolution in last merge commit.
[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare release webanno-3.4.0
#862 - Modularize documentation
#928 - Support internal feature types
#901 - Use AutoComplete instead of ComboBox for large tagsets
#927 - Unexpected RuntimeException if select a link:another layer from feature type dropdown in Projects Setting
No issue. Fix variable name in documentation.
#918 - Link feature trait for default slots (via #920)
#924 - Renaming layer is not working (via #925)
#898 - Allow feature-type specific configurations
#916 - Facilitate overriding the feature value rendering
#915 - Add Ajax Event in AnnotationDetailEditorPanel
#915 - Add Ajax Event in AnnotationDetailEditorPanel
#862 - Modularize documentation
#792 - Webhook for status change notification
...

% Conflicts:
% webanno-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/ProjectLayersPanel.java


Commit: a63dab4f75c6752e4f3c02e0586c9627d05c6fb2
https://github.com/webanno/webanno/commit/a63dab4f75c6752e4f3c02e0586c9627d05c6fb2
Author: Richard Eckart de Castilho <richard...@gmail.com>
Date: 2018-05-15 (Tue, 15 May 2018)

Changed paths:
M webanno-api-dao/pom.xml
A webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/export/ProjectExportServiceImpl.java
A webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/export/exporters/AnnotationDocumentExporter.java
A webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/export/exporters/CuratedDocumentsExporter.java
A webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/export/exporters/GuildelinesExporter.java
A webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/export/exporters/LayerExporter.java
A webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/export/exporters/LegacyProjectInitializer.java
A webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/export/exporters/PermissionsExporter.java
A webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/export/exporters/ProjectLogExporter.java
A webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/export/exporters/ProjectMetaInfExporter.java
A webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/export/exporters/ProjectSettingsExporter.java
A webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/export/exporters/SourceDocumentExporter.java
A webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/export/exporters/TagSetExporter.java
M webanno-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/ProjectService.java
M webanno-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/ProjectImportEvent.java
A webanno-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExportException.java
A webanno-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExportRequest.java
A webanno-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExportService.java
A webanno-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExporter.java
A webanno-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectImportRequest.java
M webanno-automation/pom.xml
A webanno-automation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/automation/service/export/AutomationMiraTemplateExporter.java
A webanno-automation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/automation/service/export/AutomationTrainingDocumentExporter.java
A webanno-automation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/automation/service/export/model/ExportedMiraTemplate.java
A webanno-automation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/automation/service/export/model/ExportedTrainingDocument.java
M webanno-constraints/pom.xml
M webanno-constraints/src/main/java/de/tudarmstadt/ukp/clarin/webanno/constraints/ConstraintsServiceEventAdapter.java
A webanno-constraints/src/main/java/de/tudarmstadt/ukp/clarin/webanno/constraints/export/ConstraintsExporter.java
M webanno-export/pom.xml
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ExportService.java
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ExportServiceImpl.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ExportUtil.java
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ImportService.java
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ImportServiceImpl.java
M webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ImportUtil.java
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/LegacyProjectInitializer.java
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ProjectExportException.java
R webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/ProjectExportRequest.java
M webanno-model-export/pom.xml
R webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/AnnotationDocument.java
R webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/AnnotationFeature.java
R webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/AnnotationLayer.java
A webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ExportedAnnotationDocument.java
A webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ExportedAnnotationFeature.java
A webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ExportedAnnotationFeatureReference.java
A webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ExportedAnnotationLayer.java
A webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ExportedAnnotationLayerReference.java
A webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ExportedProject.java
A webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ExportedProjectPermission.java
A webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ExportedSourceDocument.java
M webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ExportedTag.java
R webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/MiraTemplate.java
R webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/Project.java
R webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ProjectPermission.java
R webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/SourceDocument.java
R webanno-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/TrainingDocument.java
M webanno-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/ProjectServiceImpl.java
M webanno-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/RemoteApiController2.java
M webanno-remote/src/test/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/RemoteApiController2Test.java
M webanno-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/component/DocumentNamePanel.java
M webanno-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/ProjectImportPanel.java
M webanno-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/export/ProjectExportPanel.java
M webanno-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/ProjectLayersPanel.java
M webanno-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/tagsets/TagSetImportPanel.java

Log Message:
-----------
Merge pull request #938 from webanno/feature/914-modular-export

#914 - Modularize project import/export


Compare: https://github.com/webanno/webanno/compare/6b5cdf64e5d0...a63dab4f75c6
Reply all
Reply to author
Forward
0 new messages