From d6f3c715ed8084dfa6086cdb082ad1992e2f17bd Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Mon, 20 Nov 2023 21:10:53 +0100 Subject: [PATCH] #4316 - Dissolve generic API module - Move DocumentImportExportService interface to appropriate module --- inception/inception-api-annotation/pom.xml | 4 +++ .../export/ExportDocumentDialogContent.java | 2 +- inception/inception-api/pom.xml | 24 ----------------- .../CurationServiceAutoConfiguration.java | 2 +- .../export/CuratedDocumentsExporter.java | 2 +- .../export/CuratedDocumentsExporterTest.java | 2 +- .../CurationDocumentServiceImplTest.java | 2 +- inception/inception-documents/pom.xml | 4 --- .../documents/DocumentServiceImpl.java | 2 +- .../DocumentServiceAutoConfiguration.java | 2 +- .../DocumentServiceImplConcurrencyTest.java | 2 +- inception/inception-export-api/pom.xml | 26 +++++++------------ .../export}/DocumentImportExportService.java | 2 +- inception/inception-export/pom.xml | 4 --- .../DocumentImportExportServiceImpl.java | 2 +- ...tImportExportServiceAutoConfiguration.java | 2 +- inception/inception-external-editor/pom.xml | 2 +- .../XmlDocumentViewControllerImplBase.java | 2 +- .../XHtmlXmlDocumentViewControllerImpl.java | 2 +- .../xml/XmlDocumentViewControllerImpl.java | 2 +- inception/inception-guidelines/pom.xml | 4 --- .../settings/ImportGuidelinesPanel.java | 2 +- inception/inception-io-json/pom.xml | 2 +- .../io/jsoncas/UimaJsonCasFormatSupport.java | 2 +- .../UimaJsonCasSupportAutoConfiguration.java | 2 +- .../EventRepositoryImplIntegrationTest.java | 2 +- inception/inception-project-export/pom.xml | 4 --- .../legacy/LegacyProjectExportPanel.java | 2 +- .../export/settings/FormatDropdownChoice.java | 2 +- .../backup/BackupProjectExporterPanel.java | 2 +- .../CuratedDocumentsProjectExportTask.java | 2 +- .../AnnotationDocumentsExporterTest.java | 2 +- inception/inception-remote/pom.xml | 4 --- .../remoteapi/LegacyRemoteApiController.java | 2 +- .../aero/AeroRemoteApiController.java | 2 +- ...otationSchemaServiceAutoConfiguration.java | 2 +- .../exporters/AnnotationDocumentExporter.java | 2 +- .../DocumentServiceImplDatabaseTest.java | 2 +- .../AnnotationSchemaServiceImplTest.java | 2 +- .../inception-ui-external-search/pom.xml | 2 +- .../ExternalSearchAnnotationSidebar.java | 2 +- .../casdoctor/ProjectCasDoctorPanel.java | 2 +- .../documents/ImportDocumentsPanel.java | 2 +- .../documents/SourceDocumentTable.java | 2 +- inception/inception-workload-dynamic/pom.xml | 5 ++++ .../DynamicWorkloadExtensionImpl2Test.java | 2 +- .../DynamicWorkloadExtensionImplTest.java | 2 +- inception/inception-workload-matrix/pom.xml | 5 ++++ .../MatrixWorkloadExtensionImplTest.java | 2 +- 49 files changed, 63 insertions(+), 99 deletions(-) rename inception/{inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api => inception-export-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export}/DocumentImportExportService.java (99%) diff --git a/inception/inception-api-annotation/pom.xml b/inception/inception-api-annotation/pom.xml index 9fc01f3bf05..211db3e053d 100644 --- a/inception/inception-api-annotation/pom.xml +++ b/inception/inception-api-annotation/pom.xml @@ -47,6 +47,10 @@ de.tudarmstadt.ukp.inception.app inception-api + + de.tudarmstadt.ukp.inception.app + inception-export-api + de.tudarmstadt.ukp.inception.app inception-project-api diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/actionbar/export/ExportDocumentDialogContent.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/actionbar/export/ExportDocumentDialogContent.java index 72a5edd4530..8972d035b0a 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/actionbar/export/ExportDocumentDialogContent.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/actionbar/export/ExportDocumentDialogContent.java @@ -41,7 +41,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.format.FormatSupport; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxFormComponentUpdatingBehavior; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxLink; diff --git a/inception/inception-api/pom.xml b/inception/inception-api/pom.xml index 05ddee9c019..338d82d9902 100644 --- a/inception/inception-api/pom.xml +++ b/inception/inception-api/pom.xml @@ -25,28 +25,10 @@ inception-api INCEpTION - Core - API - - de.tudarmstadt.ukp.inception.app - inception-api-formats - de.tudarmstadt.ukp.inception.app inception-model - - de.tudarmstadt.ukp.inception.app - inception-support - - - - org.apache.commons - commons-lang3 - - - - org.apache.uima - uimaj-core - @@ -58,12 +40,6 @@ spring-boot - - - org.apache.wicket - wicket-core - - org.dkpro.core dkpro-core-api-segmentation-asl diff --git a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/config/CurationServiceAutoConfiguration.java b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/config/CurationServiceAutoConfiguration.java index 9b220c95d58..8851894f6eb 100644 --- a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/config/CurationServiceAutoConfiguration.java +++ b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/config/CurationServiceAutoConfiguration.java @@ -28,8 +28,8 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.inception.curation.export.CuratedDocumentsExporter; import de.tudarmstadt.ukp.inception.curation.export.CurationWorkflowExporter; import de.tudarmstadt.ukp.inception.curation.merge.DefaultMergeStrategyFactory; diff --git a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporter.java b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporter.java index f38ffc73f4e..eb726305ee9 100644 --- a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporter.java +++ b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporter.java @@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.export.FullProjectExportRequest; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportException; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportTaskMonitor; diff --git a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporterTest.java b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporterTest.java index 97d22eb6e0e..1bcb1bf2c51 100644 --- a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporterTest.java +++ b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporterTest.java @@ -40,8 +40,8 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectImportRequest; import de.tudarmstadt.ukp.clarin.webanno.diag.ChecksRegistry; import de.tudarmstadt.ukp.clarin.webanno.diag.RepairsRegistry; diff --git a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/service/CurationDocumentServiceImplTest.java b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/service/CurationDocumentServiceImplTest.java index b809e1bc8f9..1d41dd4d714 100644 --- a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/service/CurationDocumentServiceImplTest.java +++ b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/service/CurationDocumentServiceImplTest.java @@ -40,8 +40,8 @@ import org.springframework.context.annotation.Import; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; import de.tudarmstadt.ukp.clarin.webanno.model.Project; diff --git a/inception/inception-documents/pom.xml b/inception/inception-documents/pom.xml index 17098a936fb..5b53bb883fa 100644 --- a/inception/inception-documents/pom.xml +++ b/inception/inception-documents/pom.xml @@ -66,10 +66,6 @@ de.tudarmstadt.ukp.inception.app inception-model - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-project-api diff --git a/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/DocumentServiceImpl.java b/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/DocumentServiceImpl.java index 4e24aebff70..f1aea258b8f 100644 --- a/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/DocumentServiceImpl.java +++ b/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/DocumentServiceImpl.java @@ -102,11 +102,11 @@ import org.springframework.context.event.EventListener; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasAccessMode; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasUpgradeMode; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.ConcurentCasModificationException; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentStateChangeFlag; diff --git a/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/config/DocumentServiceAutoConfiguration.java b/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/config/DocumentServiceAutoConfiguration.java index 3cbda5ae59e..7ad89d5ec02 100644 --- a/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/config/DocumentServiceAutoConfiguration.java +++ b/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/config/DocumentServiceAutoConfiguration.java @@ -24,8 +24,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.inception.documents.DocumentAccess; import de.tudarmstadt.ukp.inception.documents.DocumentAccessImpl; diff --git a/inception/inception-documents/src/test/java/de/tudarmstadt/ukp/inception/documents/DocumentServiceImplConcurrencyTest.java b/inception/inception-documents/src/test/java/de/tudarmstadt/ukp/inception/documents/DocumentServiceImplConcurrencyTest.java index cc3ab9488ba..aa6b9283067 100644 --- a/inception/inception-documents/src/test/java/de/tudarmstadt/ukp/inception/documents/DocumentServiceImplConcurrencyTest.java +++ b/inception/inception-documents/src/test/java/de/tudarmstadt/ukp/inception/documents/DocumentServiceImplConcurrencyTest.java @@ -59,8 +59,8 @@ import org.slf4j.MDC; import org.springframework.context.ApplicationEventPublisher; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; diff --git a/inception/inception-export-api/pom.xml b/inception/inception-export-api/pom.xml index 8bbc69596c4..c67fb5c229f 100644 --- a/inception/inception-export-api/pom.xml +++ b/inception/inception-export-api/pom.xml @@ -50,21 +50,15 @@ org.apache.commons commons-lang3 + + + org.apache.uima + uimaj-core + + + + org.apache.wicket + wicket-core + - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - de.tudarmstadt.ukp.inception.app:inception-api-formats - - - - - - \ No newline at end of file diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/DocumentImportExportService.java b/inception/inception-export-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/DocumentImportExportService.java similarity index 99% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/DocumentImportExportService.java rename to inception/inception-export-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/DocumentImportExportService.java index 691c2feed6d..b635583468d 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/DocumentImportExportService.java +++ b/inception/inception-export-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/DocumentImportExportService.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.clarin.webanno.api; +package de.tudarmstadt.ukp.clarin.webanno.api.export; import java.io.File; import java.io.IOException; diff --git a/inception/inception-export/pom.xml b/inception/inception-export/pom.xml index fc354c32cce..d692bf1095e 100644 --- a/inception/inception-export/pom.xml +++ b/inception/inception-export/pom.xml @@ -33,10 +33,6 @@ de.tudarmstadt.ukp.inception.app inception-export-api - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-documents-api diff --git a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/DocumentImportExportServiceImpl.java b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/DocumentImportExportServiceImpl.java index e6226639894..482b08e090d 100644 --- a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/DocumentImportExportServiceImpl.java +++ b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/DocumentImportExportServiceImpl.java @@ -76,9 +76,9 @@ import org.springframework.core.annotation.AnnotationAwareOrderComparator; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.util.WebAnnoCasUtil; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.format.FormatSupport; import de.tudarmstadt.ukp.clarin.webanno.diag.CasDoctor; import de.tudarmstadt.ukp.clarin.webanno.diag.ChecksRegistry; diff --git a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/config/DocumentImportExportServiceAutoConfiguration.java b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/config/DocumentImportExportServiceAutoConfiguration.java index 24b232212b5..5ce21fcf59e 100644 --- a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/config/DocumentImportExportServiceAutoConfiguration.java +++ b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/config/DocumentImportExportServiceAutoConfiguration.java @@ -24,8 +24,8 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.format.FormatSupport; import de.tudarmstadt.ukp.clarin.webanno.diag.ChecksRegistry; import de.tudarmstadt.ukp.clarin.webanno.diag.RepairsRegistry; diff --git a/inception/inception-external-editor/pom.xml b/inception/inception-external-editor/pom.xml index 87d24fb4296..b19643e2cda 100644 --- a/inception/inception-external-editor/pom.xml +++ b/inception/inception-external-editor/pom.xml @@ -27,7 +27,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-export-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/XmlDocumentViewControllerImplBase.java b/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/XmlDocumentViewControllerImplBase.java index 2602b303856..9296e9d9345 100644 --- a/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/XmlDocumentViewControllerImplBase.java +++ b/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/XmlDocumentViewControllerImplBase.java @@ -22,7 +22,7 @@ import org.xml.sax.ContentHandler; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorRegistry; import de.tudarmstadt.ukp.inception.externaleditor.policy.DefaultHtmlDocumentPolicy; diff --git a/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xhtml/XHtmlXmlDocumentViewControllerImpl.java b/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xhtml/XHtmlXmlDocumentViewControllerImpl.java index 32a2cf0e083..0a3b76b6897 100644 --- a/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xhtml/XHtmlXmlDocumentViewControllerImpl.java +++ b/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xhtml/XHtmlXmlDocumentViewControllerImpl.java @@ -51,7 +51,7 @@ import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.ServletContextUtils; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; diff --git a/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xml/XmlDocumentViewControllerImpl.java b/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xml/XmlDocumentViewControllerImpl.java index 256a81ef968..60cdfb2e46b 100644 --- a/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xml/XmlDocumentViewControllerImpl.java +++ b/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xml/XmlDocumentViewControllerImpl.java @@ -43,7 +43,7 @@ import org.springframework.web.bind.annotation.RestController; import org.xml.sax.helpers.AttributesImpl; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorRegistry; diff --git a/inception/inception-guidelines/pom.xml b/inception/inception-guidelines/pom.xml index 25f7ed1c076..d75820e6286 100644 --- a/inception/inception-guidelines/pom.xml +++ b/inception/inception-guidelines/pom.xml @@ -61,10 +61,6 @@ de.tudarmstadt.ukp.inception.app inception-export-api - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-project-api diff --git a/inception/inception-guidelines/src/main/java/de/tudarmstadt/ukp/inception/guidelines/settings/ImportGuidelinesPanel.java b/inception/inception-guidelines/src/main/java/de/tudarmstadt/ukp/inception/guidelines/settings/ImportGuidelinesPanel.java index 7ea0e479350..398eec7fe17 100644 --- a/inception/inception-guidelines/src/main/java/de/tudarmstadt/ukp/inception/guidelines/settings/ImportGuidelinesPanel.java +++ b/inception/inception-guidelines/src/main/java/de/tudarmstadt/ukp/inception/guidelines/settings/ImportGuidelinesPanel.java @@ -36,7 +36,7 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.spring.injection.annot.SpringBean; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.bootstrap.BootstrapFileInputField; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxButton; diff --git a/inception/inception-io-json/pom.xml b/inception/inception-io-json/pom.xml index f55da186c95..9edf868e9cd 100644 --- a/inception/inception-io-json/pom.xml +++ b/inception/inception-io-json/pom.xml @@ -35,7 +35,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-export-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-io-json/src/main/java/de/tudarmstadt/ukp/inception/io/jsoncas/UimaJsonCasFormatSupport.java b/inception/inception-io-json/src/main/java/de/tudarmstadt/ukp/inception/io/jsoncas/UimaJsonCasFormatSupport.java index 6e05c8dad31..57ed4fde945 100644 --- a/inception/inception-io-json/src/main/java/de/tudarmstadt/ukp/inception/io/jsoncas/UimaJsonCasFormatSupport.java +++ b/inception/inception-io-json/src/main/java/de/tudarmstadt/ukp/inception/io/jsoncas/UimaJsonCasFormatSupport.java @@ -34,7 +34,7 @@ import org.apache.uima.util.TypeSystemUtil; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.format.FormatSupport; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.inception.schema.service.AnnotationSchemaServiceImpl; diff --git a/inception/inception-io-json/src/main/java/de/tudarmstadt/ukp/inception/io/jsoncas/config/UimaJsonCasSupportAutoConfiguration.java b/inception/inception-io-json/src/main/java/de/tudarmstadt/ukp/inception/io/jsoncas/config/UimaJsonCasSupportAutoConfiguration.java index c4b3256f651..90ecd724007 100644 --- a/inception/inception-io-json/src/main/java/de/tudarmstadt/ukp/inception/io/jsoncas/config/UimaJsonCasSupportAutoConfiguration.java +++ b/inception/inception-io-json/src/main/java/de/tudarmstadt/ukp/inception/io/jsoncas/config/UimaJsonCasSupportAutoConfiguration.java @@ -22,7 +22,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.inception.io.jsoncas.LegacyUimaJsonFormatSupport; import de.tudarmstadt.ukp.inception.io.jsoncas.UimaJsonCasFormatSupport; diff --git a/inception/inception-log/src/test/java/de/tudarmstadt/ukp/inception/log/EventRepositoryImplIntegrationTest.java b/inception/inception-log/src/test/java/de/tudarmstadt/ukp/inception/log/EventRepositoryImplIntegrationTest.java index 3dcf52bbe65..7ae1aa5fff9 100644 --- a/inception/inception-log/src/test/java/de/tudarmstadt/ukp/inception/log/EventRepositoryImplIntegrationTest.java +++ b/inception/inception-log/src/test/java/de/tudarmstadt/ukp/inception/log/EventRepositoryImplIntegrationTest.java @@ -45,8 +45,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.config.ProjectServiceAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.security.config.SecurityAutoConfiguration; diff --git a/inception/inception-project-export/pom.xml b/inception/inception-project-export/pom.xml index 0526fc222b1..a2ac1443134 100644 --- a/inception/inception-project-export/pom.xml +++ b/inception/inception-project-export/pom.xml @@ -50,10 +50,6 @@ de.tudarmstadt.ukp.inception.app inception-websocket - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-documents-api diff --git a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/legacy/LegacyProjectExportPanel.java b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/legacy/LegacyProjectExportPanel.java index 641bacee3b3..0be3a007852 100644 --- a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/legacy/LegacyProjectExportPanel.java +++ b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/legacy/LegacyProjectExportPanel.java @@ -41,7 +41,7 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.wicketstuff.progressbar.ProgressBar; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.export.FullProjectExportRequest; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportRequest_ImplBase; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportTaskHandle; diff --git a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/settings/FormatDropdownChoice.java b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/settings/FormatDropdownChoice.java index aeb8aaab43a..78441cd7851 100644 --- a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/settings/FormatDropdownChoice.java +++ b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/settings/FormatDropdownChoice.java @@ -29,7 +29,7 @@ import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.spring.injection.annot.SpringBean; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.export.FullProjectExportRequest; import de.tudarmstadt.ukp.clarin.webanno.api.format.FormatSupport; diff --git a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/task/backup/BackupProjectExporterPanel.java b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/task/backup/BackupProjectExporterPanel.java index 65971882afd..036ada1ccc0 100644 --- a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/task/backup/BackupProjectExporterPanel.java +++ b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/task/backup/BackupProjectExporterPanel.java @@ -25,7 +25,7 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.export.FullProjectExportRequest; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxFormComponentUpdatingBehavior; diff --git a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/task/curated/CuratedDocumentsProjectExportTask.java b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/task/curated/CuratedDocumentsProjectExportTask.java index cfa200d3d3b..665b62cf782 100644 --- a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/task/curated/CuratedDocumentsProjectExportTask.java +++ b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/task/curated/CuratedDocumentsProjectExportTask.java @@ -32,7 +32,7 @@ import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportException; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportTaskMonitor; import de.tudarmstadt.ukp.clarin.webanno.api.format.FormatSupport; diff --git a/inception/inception-project-export/src/test/java/de/tudarmstadt/ukp/inception/project/export/AnnotationDocumentsExporterTest.java b/inception/inception-project-export/src/test/java/de/tudarmstadt/ukp/inception/project/export/AnnotationDocumentsExporterTest.java index 34bd8c9238b..97ffcb0a5b9 100644 --- a/inception/inception-project-export/src/test/java/de/tudarmstadt/ukp/inception/project/export/AnnotationDocumentsExporterTest.java +++ b/inception/inception-project-export/src/test/java/de/tudarmstadt/ukp/inception/project/export/AnnotationDocumentsExporterTest.java @@ -37,7 +37,7 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectImportRequest; import de.tudarmstadt.ukp.clarin.webanno.diag.ChecksRegistry; import de.tudarmstadt.ukp.clarin.webanno.diag.RepairsRegistry; diff --git a/inception/inception-remote/pom.xml b/inception/inception-remote/pom.xml index 028e939c62f..8d923678e5c 100644 --- a/inception/inception-remote/pom.xml +++ b/inception/inception-remote/pom.xml @@ -61,10 +61,6 @@ de.tudarmstadt.ukp.inception.app inception-ui-core - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-project-api diff --git a/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/LegacyRemoteApiController.java b/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/LegacyRemoteApiController.java index 84fcf250b19..c9ba256a7b4 100644 --- a/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/LegacyRemoteApiController.java +++ b/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/LegacyRemoteApiController.java @@ -59,7 +59,7 @@ import com.github.openjson.JSONArray; import com.github.openjson.JSONObject; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.format.FormatSupport; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; diff --git a/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/aero/AeroRemoteApiController.java b/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/aero/AeroRemoteApiController.java index ecb3b0e4509..01d00e185c5 100644 --- a/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/aero/AeroRemoteApiController.java +++ b/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/aero/AeroRemoteApiController.java @@ -89,7 +89,7 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.util.UriComponentsBuilder; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.export.FullProjectExportRequest; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportTaskMonitor; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectImportRequest; diff --git a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/config/AnnotationSchemaServiceAutoConfiguration.java b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/config/AnnotationSchemaServiceAutoConfiguration.java index 6d86ed96004..c41d802e375 100644 --- a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/config/AnnotationSchemaServiceAutoConfiguration.java +++ b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/config/AnnotationSchemaServiceAutoConfiguration.java @@ -29,8 +29,8 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.inception.annotation.feature.bool.BooleanFeatureSupport; import de.tudarmstadt.ukp.inception.annotation.feature.link.LinkFeatureSupport; diff --git a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/AnnotationDocumentExporter.java b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/AnnotationDocumentExporter.java index 504fd883f10..e0be9d772e8 100644 --- a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/AnnotationDocumentExporter.java +++ b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/AnnotationDocumentExporter.java @@ -68,7 +68,7 @@ import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.export.FullProjectExportRequest; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportException; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportTaskMonitor; diff --git a/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/documents/service/DocumentServiceImplDatabaseTest.java b/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/documents/service/DocumentServiceImplDatabaseTest.java index 00b3085bb91..09990d44272 100644 --- a/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/documents/service/DocumentServiceImplDatabaseTest.java +++ b/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/documents/service/DocumentServiceImplDatabaseTest.java @@ -43,8 +43,8 @@ import org.springframework.context.annotation.Import; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; import de.tudarmstadt.ukp.clarin.webanno.model.Project; diff --git a/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceImplTest.java b/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceImplTest.java index c5836649f32..eb7473f032f 100644 --- a/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceImplTest.java +++ b/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceImplTest.java @@ -44,8 +44,8 @@ import org.springframework.context.annotation.Import; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; diff --git a/inception/inception-ui-external-search/pom.xml b/inception/inception-ui-external-search/pom.xml index 6b66b7e7d85..2ce62eb9674 100644 --- a/inception/inception-ui-external-search/pom.xml +++ b/inception/inception-ui-external-search/pom.xml @@ -71,7 +71,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-export-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/sidebar/ExternalSearchAnnotationSidebar.java b/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/sidebar/ExternalSearchAnnotationSidebar.java index a3ae922710d..cd0a7568555 100644 --- a/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/sidebar/ExternalSearchAnnotationSidebar.java +++ b/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/sidebar/ExternalSearchAnnotationSidebar.java @@ -52,8 +52,8 @@ import org.slf4j.LoggerFactory; import org.wicketstuff.event.annotation.OnEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; diff --git a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/casdoctor/ProjectCasDoctorPanel.java b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/casdoctor/ProjectCasDoctorPanel.java index 656e7ecc3b3..66ecfb0a89b 100644 --- a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/casdoctor/ProjectCasDoctorPanel.java +++ b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/casdoctor/ProjectCasDoctorPanel.java @@ -47,8 +47,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.diag.CasDoctor; import de.tudarmstadt.ukp.clarin.webanno.diag.ChecksRegistry; import de.tudarmstadt.ukp.clarin.webanno.diag.RepairsRegistry; diff --git a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/ImportDocumentsPanel.java b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/ImportDocumentsPanel.java index 1ef395365b6..3a6959964b6 100644 --- a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/ImportDocumentsPanel.java +++ b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/ImportDocumentsPanel.java @@ -44,7 +44,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.format.FormatSupport; import de.tudarmstadt.ukp.clarin.webanno.diag.CasDoctorException; import de.tudarmstadt.ukp.clarin.webanno.model.Project; diff --git a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/SourceDocumentTable.java b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/SourceDocumentTable.java index 78809381fd1..f6079a13931 100644 --- a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/SourceDocumentTable.java +++ b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/SourceDocumentTable.java @@ -59,7 +59,7 @@ import org.wicketstuff.event.annotation.OnEvent; import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.CssClassNameAppender; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.format.FormatSupport; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.clarin.webanno.support.bootstrap.BootstrapModalDialog; diff --git a/inception/inception-workload-dynamic/pom.xml b/inception/inception-workload-dynamic/pom.xml index 854a345049e..f5a563d2402 100644 --- a/inception/inception-workload-dynamic/pom.xml +++ b/inception/inception-workload-dynamic/pom.xml @@ -217,6 +217,11 @@ inception-schema test + + de.tudarmstadt.ukp.inception.app + inception-export-api + test + org.springframework.boot spring-boot-starter-data-jpa diff --git a/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImpl2Test.java b/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImpl2Test.java index 4cd388d5e53..28cb2e99b7c 100644 --- a/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImpl2Test.java +++ b/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImpl2Test.java @@ -44,8 +44,8 @@ import org.springframework.security.core.session.SessionRegistry; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; import de.tudarmstadt.ukp.clarin.webanno.model.Project; diff --git a/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImplTest.java b/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImplTest.java index 3afc98f011a..d8945ad00c5 100644 --- a/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImplTest.java +++ b/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImplTest.java @@ -47,8 +47,8 @@ import org.springframework.context.annotation.Import; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; import de.tudarmstadt.ukp.clarin.webanno.model.Project; diff --git a/inception/inception-workload-matrix/pom.xml b/inception/inception-workload-matrix/pom.xml index c9d5a314c15..19fb7e68df2 100644 --- a/inception/inception-workload-matrix/pom.xml +++ b/inception/inception-workload-matrix/pom.xml @@ -185,6 +185,11 @@ inception-project test + + de.tudarmstadt.ukp.inception.app + inception-export-api + test + de.tudarmstadt.ukp.inception.app inception-annotation-storage diff --git a/inception/inception-workload-matrix/src/test/java/de/tudarmstadt/ukp/inception/workload/matrix/MatrixWorkloadExtensionImplTest.java b/inception/inception-workload-matrix/src/test/java/de/tudarmstadt/ukp/inception/workload/matrix/MatrixWorkloadExtensionImplTest.java index 21c81e0bd6f..9305b998ee6 100644 --- a/inception/inception-workload-matrix/src/test/java/de/tudarmstadt/ukp/inception/workload/matrix/MatrixWorkloadExtensionImplTest.java +++ b/inception/inception-workload-matrix/src/test/java/de/tudarmstadt/ukp/inception/workload/matrix/MatrixWorkloadExtensionImplTest.java @@ -40,8 +40,8 @@ import org.springframework.context.annotation.Import; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument;