diff --git a/inception/inception-agreement/pom.xml b/inception/inception-agreement/pom.xml index 3ef054f2a7e..629caefb73a 100644 --- a/inception/inception-agreement/pom.xml +++ b/inception/inception-agreement/pom.xml @@ -62,7 +62,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/results/coding/PairwiseCodingAgreementTable.java b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/results/coding/PairwiseCodingAgreementTable.java index 9f4a3d40d56..f7094f635b2 100644 --- a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/results/coding/PairwiseCodingAgreementTable.java +++ b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/results/coding/PairwiseCodingAgreementTable.java @@ -71,7 +71,6 @@ import de.tudarmstadt.ukp.clarin.webanno.agreement.AgreementUtils; import de.tudarmstadt.ukp.clarin.webanno.agreement.PairwiseAnnotationResult; import de.tudarmstadt.ukp.clarin.webanno.agreement.measures.DefaultAgreementTraits; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.curation.casdiff.CasDiff; import de.tudarmstadt.ukp.clarin.webanno.curation.casdiff.api.DiffAdapter; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; @@ -84,6 +83,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.wicket.AjaxDownloadBehavior; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.AjaxDownloadLink; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; public class PairwiseCodingAgreementTable diff --git a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/results/unitizing/PairwiseUnitizingAgreementTable.java b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/results/unitizing/PairwiseUnitizingAgreementTable.java index 4df41bd7ac1..a35675460bc 100644 --- a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/results/unitizing/PairwiseUnitizingAgreementTable.java +++ b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/results/unitizing/PairwiseUnitizingAgreementTable.java @@ -43,12 +43,12 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig.Placement; import de.tudarmstadt.ukp.clarin.webanno.agreement.AgreementResult; import de.tudarmstadt.ukp.clarin.webanno.agreement.PairwiseAnnotationResult; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.support.DefaultRefreshingView; import de.tudarmstadt.ukp.clarin.webanno.support.DescriptionTooltipBehavior; import de.tudarmstadt.ukp.clarin.webanno.support.bootstrap.PopoverBehavior; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; public class PairwiseUnitizingAgreementTable diff --git a/inception/inception-annotation-storage/pom.xml b/inception/inception-annotation-storage/pom.xml index d715f3f16bb..d03dc99948d 100644 --- a/inception/inception-annotation-storage/pom.xml +++ b/inception/inception-annotation-storage/pom.xml @@ -54,6 +54,10 @@ de.tudarmstadt.ukp.inception.app inception-api + + de.tudarmstadt.ukp.inception.app + inception-project-api + de.tudarmstadt.ukp.inception.app inception-documents-api diff --git a/inception/inception-annotation-storage/src/main/java/de/tudarmstadt/ukp/inception/annotation/storage/CasStorageServiceImpl.java b/inception/inception-annotation-storage/src/main/java/de/tudarmstadt/ukp/inception/annotation/storage/CasStorageServiceImpl.java index 1c7b34cfa96..d6118e0b865 100644 --- a/inception/inception-annotation-storage/src/main/java/de/tudarmstadt/ukp/inception/annotation/storage/CasStorageServiceImpl.java +++ b/inception/inception-annotation-storage/src/main/java/de/tudarmstadt/ukp/inception/annotation/storage/CasStorageServiceImpl.java @@ -17,7 +17,6 @@ */ package de.tudarmstadt.ukp.inception.annotation.storage; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.withProjectLogger; import static de.tudarmstadt.ukp.clarin.webanno.api.annotation.util.WebAnnoCasUtil.getRealCas; import static de.tudarmstadt.ukp.clarin.webanno.api.annotation.util.WebAnnoCasUtil.transferCasOwnershipToCurrentThread; import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasAccessMode.EXCLUSIVE_WRITE_ACCESS; @@ -27,6 +26,7 @@ import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasUpgradeMode.AUTO_CAS_UPGRADE; import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasUpgradeMode.NO_CAS_UPGRADE; import static de.tudarmstadt.ukp.inception.annotation.storage.CasStorageServiceImpl.RepairAndUpgradeFlags.ISOLATED_SESSION; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.withProjectLogger; import static java.lang.System.currentTimeMillis; import static java.util.Collections.newSetFromMap; import static java.util.Collections.synchronizedSet; diff --git a/inception/inception-annotation-storage/src/main/java/de/tudarmstadt/ukp/inception/annotation/storage/driver/filesystem/FileSystemCasStorageDriver.java b/inception/inception-annotation-storage/src/main/java/de/tudarmstadt/ukp/inception/annotation/storage/driver/filesystem/FileSystemCasStorageDriver.java index e49490f680b..700e7a11bb6 100644 --- a/inception/inception-annotation-storage/src/main/java/de/tudarmstadt/ukp/inception/annotation/storage/driver/filesystem/FileSystemCasStorageDriver.java +++ b/inception/inception-annotation-storage/src/main/java/de/tudarmstadt/ukp/inception/annotation/storage/driver/filesystem/FileSystemCasStorageDriver.java @@ -17,11 +17,11 @@ */ package de.tudarmstadt.ukp.inception.annotation.storage.driver.filesystem; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.ANNOTATION_FOLDER; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.DOCUMENT_FOLDER; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.PROJECT_FOLDER; import static de.tudarmstadt.ukp.clarin.webanno.api.annotation.util.WebAnnoCasUtil.setDocumentId; import static de.tudarmstadt.ukp.clarin.webanno.support.logging.BaseLoggers.BOOT_LOG; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.ANNOTATION_FOLDER; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.DOCUMENT_FOLDER; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.PROJECT_FOLDER; import static java.lang.System.currentTimeMillis; import static java.nio.file.Files.move; import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; diff --git a/inception/inception-api-annotation/pom.xml b/inception/inception-api-annotation/pom.xml index 8e120e7ec79..9fc01f3bf05 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-project-api + de.tudarmstadt.ukp.inception.app inception-documents-api diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/page/AnnotationPageBase.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/page/AnnotationPageBase.java index 892afa03e8b..0fb354f331e 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/page/AnnotationPageBase.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/page/AnnotationPageBase.java @@ -52,7 +52,6 @@ import org.wicketstuff.urlfragment.UrlFragment; import org.wicketstuff.urlfragment.UrlParametersReceivingBehavior; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.exception.NotEditableException; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.exception.ValidationException; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.paging.NoPagingStrategy; @@ -67,6 +66,7 @@ import de.tudarmstadt.ukp.clarin.webanno.ui.core.page.ProjectPageBase; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.rendering.vmodel.VRange; diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/preferences/AnnotationPreferencesDialogContent.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/preferences/AnnotationPreferencesDialogContent.java index 84a51fedda1..e46c2e3b6ae 100755 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/preferences/AnnotationPreferencesDialogContent.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/preferences/AnnotationPreferencesDialogContent.java @@ -54,7 +54,6 @@ import org.apache.wicket.spring.injection.annot.SpringBean; import org.slf4j.Logger; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationEditorState; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; @@ -66,6 +65,7 @@ import de.tudarmstadt.ukp.inception.editor.AnnotationEditorFactory; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorRegistry; import de.tudarmstadt.ukp.inception.preferences.PreferencesService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.rendering.coloring.ColoringStrategyType; import de.tudarmstadt.ukp.inception.rendering.coloring.ReadonlyColoringBehaviour; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotationPreference; diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/preferences/UserPreferencesServiceImpl.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/preferences/UserPreferencesServiceImpl.java index 656ef8dcc20..407d0bad8e3 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/preferences/UserPreferencesServiceImpl.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/preferences/UserPreferencesServiceImpl.java @@ -17,8 +17,8 @@ */ package de.tudarmstadt.ukp.clarin.webanno.api.annotation.preferences; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.PROJECT_FOLDER; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.SETTINGS_FOLDER; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.PROJECT_FOLDER; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.SETTINGS_FOLDER; import static java.util.stream.Collectors.toList; import java.beans.PropertyDescriptor; diff --git a/inception/inception-api/pom.xml b/inception/inception-api/pom.xml index 35c5f8b7d66..d871f36d51b 100644 --- a/inception/inception-api/pom.xml +++ b/inception/inception-api/pom.xml @@ -33,24 +33,11 @@ de.tudarmstadt.ukp.inception.app inception-model - - de.tudarmstadt.ukp.inception.app - inception-model-export - - - de.tudarmstadt.ukp.inception.app - inception-security - de.tudarmstadt.ukp.inception.app inception-support - - org.slf4j - slf4j-api - - org.apache.commons commons-lang3 diff --git a/inception/inception-bom/pom.xml b/inception/inception-bom/pom.xml index 2b14187ef0b..de125ffc0c8 100644 --- a/inception/inception-bom/pom.xml +++ b/inception/inception-bom/pom.xml @@ -513,6 +513,11 @@ inception-project 30.0-SNAPSHOT + + de.tudarmstadt.ukp.inception.app + inception-project-api + 30.0-SNAPSHOT + de.tudarmstadt.ukp.inception.app inception-project-initializers diff --git a/inception/inception-brat-editor/pom.xml b/inception/inception-brat-editor/pom.xml index 7ce581f6c27..b66a6a1adf6 100644 --- a/inception/inception-brat-editor/pom.xml +++ b/inception/inception-brat-editor/pom.xml @@ -31,7 +31,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/preferences/BratAnnotationEditorManagerPrefPanel.java b/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/preferences/BratAnnotationEditorManagerPrefPanel.java index e6022e0624f..a78e93a703f 100644 --- a/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/preferences/BratAnnotationEditorManagerPrefPanel.java +++ b/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/preferences/BratAnnotationEditorManagerPrefPanel.java @@ -32,12 +32,12 @@ import org.apache.wicket.model.PropertyModel; import org.apache.wicket.spring.injection.annot.SpringBean; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.ScriptDirection; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaForm; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorRegistry; import de.tudarmstadt.ukp.inception.preferences.PreferencesService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; public class BratAnnotationEditorManagerPrefPanel extends Panel diff --git a/inception/inception-constraints/pom.xml b/inception/inception-constraints/pom.xml index 15181ca8553..c4f030b7faf 100644 --- a/inception/inception-constraints/pom.xml +++ b/inception/inception-constraints/pom.xml @@ -48,19 +48,19 @@ de.tudarmstadt.ukp.inception.app - inception-model + inception-project-api de.tudarmstadt.ukp.inception.app - inception-model-export + inception-model de.tudarmstadt.ukp.inception.app - inception-export-api + inception-model-export de.tudarmstadt.ukp.inception.app - inception-api + inception-export-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-constraints/src/main/java/de/tudarmstadt/ukp/clarin/webanno/constraints/ConstraintsServiceEventAdapter.java b/inception/inception-constraints/src/main/java/de/tudarmstadt/ukp/clarin/webanno/constraints/ConstraintsServiceEventAdapter.java index 5d988799eb2..ea4cc5d684b 100644 --- a/inception/inception-constraints/src/main/java/de/tudarmstadt/ukp/clarin/webanno/constraints/ConstraintsServiceEventAdapter.java +++ b/inception/inception-constraints/src/main/java/de/tudarmstadt/ukp/clarin/webanno/constraints/ConstraintsServiceEventAdapter.java @@ -21,8 +21,8 @@ import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; -import de.tudarmstadt.ukp.clarin.webanno.api.event.BeforeProjectRemovedEvent; import de.tudarmstadt.ukp.clarin.webanno.model.ConstraintSet; +import de.tudarmstadt.ukp.inception.project.api.event.BeforeProjectRemovedEvent; @Component public class ConstraintsServiceEventAdapter diff --git a/inception/inception-constraints/src/main/java/de/tudarmstadt/ukp/clarin/webanno/constraints/ConstraintsServiceImpl.java b/inception/inception-constraints/src/main/java/de/tudarmstadt/ukp/clarin/webanno/constraints/ConstraintsServiceImpl.java index 20a774ec712..bccf810d5ad 100644 --- a/inception/inception-constraints/src/main/java/de/tudarmstadt/ukp/clarin/webanno/constraints/ConstraintsServiceImpl.java +++ b/inception/inception-constraints/src/main/java/de/tudarmstadt/ukp/clarin/webanno/constraints/ConstraintsServiceImpl.java @@ -17,8 +17,8 @@ */ package de.tudarmstadt.ukp.clarin.webanno.constraints; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.PROJECT_FOLDER; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.withProjectLogger; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.PROJECT_FOLDER; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.withProjectLogger; import static java.util.Objects.isNull; import java.io.File; diff --git a/inception/inception-curation/pom.xml b/inception/inception-curation/pom.xml index f470cf39357..0ddaa61e389 100644 --- a/inception/inception-curation/pom.xml +++ b/inception/inception-curation/pom.xml @@ -33,6 +33,10 @@ de.tudarmstadt.ukp.inception.app inception-api-annotation + + de.tudarmstadt.ukp.inception.app + inception-project-api + de.tudarmstadt.ukp.inception.app inception-documents diff --git a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/config/CurationDocumentServiceAutoConfiguration.java b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/config/CurationDocumentServiceAutoConfiguration.java index 8722bdaaf1a..e1e5d837749 100644 --- a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/config/CurationDocumentServiceAutoConfiguration.java +++ b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/config/CurationDocumentServiceAutoConfiguration.java @@ -24,10 +24,10 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; import de.tudarmstadt.ukp.inception.curation.service.CurationDocumentService; import de.tudarmstadt.ukp.inception.curation.service.CurationDocumentServiceImpl; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; @Configuration diff --git a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/service/CurationDocumentServiceImpl.java b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/service/CurationDocumentServiceImpl.java index 123cc0ff0ed..b53deb5c43d 100644 --- a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/service/CurationDocumentServiceImpl.java +++ b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/service/CurationDocumentServiceImpl.java @@ -36,7 +36,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.ConcurentCasModificationException; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; @@ -46,6 +45,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocumentState; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.inception.curation.config.CurationDocumentServiceAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; /** diff --git a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/settings/CurationProjectSettingsPanel.java b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/settings/CurationProjectSettingsPanel.java index 083bf9884af..6ae6f495819 100644 --- a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/settings/CurationProjectSettingsPanel.java +++ b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/settings/CurationProjectSettingsPanel.java @@ -27,12 +27,12 @@ import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.spring.injection.annot.SpringBean; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxButton; import de.tudarmstadt.ukp.clarin.webanno.ui.core.settings.ProjectSettingsPanelBase; import de.tudarmstadt.ukp.inception.curation.model.CurationWorkflow; import de.tudarmstadt.ukp.inception.curation.service.CurationService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; public class CurationProjectSettingsPanel extends ProjectSettingsPanelBase 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 dbcd83a87c7..b809e1bc8f9 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 @@ -41,7 +41,6 @@ import org.springframework.util.FileSystemUtils; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; @@ -57,6 +56,7 @@ import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.documents.api.RepositoryAutoConfiguration; import de.tudarmstadt.ukp.inception.documents.config.DocumentServiceAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; diff --git a/inception/inception-diam-editor/pom.xml b/inception/inception-diam-editor/pom.xml index 5604157377b..a47b48306b7 100644 --- a/inception/inception-diam-editor/pom.xml +++ b/inception/inception-diam-editor/pom.xml @@ -56,7 +56,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-diam-editor/src/main/java/de/tudarmstadt/ukp/inception/diam/sidebar/preferences/DiamSidebarManagerPrefPanel.java b/inception/inception-diam-editor/src/main/java/de/tudarmstadt/ukp/inception/diam/sidebar/preferences/DiamSidebarManagerPrefPanel.java index 3c5f0c5de07..11dedffb207 100644 --- a/inception/inception-diam-editor/src/main/java/de/tudarmstadt/ukp/inception/diam/sidebar/preferences/DiamSidebarManagerPrefPanel.java +++ b/inception/inception-diam-editor/src/main/java/de/tudarmstadt/ukp/inception/diam/sidebar/preferences/DiamSidebarManagerPrefPanel.java @@ -26,11 +26,11 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.spring.injection.annot.SpringBean; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaForm; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorRegistry; import de.tudarmstadt.ukp.inception.preferences.PreferencesService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; public class DiamSidebarManagerPrefPanel extends Panel diff --git a/inception/inception-diam/pom.xml b/inception/inception-diam/pom.xml index 40fdbaadbbb..902e27e656a 100644 --- a/inception/inception-diam/pom.xml +++ b/inception/inception-diam/pom.xml @@ -34,6 +34,10 @@ de.tudarmstadt.ukp.inception.app inception-documents-api + + de.tudarmstadt.ukp.inception.app + inception-project-api + de.tudarmstadt.ukp.inception.app inception-api-diam diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/service/DiamWebsocketController.java b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/service/DiamWebsocketController.java index 4fc71f3e104..b5a040a4bab 100644 --- a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/service/DiamWebsocketController.java +++ b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/service/DiamWebsocketController.java @@ -56,7 +56,6 @@ import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.preferences.UserPreferencesService; import de.tudarmstadt.ukp.clarin.webanno.api.event.AfterCasWrittenEvent; import de.tudarmstadt.ukp.clarin.webanno.api.event.TransientAnnotationStateChangedEvent; @@ -74,6 +73,7 @@ import de.tudarmstadt.ukp.inception.diam.model.websocket.ViewportState; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.rendering.pipeline.RenderingPipeline; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequest; import de.tudarmstadt.ukp.inception.rendering.vmodel.serialization.VDocumentSerializerExtensionPoint; diff --git a/inception/inception-diam/src/test/java/de/tudarmstadt/ukp/inception/diam/service/DiamWebsocketController_ViewportRoutingTest.java b/inception/inception-diam/src/test/java/de/tudarmstadt/ukp/inception/diam/service/DiamWebsocketController_ViewportRoutingTest.java index d88dc8be3b3..18a474e9a72 100644 --- a/inception/inception-diam/src/test/java/de/tudarmstadt/ukp/inception/diam/service/DiamWebsocketController_ViewportRoutingTest.java +++ b/inception/inception-diam/src/test/java/de/tudarmstadt/ukp/inception/diam/service/DiamWebsocketController_ViewportRoutingTest.java @@ -73,7 +73,6 @@ import org.springframework.web.socket.client.standard.StandardWebSocketClient; import org.springframework.web.socket.messaging.WebSocketStompClient; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.config.AnnotationAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.rendering.PreRenderer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; @@ -100,6 +99,7 @@ import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.documents.config.DocumentServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.export.config.DocumentImportExportServiceAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequest; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; diff --git a/inception/inception-documents-api/src/test/java/de/tudarmstadt/ukp/inception/documents/api/SourceDocumentStateStatsTest.java b/inception/inception-documents-api/src/test/java/de/tudarmstadt/ukp/inception/documents/api/SourceDocumentStateStatsTest.java index d08bb854f2f..59ace2c3eba 100644 --- a/inception/inception-documents-api/src/test/java/de/tudarmstadt/ukp/inception/documents/api/SourceDocumentStateStatsTest.java +++ b/inception/inception-documents-api/src/test/java/de/tudarmstadt/ukp/inception/documents/api/SourceDocumentStateStatsTest.java @@ -29,8 +29,6 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import de.tudarmstadt.ukp.inception.documents.api.SourceDocumentStateStats; - public class SourceDocumentStateStatsTest { Random rnd = new Random(); diff --git a/inception/inception-documents/pom.xml b/inception/inception-documents/pom.xml index 0d4803df977..17098a936fb 100644 --- a/inception/inception-documents/pom.xml +++ b/inception/inception-documents/pom.xml @@ -70,6 +70,10 @@ de.tudarmstadt.ukp.inception.app inception-api + + de.tudarmstadt.ukp.inception.app + inception-project-api + de.tudarmstadt.ukp.inception.app inception-support diff --git a/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/DocumentAccessImpl.java b/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/DocumentAccessImpl.java index 4a12fcc1d64..90171a33a9a 100644 --- a/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/DocumentAccessImpl.java +++ b/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/DocumentAccessImpl.java @@ -29,7 +29,6 @@ import org.slf4j.LoggerFactory; import org.springframework.security.access.AccessDeniedException; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -38,6 +37,7 @@ import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.documents.config.DocumentServiceAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; /** *

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 d64293d7598..0bdac564370 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 @@ -17,10 +17,6 @@ */ package de.tudarmstadt.ukp.inception.documents; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.DOCUMENT_FOLDER; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.PROJECT_FOLDER; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.SOURCE_FOLDER; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.withProjectLogger; import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasAccessMode.EXCLUSIVE_WRITE_ACCESS; import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasAccessMode.SHARED_READ_ONLY_ACCESS; import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasAccessMode.UNMANAGED_ACCESS; @@ -41,6 +37,10 @@ import static de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst.CURATION_USER; import static de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst.INITIAL_CAS_PSEUDO_USER; import static de.tudarmstadt.ukp.inception.annotation.storage.CasMetadataUtils.addOrUpdateCasMetadata; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.DOCUMENT_FOLDER; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.PROJECT_FOLDER; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.SOURCE_FOLDER; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.withProjectLogger; import static de.tudarmstadt.ukp.inception.support.text.TextUtils.containsAnyCharacterMatching; import static de.tudarmstadt.ukp.inception.support.text.TextUtils.endsWithMatching; import static de.tudarmstadt.ukp.inception.support.text.TextUtils.sortAndRemoveDuplicateCharacters; @@ -103,7 +103,6 @@ import org.springframework.transaction.annotation.Transactional; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; 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; @@ -113,7 +112,6 @@ import de.tudarmstadt.ukp.clarin.webanno.api.event.AfterDocumentResetEvent; import de.tudarmstadt.ukp.clarin.webanno.api.event.AnnotationStateChangeEvent; import de.tudarmstadt.ukp.clarin.webanno.api.event.BeforeDocumentRemovedEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.event.BeforeProjectRemovedEvent; import de.tudarmstadt.ukp.clarin.webanno.api.event.DocumentStateChangedEvent; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; @@ -130,6 +128,8 @@ import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.documents.api.SourceDocumentStateStats; import de.tudarmstadt.ukp.inception.documents.config.DocumentServiceAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; +import de.tudarmstadt.ukp.inception.project.api.event.BeforeProjectRemovedEvent; import de.tudarmstadt.ukp.inception.support.text.TextUtils; /** diff --git a/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/UpdateProjectStateTask.java b/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/UpdateProjectStateTask.java index 210b72e51ce..fa7c2ee2d3f 100644 --- a/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/UpdateProjectStateTask.java +++ b/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/UpdateProjectStateTask.java @@ -27,10 +27,10 @@ import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.documents.api.SourceDocumentStateStats; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.scheduling.DebouncingTask; public class UpdateProjectStateTask 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 153b491475c..3cbda5ae59e 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 @@ -25,7 +25,6 @@ import org.springframework.context.annotation.Configuration; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.inception.documents.DocumentAccess; @@ -34,6 +33,7 @@ import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.documents.exporters.SourceDocumentExporter; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; @Configuration public class DocumentServiceAutoConfiguration diff --git a/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/exporters/SourceDocumentExporter.java b/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/exporters/SourceDocumentExporter.java index ea25a7d2f95..29f6649271f 100644 --- a/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/exporters/SourceDocumentExporter.java +++ b/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/exporters/SourceDocumentExporter.java @@ -17,9 +17,9 @@ */ package de.tudarmstadt.ukp.inception.documents.exporters; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.DOCUMENT_FOLDER; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.PROJECT_FOLDER; import static de.tudarmstadt.ukp.clarin.webanno.support.io.FastIOUtils.copy; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.DOCUMENT_FOLDER; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.PROJECT_FOLDER; import static java.lang.System.currentTimeMillis; import static java.nio.file.Files.createDirectory; import static java.util.function.Function.identity; 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 7328b6b88a4..cc3ab9488ba 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 @@ -60,7 +60,6 @@ import org.springframework.context.ApplicationEventPublisher; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -76,6 +75,7 @@ import de.tudarmstadt.ukp.inception.annotation.storage.driver.filesystem.FileSystemCasStorageDriver; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; @ExtendWith(MockitoExtension.class) public class DocumentServiceImplConcurrencyTest diff --git a/inception/inception-export/pom.xml b/inception/inception-export/pom.xml index 9daebbe59b8..fc354c32cce 100644 --- a/inception/inception-export/pom.xml +++ b/inception/inception-export/pom.xml @@ -81,6 +81,10 @@ de.tudarmstadt.ukp.inception.app inception-api-formats + + de.tudarmstadt.ukp.inception.app + inception-project-api + org.apache.uima 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 1886c5c26b6..e6226639894 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 @@ -17,10 +17,6 @@ */ package de.tudarmstadt.ukp.inception.export; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.DOCUMENT_FOLDER; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.PROJECT_FOLDER; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.SOURCE_FOLDER; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.withProjectLogger; import static de.tudarmstadt.ukp.clarin.webanno.api.annotation.util.WebAnnoCasUtil.createSentence; import static de.tudarmstadt.ukp.clarin.webanno.api.annotation.util.WebAnnoCasUtil.createToken; import static de.tudarmstadt.ukp.clarin.webanno.api.annotation.util.WebAnnoCasUtil.exists; @@ -30,6 +26,10 @@ import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasAccessMode.UNMANAGED_ACCESS; import static de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst.CHAIN_TYPE; import static de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst.CURATION_USER; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.DOCUMENT_FOLDER; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.PROJECT_FOLDER; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.SOURCE_FOLDER; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.withProjectLogger; import static java.util.Collections.unmodifiableList; import static java.util.Collections.unmodifiableMap; import static java.util.Comparator.comparing; 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 2af32be5a5b..24b232212b5 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 @@ -25,7 +25,6 @@ import org.springframework.context.annotation.Lazy; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; import de.tudarmstadt.ukp.clarin.webanno.api.format.FormatSupport; import de.tudarmstadt.ukp.clarin.webanno.diag.ChecksRegistry; @@ -36,6 +35,7 @@ import de.tudarmstadt.ukp.inception.export.exporters.ProjectMetaInfExporter; import de.tudarmstadt.ukp.inception.export.exporters.ProjectSettingsExporter; import de.tudarmstadt.ukp.inception.io.xmi.XmiFormatSupport; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; @Configuration diff --git a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/exporters/ProjectLogExporter.java b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/exporters/ProjectLogExporter.java index 7cc912da918..c4e907ce550 100644 --- a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/exporters/ProjectLogExporter.java +++ b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/exporters/ProjectLogExporter.java @@ -27,7 +27,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; 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.ProjectExporter; @@ -36,6 +35,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.ZipUtils; import de.tudarmstadt.ukp.inception.export.config.DocumentImportExportServiceAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; /** *

diff --git a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/exporters/ProjectMetaInfExporter.java b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/exporters/ProjectMetaInfExporter.java index 1ed841dbb92..cc6117610aa 100644 --- a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/exporters/ProjectMetaInfExporter.java +++ b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/exporters/ProjectMetaInfExporter.java @@ -28,7 +28,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; 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.ProjectExporter; @@ -37,6 +36,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.ZipUtils; import de.tudarmstadt.ukp.inception.export.config.DocumentImportExportServiceAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; /** *

diff --git a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/exporters/ProjectSettingsExporter.java b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/exporters/ProjectSettingsExporter.java index 1c44c6d235e..177a21f38a5 100644 --- a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/exporters/ProjectSettingsExporter.java +++ b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/exporters/ProjectSettingsExporter.java @@ -21,7 +21,6 @@ import java.io.IOException; import java.util.zip.ZipFile; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; 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.ProjectExporter; @@ -30,6 +29,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.ScriptDirection; import de.tudarmstadt.ukp.inception.export.config.DocumentImportExportServiceAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; /** *

diff --git a/inception/inception-export/src/test/java/de/tudarmstadt/ukp/inception/export/exporters/ProjectPermissionsExporterTest.java b/inception/inception-export/src/test/java/de/tudarmstadt/ukp/inception/export/exporters/ProjectPermissionsExporterTest.java index fb0e4306c09..2efcb3a0bf1 100644 --- a/inception/inception-export/src/test/java/de/tudarmstadt/ukp/inception/export/exporters/ProjectPermissionsExporterTest.java +++ b/inception/inception-export/src/test/java/de/tudarmstadt/ukp/inception/export/exporters/ProjectPermissionsExporterTest.java @@ -45,7 +45,6 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; 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; @@ -56,6 +55,7 @@ import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.clarin.webanno.support.ApplicationContextProvider; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; @ExtendWith(MockitoExtension.class) public class ProjectPermissionsExporterTest diff --git a/inception/inception-guidelines/pom.xml b/inception/inception-guidelines/pom.xml index 926fffe0013..25f7ed1c076 100644 --- a/inception/inception-guidelines/pom.xml +++ b/inception/inception-guidelines/pom.xml @@ -65,6 +65,10 @@ de.tudarmstadt.ukp.inception.app inception-api + + de.tudarmstadt.ukp.inception.app + inception-project-api + org.apache.wicket diff --git a/inception/inception-guidelines/src/main/java/de/tudarmstadt/ukp/inception/guidelines/GuidelinesServiceImpl.java b/inception/inception-guidelines/src/main/java/de/tudarmstadt/ukp/inception/guidelines/GuidelinesServiceImpl.java index fe6f3cac436..93bbe96127c 100644 --- a/inception/inception-guidelines/src/main/java/de/tudarmstadt/ukp/inception/guidelines/GuidelinesServiceImpl.java +++ b/inception/inception-guidelines/src/main/java/de/tudarmstadt/ukp/inception/guidelines/GuidelinesServiceImpl.java @@ -17,8 +17,8 @@ */ package de.tudarmstadt.ukp.inception.guidelines; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.PROJECT_FOLDER; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.withProjectLogger; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.PROJECT_FOLDER; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.withProjectLogger; import static java.nio.file.Files.newDirectoryStream; import static org.apache.commons.io.IOUtils.copyLarge; diff --git a/inception/inception-imls-stringmatch/pom.xml b/inception/inception-imls-stringmatch/pom.xml index 8a928ba8bc9..c3abe86c094 100644 --- a/inception/inception-imls-stringmatch/pom.xml +++ b/inception/inception-imls-stringmatch/pom.xml @@ -44,7 +44,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-imls-stringmatch/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/stringmatch/span/gazeteer/GazeteerServiceImpl.java b/inception/inception-imls-stringmatch/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/stringmatch/span/gazeteer/GazeteerServiceImpl.java index da2090c068d..7d5f5548ca0 100644 --- a/inception/inception-imls-stringmatch/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/stringmatch/span/gazeteer/GazeteerServiceImpl.java +++ b/inception/inception-imls-stringmatch/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/stringmatch/span/gazeteer/GazeteerServiceImpl.java @@ -21,7 +21,7 @@ */ package de.tudarmstadt.ukp.inception.recommendation.imls.stringmatch.span.gazeteer; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.withProjectLogger; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.withProjectLogger; import static java.nio.charset.StandardCharsets.UTF_8; import static org.apache.commons.lang3.StringUtils.trimToNull; diff --git a/inception/inception-imls-weblicht/pom.xml b/inception/inception-imls-weblicht/pom.xml index 92f558ad2f0..a1d0c0e0a99 100644 --- a/inception/inception-imls-weblicht/pom.xml +++ b/inception/inception-imls-weblicht/pom.xml @@ -61,7 +61,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-imls-weblicht/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/weblicht/chains/WeblichtChainServiceImpl.java b/inception/inception-imls-weblicht/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/weblicht/chains/WeblichtChainServiceImpl.java index 622de73f1dd..f44b74bf139 100644 --- a/inception/inception-imls-weblicht/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/weblicht/chains/WeblichtChainServiceImpl.java +++ b/inception/inception-imls-weblicht/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/weblicht/chains/WeblichtChainServiceImpl.java @@ -21,7 +21,7 @@ */ package de.tudarmstadt.ukp.inception.recommendation.imls.weblicht.chains; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.withProjectLogger; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.withProjectLogger; import java.io.File; import java.io.FileOutputStream; diff --git a/inception/inception-kb-fact-linking/pom.xml b/inception/inception-kb-fact-linking/pom.xml index b57abd83ae7..436bce111ae 100644 --- a/inception/inception-kb-fact-linking/pom.xml +++ b/inception/inception-kb-fact-linking/pom.xml @@ -41,7 +41,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/initializers/FactLayerInitializer.java b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/initializers/FactLayerInitializer.java index f1aa2e5c136..74f84d7e688 100644 --- a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/initializers/FactLayerInitializer.java +++ b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/initializers/FactLayerInitializer.java @@ -30,7 +30,6 @@ import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.LinkMode; @@ -43,6 +42,7 @@ import de.tudarmstadt.ukp.inception.kb.factlinking.config.FactLinkingAutoConfiguration; import de.tudarmstadt.ukp.inception.kb.factlinking.feature.FactLinkingConstants; import de.tudarmstadt.ukp.inception.kb.factlinking.feature.PropertyFeatureSupport; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; /** diff --git a/inception/inception-kb/pom.xml b/inception/inception-kb/pom.xml index dfe85a34818..a539688c24e 100644 --- a/inception/inception-kb/pom.xml +++ b/inception/inception-kb/pom.xml @@ -32,7 +32,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseServiceImpl.java b/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseServiceImpl.java index cc55d7620f6..5f13b00e609 100644 --- a/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseServiceImpl.java +++ b/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseServiceImpl.java @@ -17,10 +17,10 @@ */ package de.tudarmstadt.ukp.inception.kb; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.withProjectLogger; import static de.tudarmstadt.ukp.inception.kb.http.PerThreadSslCheckingHttpClientUtils.restoreSslVerification; import static de.tudarmstadt.ukp.inception.kb.http.PerThreadSslCheckingHttpClientUtils.skipCertificateChecks; import static de.tudarmstadt.ukp.inception.kb.querybuilder.SPARQLQueryBuilder.DEFAULT_LIMIT; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.withProjectLogger; import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; import static java.util.stream.Collectors.toList; import static org.apache.commons.lang3.StringUtils.isNotBlank; @@ -115,7 +115,6 @@ import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; -import de.tudarmstadt.ukp.clarin.webanno.api.event.BeforeProjectRemovedEvent; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.JSONUtil; import de.tudarmstadt.ukp.clarin.webanno.support.SettingsUtil; @@ -141,6 +140,7 @@ import de.tudarmstadt.ukp.inception.kb.reification.ReificationStrategy; import de.tudarmstadt.ukp.inception.kb.reification.WikiDataReification; import de.tudarmstadt.ukp.inception.kb.yaml.KnowledgeBaseProfile; +import de.tudarmstadt.ukp.inception.project.api.event.BeforeProjectRemovedEvent; import de.tudarmstadt.ukp.inception.security.client.auth.basic.BasicAuthenticationTraits; import de.tudarmstadt.ukp.inception.security.client.auth.oauth.MemoryOAuthSessionRepository; import de.tudarmstadt.ukp.inception.security.client.auth.oauth.OAuthAuthenticationClientImpl; diff --git a/inception/inception-log/pom.xml b/inception/inception-log/pom.xml index 360911778b5..6fb21a22efd 100644 --- a/inception/inception-log/pom.xml +++ b/inception/inception-log/pom.xml @@ -25,6 +25,10 @@ inception-log INCEpTION - Log + + de.tudarmstadt.ukp.inception.app + inception-project-api + de.tudarmstadt.ukp.inception.app inception-api diff --git a/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/AfterProjectCreatedEventAdapter.java b/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/AfterProjectCreatedEventAdapter.java index 6d734e42120..baa91f6d811 100644 --- a/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/AfterProjectCreatedEventAdapter.java +++ b/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/AfterProjectCreatedEventAdapter.java @@ -21,8 +21,8 @@ import org.springframework.stereotype.Component; -import de.tudarmstadt.ukp.clarin.webanno.api.event.AfterProjectCreatedEvent; import de.tudarmstadt.ukp.clarin.webanno.support.JSONUtil; +import de.tudarmstadt.ukp.inception.project.api.event.AfterProjectCreatedEvent; @Component public class AfterProjectCreatedEventAdapter diff --git a/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/AfterProjectRemovedEventAdapter.java b/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/AfterProjectRemovedEventAdapter.java index f1b0e9ef8d2..6325a7049c8 100644 --- a/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/AfterProjectRemovedEventAdapter.java +++ b/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/AfterProjectRemovedEventAdapter.java @@ -19,7 +19,7 @@ import org.springframework.stereotype.Component; -import de.tudarmstadt.ukp.clarin.webanno.api.event.AfterProjectRemovedEvent; +import de.tudarmstadt.ukp.inception.project.api.event.AfterProjectRemovedEvent; @Component public class AfterProjectRemovedEventAdapter diff --git a/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/BeforeProjectRemovedEventAdapter.java b/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/BeforeProjectRemovedEventAdapter.java index d793ca65e89..f71b9c20d9f 100644 --- a/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/BeforeProjectRemovedEventAdapter.java +++ b/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/BeforeProjectRemovedEventAdapter.java @@ -19,7 +19,7 @@ import org.springframework.stereotype.Component; -import de.tudarmstadt.ukp.clarin.webanno.api.event.BeforeProjectRemovedEvent; +import de.tudarmstadt.ukp.inception.project.api.event.BeforeProjectRemovedEvent; @Component public class BeforeProjectRemovedEventAdapter diff --git a/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/ProjectImportEventAdapter.java b/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/ProjectImportEventAdapter.java index d754beda933..a98c97bde29 100644 --- a/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/ProjectImportEventAdapter.java +++ b/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/ProjectImportEventAdapter.java @@ -19,7 +19,7 @@ import org.springframework.stereotype.Component; -import de.tudarmstadt.ukp.clarin.webanno.api.event.ProjectImportEvent; +import de.tudarmstadt.ukp.inception.project.api.event.ProjectImportEvent; @Deprecated @Component diff --git a/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/ProjectPermissionsChangedEventAdapter.java b/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/ProjectPermissionsChangedEventAdapter.java index b833564180d..8f4e031115c 100644 --- a/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/ProjectPermissionsChangedEventAdapter.java +++ b/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/ProjectPermissionsChangedEventAdapter.java @@ -25,10 +25,10 @@ import org.springframework.stereotype.Component; -import de.tudarmstadt.ukp.clarin.webanno.api.event.ProjectPermissionsChangedEvent; import de.tudarmstadt.ukp.clarin.webanno.model.PermissionLevel; import de.tudarmstadt.ukp.clarin.webanno.model.ProjectPermission; import de.tudarmstadt.ukp.clarin.webanno.support.JSONUtil; +import de.tudarmstadt.ukp.inception.project.api.event.ProjectPermissionsChangedEvent; @Component public class ProjectPermissionsChangedEventAdapter diff --git a/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/ProjectStateChangedEventAdapter.java b/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/ProjectStateChangedEventAdapter.java index e934600fcba..35cd5c2f1f3 100644 --- a/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/ProjectStateChangedEventAdapter.java +++ b/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/ProjectStateChangedEventAdapter.java @@ -22,9 +22,9 @@ import org.springframework.stereotype.Component; -import de.tudarmstadt.ukp.clarin.webanno.api.event.ProjectStateChangedEvent; import de.tudarmstadt.ukp.clarin.webanno.support.JSONUtil; import de.tudarmstadt.ukp.inception.log.model.StateChangeDetails; +import de.tudarmstadt.ukp.inception.project.api.event.ProjectStateChangedEvent; @Component public class ProjectStateChangedEventAdapter diff --git a/inception/inception-preferences/pom.xml b/inception/inception-preferences/pom.xml index bddf56dba1e..4e983eae9a1 100644 --- a/inception/inception-preferences/pom.xml +++ b/inception/inception-preferences/pom.xml @@ -99,7 +99,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api test diff --git a/inception/inception-preferences/src/test/java/de/tudarmstadt/ukp/inception/preferences/PreferencesServiceImplIntegrationTest.java b/inception/inception-preferences/src/test/java/de/tudarmstadt/ukp/inception/preferences/PreferencesServiceImplIntegrationTest.java index be68da79fb8..de8035a7e8f 100644 --- a/inception/inception-preferences/src/test/java/de/tudarmstadt/ukp/inception/preferences/PreferencesServiceImplIntegrationTest.java +++ b/inception/inception-preferences/src/test/java/de/tudarmstadt/ukp/inception/preferences/PreferencesServiceImplIntegrationTest.java @@ -37,13 +37,13 @@ import org.springframework.context.annotation.Import; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.config.ProjectServiceAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.config.SecurityAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.inception.documents.api.RepositoryAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; @DataJpaTest( // showSql = false, // diff --git a/inception/inception-project-api/LICENSE.txt b/inception/inception-project-api/LICENSE.txt new file mode 100644 index 00000000000..d6456956733 --- /dev/null +++ b/inception/inception-project-api/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/inception/inception-project-api/pom.xml b/inception/inception-project-api/pom.xml new file mode 100644 index 00000000000..a3305a8bcd4 --- /dev/null +++ b/inception/inception-project-api/pom.xml @@ -0,0 +1,65 @@ + + + 4.0.0 + + de.tudarmstadt.ukp.inception.app + inception-app + 30.0-SNAPSHOT + + inception-project-api + INCEpTION - Project - API + + + de.tudarmstadt.ukp.inception.app + inception-model + + + de.tudarmstadt.ukp.inception.app + inception-model-export + + + de.tudarmstadt.ukp.inception.app + inception-security + + + de.tudarmstadt.ukp.inception.app + inception-support + + + + org.slf4j + slf4j-api + + + + org.apache.commons + commons-lang3 + + + + + org.springframework + spring-context + + + org.springframework.security + spring-security-core + + + \ No newline at end of file diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/project/ProjectInitializer.java b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/ProjectInitializer.java similarity index 95% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/project/ProjectInitializer.java rename to inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/ProjectInitializer.java index 27d9f644150..8243e018948 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/project/ProjectInitializer.java +++ b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/ProjectInitializer.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.project; +package de.tudarmstadt.ukp.inception.project.api; import java.io.IOException; import java.util.List; diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/ProjectService.java b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/ProjectService.java similarity index 99% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/ProjectService.java rename to inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/ProjectService.java index ada04aed518..f07d185d0c3 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/ProjectService.java +++ b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/ProjectService.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.inception.project.api; import static de.tudarmstadt.ukp.clarin.webanno.support.logging.Logging.KEY_PROJECT_ID; import static de.tudarmstadt.ukp.clarin.webanno.support.logging.Logging.KEY_REPOSITORY_PATH; @@ -33,8 +33,6 @@ import org.slf4j.MDC; import org.springframework.security.access.prepost.PreAuthorize; -import de.tudarmstadt.ukp.clarin.webanno.api.event.ProjectStateChangedEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.PermissionLevel; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -46,6 +44,7 @@ import de.tudarmstadt.ukp.clarin.webanno.security.Realm; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.clarin.webanno.support.logging.MDCContext; +import de.tudarmstadt.ukp.inception.project.api.event.ProjectStateChangedEvent; public interface ProjectService { diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/AfterProjectCreatedEvent.java b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/AfterProjectCreatedEvent.java similarity index 95% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/AfterProjectCreatedEvent.java rename to inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/AfterProjectCreatedEvent.java index ccff5113675..61323c50a66 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/AfterProjectCreatedEvent.java +++ b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/AfterProjectCreatedEvent.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.event; +package de.tudarmstadt.ukp.inception.project.api.event; import org.springframework.context.ApplicationEvent; diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/AfterProjectRemovedEvent.java b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/AfterProjectRemovedEvent.java similarity index 95% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/AfterProjectRemovedEvent.java rename to inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/AfterProjectRemovedEvent.java index 9ea8b42ef92..990dda3b6cc 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/AfterProjectRemovedEvent.java +++ b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/AfterProjectRemovedEvent.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.event; +package de.tudarmstadt.ukp.inception.project.api.event; import org.springframework.context.ApplicationEvent; diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/BeforeProjectRemovedEvent.java b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/BeforeProjectRemovedEvent.java similarity index 95% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/BeforeProjectRemovedEvent.java rename to inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/BeforeProjectRemovedEvent.java index e940c9652b1..38528acbaa7 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/BeforeProjectRemovedEvent.java +++ b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/BeforeProjectRemovedEvent.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.event; +package de.tudarmstadt.ukp.inception.project.api.event; import org.springframework.context.ApplicationEvent; diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/ProjectImportEvent.java b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/ProjectImportEvent.java similarity index 96% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/ProjectImportEvent.java rename to inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/ProjectImportEvent.java index 2628e07a6ca..c9b5d36c405 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/ProjectImportEvent.java +++ b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/ProjectImportEvent.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.event; +package de.tudarmstadt.ukp.inception.project.api.event; import java.util.zip.ZipFile; diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/ProjectPermissionsChangedEvent.java b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/ProjectPermissionsChangedEvent.java similarity index 97% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/ProjectPermissionsChangedEvent.java rename to inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/ProjectPermissionsChangedEvent.java index c76dbcb401c..264b6428f86 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/ProjectPermissionsChangedEvent.java +++ b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/ProjectPermissionsChangedEvent.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.event; +package de.tudarmstadt.ukp.inception.project.api.event; import static java.util.Collections.unmodifiableList; diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/ProjectPermissionsEvent.java b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/ProjectPermissionsEvent.java similarity index 95% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/ProjectPermissionsEvent.java rename to inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/ProjectPermissionsEvent.java index 2c9c3edf682..2cf903990b7 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/ProjectPermissionsEvent.java +++ b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/ProjectPermissionsEvent.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.event; +package de.tudarmstadt.ukp.inception.project.api.event; import org.springframework.context.ApplicationEvent; diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/ProjectStateChangedEvent.java b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/ProjectStateChangedEvent.java similarity index 96% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/ProjectStateChangedEvent.java rename to inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/ProjectStateChangedEvent.java index 7dcaa0725ec..ef3c1da9a4f 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/ProjectStateChangedEvent.java +++ b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/ProjectStateChangedEvent.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.event; +package de.tudarmstadt.ukp.inception.project.api.event; import org.springframework.context.ApplicationEvent; diff --git a/inception/inception-project-export/pom.xml b/inception/inception-project-export/pom.xml index 6ab953b0e6c..0526fc222b1 100644 --- a/inception/inception-project-export/pom.xml +++ b/inception/inception-project-export/pom.xml @@ -42,6 +42,10 @@ de.tudarmstadt.ukp.inception.app inception-model + + de.tudarmstadt.ukp.inception.app + inception-project-api + de.tudarmstadt.ukp.inception.app inception-websocket diff --git a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/ProjectExportServiceImpl.java b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/ProjectExportServiceImpl.java index bdbbbbc3479..cb16a3314bc 100644 --- a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/ProjectExportServiceImpl.java +++ b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/ProjectExportServiceImpl.java @@ -17,9 +17,9 @@ */ package de.tudarmstadt.ukp.inception.project.export; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.withProjectLogger; import static de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportTaskState.NOT_STARTED; import static de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportTaskState.RUNNING; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.withProjectLogger; import static java.lang.System.currentTimeMillis; import static java.util.Arrays.asList; import static java.util.Collections.unmodifiableList; @@ -66,7 +66,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ConcurrentReferenceHashMap; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; 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.ProjectExportRequest_ImplBase; @@ -80,6 +79,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.ZipUtils; import de.tudarmstadt.ukp.clarin.webanno.support.logging.BaseLoggers; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.project.export.config.ProjectExportServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.project.export.model.ProjectExportTask; import de.tudarmstadt.ukp.inception.project.export.task.backup.BackupProjectExportTask; diff --git a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/config/ProjectExportServiceAutoConfiguration.java b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/config/ProjectExportServiceAutoConfiguration.java index efcafb8e096..17aa1b08630 100644 --- a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/config/ProjectExportServiceAutoConfiguration.java +++ b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/config/ProjectExportServiceAutoConfiguration.java @@ -28,9 +28,9 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExporter; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.project.export.ProjectExportExtension; import de.tudarmstadt.ukp.inception.project.export.ProjectExportExtensionPoint; import de.tudarmstadt.ukp.inception.project.export.ProjectExportExtensionPointImpl; diff --git a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/controller/ExportServiceControllerImpl.java b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/controller/ExportServiceControllerImpl.java index b65c7271788..b14c3cc0cad 100644 --- a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/controller/ExportServiceControllerImpl.java +++ b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/controller/ExportServiceControllerImpl.java @@ -45,7 +45,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportTaskHandle; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportTaskMonitor; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportTaskState; @@ -53,6 +52,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.project.export.ProjectExportService; import de.tudarmstadt.ukp.inception.project.export.model.MProjectExportStateUpdate; import de.tudarmstadt.ukp.inception.project.export.model.RExportLogMessage; 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 c699a2c2c98..641bacee3b3 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 @@ -42,7 +42,6 @@ import org.wicketstuff.progressbar.ProgressBar; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; 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; @@ -54,6 +53,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.wicket.AjaxDownloadBehavior; import de.tudarmstadt.ukp.clarin.webanno.ui.core.settings.ProjectSettingsPanelBase; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.project.export.ProjectExportService; import de.tudarmstadt.ukp.inception.project.export.settings.FormatDropdownChoice; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; diff --git a/inception/inception-project-export/src/test/java/de/tudarmstadt/ukp/inception/project/export/controller/ExportServiceControllerImplTest.java b/inception/inception-project-export/src/test/java/de/tudarmstadt/ukp/inception/project/export/controller/ExportServiceControllerImplTest.java index 74b07bd833b..530c3870a36 100644 --- a/inception/inception-project-export/src/test/java/de/tudarmstadt/ukp/inception/project/export/controller/ExportServiceControllerImplTest.java +++ b/inception/inception-project-export/src/test/java/de/tudarmstadt/ukp/inception/project/export/controller/ExportServiceControllerImplTest.java @@ -69,7 +69,6 @@ import org.springframework.web.socket.client.standard.StandardWebSocketClient; import org.springframework.web.socket.messaging.WebSocketStompClient; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.PermissionLevel; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.config.ProjectServiceAutoConfiguration; @@ -84,6 +83,7 @@ import de.tudarmstadt.ukp.inception.documents.api.RepositoryAutoConfiguration; import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.documents.config.DocumentServiceAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.project.export.config.ProjectExportServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.support.findbugs.SuppressFBWarnings; diff --git a/inception/inception-project-initializers-basic/pom.xml b/inception/inception-project-initializers-basic/pom.xml index 0e8af8c0039..beb0d3f9a54 100644 --- a/inception/inception-project-initializers-basic/pom.xml +++ b/inception/inception-project-initializers-basic/pom.xml @@ -31,7 +31,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicProjectInitializer.java b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicProjectInitializer.java index 773c9293b56..58c5125a12f 100644 --- a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicProjectInitializer.java +++ b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicProjectInitializer.java @@ -27,9 +27,9 @@ import org.apache.wicket.request.resource.ResourceReference; import org.springframework.context.ApplicationContext; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.QuickProjectInitializer; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.basic.config.InceptionBasicProjectInitializersAutoConfiguration; /** diff --git a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationLayerInitializer.java b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationLayerInitializer.java index 8dd73fc8d2b..f4370ef8457 100644 --- a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationLayerInitializer.java +++ b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationLayerInitializer.java @@ -30,12 +30,12 @@ import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.LayerInitializer; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.basic.config.InceptionBasicProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; diff --git a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationRecommenderInitializer.java b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationRecommenderInitializer.java index 7462c0b3133..8df00967771 100644 --- a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationRecommenderInitializer.java +++ b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationRecommenderInitializer.java @@ -25,10 +25,10 @@ import java.io.IOException; import java.util.List; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.basic.config.InceptionBasicProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender; diff --git a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationTagSetInitializer.java b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationTagSetInitializer.java index 507d4ec6735..d860d42e9f9 100644 --- a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationTagSetInitializer.java +++ b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationTagSetInitializer.java @@ -23,10 +23,10 @@ import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TagSetInitializer; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.basic.config.InceptionBasicProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; diff --git a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanLayerInitializer.java b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanLayerInitializer.java index 6d33cc0d74e..02086b92cdc 100644 --- a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanLayerInitializer.java +++ b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanLayerInitializer.java @@ -28,13 +28,13 @@ import org.apache.uima.cas.CAS; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.LayerInitializer; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TokenLayerInitializer; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.basic.config.InceptionBasicProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; diff --git a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanRecommenderInitializer.java b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanRecommenderInitializer.java index 9b2a308239f..6793a227cf4 100644 --- a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanRecommenderInitializer.java +++ b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanRecommenderInitializer.java @@ -24,10 +24,10 @@ import java.io.IOException; import java.util.List; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.basic.config.InceptionBasicProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender; diff --git a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanTagSetInitializer.java b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanTagSetInitializer.java index 9dafe814c34..6477633b596 100644 --- a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanTagSetInitializer.java +++ b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanTagSetInitializer.java @@ -23,10 +23,10 @@ import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TagSetInitializer; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.basic.config.InceptionBasicProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; diff --git a/inception/inception-project-initializers-doclabeling/pom.xml b/inception/inception-project-initializers-doclabeling/pom.xml index cca1fb9e586..f8684288586 100644 --- a/inception/inception-project-initializers-doclabeling/pom.xml +++ b/inception/inception-project-initializers-doclabeling/pom.xml @@ -35,7 +35,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelLayerInitializer.java b/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelLayerInitializer.java index fb37a2c0c22..a5c890ff586 100644 --- a/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelLayerInitializer.java +++ b/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelLayerInitializer.java @@ -27,12 +27,12 @@ import org.apache.uima.cas.CAS; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.LayerInitializer; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.doclabeling.config.InceptionDocumentLabelingProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.ui.core.docanno.layer.DocumentMetadataLayerSupport; diff --git a/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelTagSetInitializer.java b/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelTagSetInitializer.java index b736e9bf1a9..ef8bd1ad206 100644 --- a/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelTagSetInitializer.java +++ b/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelTagSetInitializer.java @@ -23,11 +23,11 @@ import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.Tag; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TagSetInitializer; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.doclabeling.config.InceptionDocumentLabelingProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; diff --git a/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelingProjectInitializer.java b/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelingProjectInitializer.java index 8d91f09dfef..3a928168ed6 100644 --- a/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelingProjectInitializer.java +++ b/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelingProjectInitializer.java @@ -28,12 +28,12 @@ import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.QuickProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TokenLayerInitializer; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.sidebar.AnnotationSidebarState; import de.tudarmstadt.ukp.inception.preferences.PreferencesService; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.doclabeling.config.InceptionDocumentLabelingProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.ui.core.docanno.sidebar.DocumentMetadataSidebarFactory; import de.tudarmstadt.ukp.inception.workload.matrix.MatrixWorkloadExtension; diff --git a/inception/inception-project-initializers-sentencelabeling/pom.xml b/inception/inception-project-initializers-sentencelabeling/pom.xml index 86f607c972d..dab2ad32fd8 100644 --- a/inception/inception-project-initializers-sentencelabeling/pom.xml +++ b/inception/inception-project-initializers-sentencelabeling/pom.xml @@ -31,7 +31,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelLayerInitializer.java b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelLayerInitializer.java index 66e495dcad4..1407cc213b9 100644 --- a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelLayerInitializer.java +++ b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelLayerInitializer.java @@ -28,12 +28,12 @@ import org.apache.uima.cas.CAS; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.LayerInitializer; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.sentencelabeling.config.InceptionSentenceLabelingProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; diff --git a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelRecommenderInitializer.java b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelRecommenderInitializer.java index 35462db5f89..1bc0c6b9a7a 100644 --- a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelRecommenderInitializer.java +++ b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelRecommenderInitializer.java @@ -24,10 +24,10 @@ import java.io.IOException; import java.util.List; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.sentencelabeling.config.InceptionSentenceLabelingProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender; diff --git a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelTagSetInitializer.java b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelTagSetInitializer.java index d8666200652..1432fc1d667 100644 --- a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelTagSetInitializer.java +++ b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelTagSetInitializer.java @@ -23,11 +23,11 @@ import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.Tag; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TagSetInitializer; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.sentencelabeling.config.InceptionSentenceLabelingProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; diff --git a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelingProjectInitializer.java b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelingProjectInitializer.java index b83d5f2d78e..7430bea3288 100644 --- a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelingProjectInitializer.java +++ b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelingProjectInitializer.java @@ -30,10 +30,10 @@ import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.QuickProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TokenLayerInitializer; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.sentencelabeling.config.InceptionSentenceLabelingProjectInitializersAutoConfiguration; /** diff --git a/inception/inception-project-initializers-ud/pom.xml b/inception/inception-project-initializers-ud/pom.xml index f3b33a17a91..d5cdbadf1d0 100644 --- a/inception/inception-project-initializers-ud/pom.xml +++ b/inception/inception-project-initializers-ud/pom.xml @@ -31,7 +31,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-project-initializers-ud/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/ud/UniversalDependenciesProjectInitializer.java b/inception/inception-project-initializers-ud/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/ud/UniversalDependenciesProjectInitializer.java index 03e9f6524e5..fcbb3901810 100644 --- a/inception/inception-project-initializers-ud/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/ud/UniversalDependenciesProjectInitializer.java +++ b/inception/inception-project-initializers-ud/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/ud/UniversalDependenciesProjectInitializer.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.Optional; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.DependencyLayerInitializer; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.LemmaLayerInitializer; @@ -33,6 +32,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.SurfaceFormLayerInitializer; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TokenLayerInitializer; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; /** *

diff --git a/inception/inception-project-initializers-wikidatalinking/pom.xml b/inception/inception-project-initializers-wikidatalinking/pom.xml index 5985c10d609..3483982e111 100644 --- a/inception/inception-project-initializers-wikidatalinking/pom.xml +++ b/inception/inception-project-initializers-wikidatalinking/pom.xml @@ -31,7 +31,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/EntityLinkingProjectInitializer.java b/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/EntityLinkingProjectInitializer.java index 26bd1593ab3..2d997db5111 100644 --- a/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/EntityLinkingProjectInitializer.java +++ b/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/EntityLinkingProjectInitializer.java @@ -24,13 +24,13 @@ import org.springframework.context.ApplicationContext; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.NamedEntityLayerInitializer; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.QuickProjectInitializer; import de.tudarmstadt.ukp.dkpro.core.api.ner.type.NamedEntity; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.wikidatalinking.config.WikiDataLinkingProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.ui.kb.initializers.NamedEntityIdentifierFeatureInitializer; diff --git a/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/NamedEntityIdentifierStringRecommenderInitializer.java b/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/NamedEntityIdentifierStringRecommenderInitializer.java index 7d9cb5ee3f3..65bccab4020 100644 --- a/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/NamedEntityIdentifierStringRecommenderInitializer.java +++ b/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/NamedEntityIdentifierStringRecommenderInitializer.java @@ -22,11 +22,11 @@ import java.io.IOException; import java.util.List; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.dkpro.core.api.ner.type.NamedEntity; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.wikidatalinking.config.WikiDataLinkingProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender; diff --git a/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/WikiDataKnowledgeBaseInitializer.java b/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/WikiDataKnowledgeBaseInitializer.java index 5bb1cff48cf..a3e5cada50a 100644 --- a/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/WikiDataKnowledgeBaseInitializer.java +++ b/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/WikiDataKnowledgeBaseInitializer.java @@ -24,12 +24,12 @@ import org.eclipse.rdf4j.repository.config.RepositoryImplConfig; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.inception.kb.KnowledgeBaseService; import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBaseProperties; import de.tudarmstadt.ukp.inception.kb.model.KnowledgeBase; import de.tudarmstadt.ukp.inception.kb.yaml.KnowledgeBaseProfile; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.wikidatalinking.config.WikiDataLinkingProjectInitializersAutoConfiguration; /** diff --git a/inception/inception-project-initializers/pom.xml b/inception/inception-project-initializers/pom.xml index 31fde127d25..2915c2e019c 100644 --- a/inception/inception-project-initializers/pom.xml +++ b/inception/inception-project-initializers/pom.xml @@ -35,7 +35,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/ChunkLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/ChunkLayerInitializer.java index de96d74dcf7..aec03a48d2c 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/ChunkLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/ChunkLayerInitializer.java @@ -26,7 +26,6 @@ import org.apache.uima.cas.CAS; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnchoringMode; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; @@ -34,6 +33,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.dkpro.core.api.syntax.type.chunk.Chunk; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; /** diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceLayerInitializer.java index 8a2ef4518d8..82f5d81f2cf 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceLayerInitializer.java @@ -26,7 +26,6 @@ import org.apache.uima.cas.CAS; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnchoringMode; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; @@ -34,6 +33,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; /** diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceRelationTagSetInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceRelationTagSetInitializer.java index 69e405e656a..bbe76f8e201 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceRelationTagSetInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceRelationTagSetInitializer.java @@ -26,9 +26,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; /** diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceTypeTagSetInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceTypeTagSetInitializer.java index 64eb8fceea7..9cde9de3480 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceTypeTagSetInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceTypeTagSetInitializer.java @@ -26,9 +26,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; /** diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyFlavorTagSetInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyFlavorTagSetInitializer.java index a5d2f37de8b..703f8d85f04 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyFlavorTagSetInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyFlavorTagSetInitializer.java @@ -26,9 +26,9 @@ import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; /** diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyLayerInitializer.java index a1fa1db265e..1699e4e0e7f 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyLayerInitializer.java @@ -28,7 +28,6 @@ import org.apache.uima.cas.CAS; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -36,6 +35,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.dkpro.core.api.syntax.type.dependency.Dependency; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; /** diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyTypeTagSetInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyTypeTagSetInitializer.java index cb642499ecd..9881b3f4382 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyTypeTagSetInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyTypeTagSetInitializer.java @@ -26,9 +26,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; /** diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/LayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/LayerInitializer.java index 71c33969053..97983123525 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/LayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/LayerInitializer.java @@ -17,7 +17,7 @@ */ package de.tudarmstadt.ukp.clarin.webanno.project.initializers; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; public interface LayerInitializer extends ProjectInitializer diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/LemmaLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/LemmaLayerInitializer.java index 23a018f34c9..e1a49e4ef9b 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/LemmaLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/LemmaLayerInitializer.java @@ -28,13 +28,13 @@ import org.apache.uima.cas.CAS; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Lemma; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; /** diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/MorphologicalFeaturesLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/MorphologicalFeaturesLayerInitializer.java index 854553e6dfd..730c98d7460 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/MorphologicalFeaturesLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/MorphologicalFeaturesLayerInitializer.java @@ -28,13 +28,13 @@ import org.apache.uima.cas.CAS; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.dkpro.core.api.lexmorph.type.morph.MorphologicalFeatures; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; /** diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/NamedEntityLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/NamedEntityLayerInitializer.java index 1c0e71894aa..3ea9a30d83e 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/NamedEntityLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/NamedEntityLayerInitializer.java @@ -26,7 +26,6 @@ import org.apache.uima.cas.CAS; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnchoringMode; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; @@ -35,6 +34,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.dkpro.core.api.ner.type.NamedEntity; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; /** diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/NamedEntityTagSetInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/NamedEntityTagSetInitializer.java index 54379c35820..c026836af72 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/NamedEntityTagSetInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/NamedEntityTagSetInitializer.java @@ -26,9 +26,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; /** diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/OrthographyLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/OrthographyLayerInitializer.java index bca0fe29ec4..b6a3b33b253 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/OrthographyLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/OrthographyLayerInitializer.java @@ -26,7 +26,6 @@ import org.apache.uima.cas.CAS; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnchoringMode; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; @@ -35,6 +34,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.dkpro.core.api.transform.type.SofaChangeAnnotation; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; /** diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/PartOfSpeechLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/PartOfSpeechLayerInitializer.java index af4be218195..18c813ec192 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/PartOfSpeechLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/PartOfSpeechLayerInitializer.java @@ -28,7 +28,6 @@ import org.apache.uima.cas.CAS; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -36,6 +35,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.dkpro.core.api.lexmorph.type.pos.POS; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; /** diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/PartOfSpeechTagSetInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/PartOfSpeechTagSetInitializer.java index 08062db48ad..0f2aa4e7c67 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/PartOfSpeechTagSetInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/PartOfSpeechTagSetInitializer.java @@ -26,9 +26,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; /** diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/QuickProjectInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/QuickProjectInitializer.java index e283bec5cb1..14719f1b38a 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/QuickProjectInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/QuickProjectInitializer.java @@ -21,7 +21,7 @@ import org.apache.wicket.request.resource.ResourceReference; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; public interface QuickProjectInitializer extends ProjectInitializer diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SemPredArgLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SemPredArgLayerInitializer.java index 881f83be1c5..7cae80bcc1c 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SemPredArgLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SemPredArgLayerInitializer.java @@ -26,7 +26,6 @@ import org.apache.uima.cas.CAS; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnchoringMode; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; @@ -38,6 +37,7 @@ import de.tudarmstadt.ukp.dkpro.core.api.semantics.type.SemArg; import de.tudarmstadt.ukp.dkpro.core.api.semantics.type.SemArgLink; import de.tudarmstadt.ukp.dkpro.core.api.semantics.type.SemPred; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; /** diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SentenceLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SentenceLayerInitializer.java index 0537fa1e9b7..9b7c0e1b7f2 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SentenceLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SentenceLayerInitializer.java @@ -28,11 +28,11 @@ import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Sentence; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; /** diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SofaChangeOperationTagSetInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SofaChangeOperationTagSetInitializer.java index 62c34bea530..32bb591b3c3 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SofaChangeOperationTagSetInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SofaChangeOperationTagSetInitializer.java @@ -23,9 +23,9 @@ import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; /** diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/StandardProjectInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/StandardProjectInitializer.java index e23712141c1..4d9865f7582 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/StandardProjectInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/StandardProjectInitializer.java @@ -25,10 +25,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SurfaceFormLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SurfaceFormLayerInitializer.java index 92427ab11c5..78025d192af 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SurfaceFormLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SurfaceFormLayerInitializer.java @@ -28,12 +28,12 @@ import org.apache.uima.cas.CAS; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.SurfaceForm; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; /** diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/TagSetInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/TagSetInitializer.java index df4603399fe..de34356e911 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/TagSetInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/TagSetInitializer.java @@ -17,7 +17,7 @@ */ package de.tudarmstadt.ukp.clarin.webanno.project.initializers; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; public interface TagSetInitializer extends ProjectInitializer diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/TokenLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/TokenLayerInitializer.java index 9fb46272ee5..ed03e689438 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/TokenLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/TokenLayerInitializer.java @@ -28,11 +28,11 @@ import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; /** diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/config/ProjectInitializersAutoConfiguration.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/config/ProjectInitializersAutoConfiguration.java index 9721b76a5a3..91721fee3b1 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/config/ProjectInitializersAutoConfiguration.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/config/ProjectInitializersAutoConfiguration.java @@ -21,7 +21,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.ChunkLayerInitializer; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.CoreferenceLayerInitializer; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.CoreferenceRelationTagSetInitializer; @@ -43,6 +42,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.SurfaceFormLayerInitializer; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TokenLayerInitializer; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.empty.EmptyProjectInitializer; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; @Configuration diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/empty/EmptyProjectInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/empty/EmptyProjectInitializer.java index c5d387798ab..0ee8fbbc4f2 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/empty/EmptyProjectInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/empty/EmptyProjectInitializer.java @@ -23,12 +23,12 @@ import java.util.List; import java.util.Optional; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.QuickProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.SentenceLayerInitializer; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TokenLayerInitializer; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; /** *

diff --git a/inception/inception-project/pom.xml b/inception/inception-project/pom.xml index c7769c88511..3fefc4111db 100644 --- a/inception/inception-project/pom.xml +++ b/inception/inception-project/pom.xml @@ -56,7 +56,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/ProjectAccessImpl.java b/inception/inception-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/ProjectAccessImpl.java index 68be2a91a16..fa1ce9ae1db 100644 --- a/inception/inception-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/ProjectAccessImpl.java +++ b/inception/inception-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/ProjectAccessImpl.java @@ -24,12 +24,12 @@ import org.slf4j.LoggerFactory; import org.springframework.security.access.AccessDeniedException; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.PermissionLevel; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.config.ProjectServiceAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; /** *

diff --git a/inception/inception-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/ProjectPermissionExtension.java b/inception/inception-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/ProjectPermissionExtension.java index 277d210733f..6794e564de4 100644 --- a/inception/inception-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/ProjectPermissionExtension.java +++ b/inception/inception-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/ProjectPermissionExtension.java @@ -24,13 +24,13 @@ import org.springframework.security.core.Authentication; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.PermissionLevel; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.config.ProjectServiceAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.security.PermissionExtension; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; /** *

diff --git a/inception/inception-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/ProjectServiceImpl.java b/inception/inception-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/ProjectServiceImpl.java index 0bc69153d45..a66dccea799 100644 --- a/inception/inception-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/ProjectServiceImpl.java +++ b/inception/inception-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/ProjectServiceImpl.java @@ -17,7 +17,6 @@ */ package de.tudarmstadt.ukp.clarin.webanno.project; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.withProjectLogger; import static de.tudarmstadt.ukp.clarin.webanno.model.PermissionLevel.ANNOTATOR; import static de.tudarmstadt.ukp.clarin.webanno.model.PermissionLevel.CURATOR; import static de.tudarmstadt.ukp.clarin.webanno.model.PermissionLevel.MANAGER; @@ -26,6 +25,7 @@ import static de.tudarmstadt.ukp.clarin.webanno.model.Project.isValidProjectSlug; import static de.tudarmstadt.ukp.clarin.webanno.model.Project.isValidProjectSlugInitialCharacter; import static de.tudarmstadt.ukp.clarin.webanno.security.UserDao.REALM_PROJECT_PREFIX; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.withProjectLogger; import static java.lang.Math.min; import static java.lang.String.join; import static java.util.Arrays.asList; @@ -82,13 +82,6 @@ import org.springframework.core.annotation.AnnotationAwareOrderComparator; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; -import de.tudarmstadt.ukp.clarin.webanno.api.event.AfterProjectCreatedEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.event.AfterProjectRemovedEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.event.BeforeProjectRemovedEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.event.ProjectPermissionsChangedEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.event.ProjectStateChangedEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; import de.tudarmstadt.ukp.clarin.webanno.model.PermissionLevel; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -102,6 +95,13 @@ import de.tudarmstadt.ukp.clarin.webanno.support.io.FastIOUtils; import de.tudarmstadt.ukp.clarin.webanno.support.logging.BaseLoggers; import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; +import de.tudarmstadt.ukp.inception.project.api.event.AfterProjectCreatedEvent; +import de.tudarmstadt.ukp.inception.project.api.event.AfterProjectRemovedEvent; +import de.tudarmstadt.ukp.inception.project.api.event.BeforeProjectRemovedEvent; +import de.tudarmstadt.ukp.inception.project.api.event.ProjectPermissionsChangedEvent; +import de.tudarmstadt.ukp.inception.project.api.event.ProjectStateChangedEvent; /** *

diff --git a/inception/inception-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/config/ProjectServiceAutoConfiguration.java b/inception/inception-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/config/ProjectServiceAutoConfiguration.java index 077fcf9bb22..4b4d37b9679 100644 --- a/inception/inception-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/config/ProjectServiceAutoConfiguration.java +++ b/inception/inception-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/config/ProjectServiceAutoConfiguration.java @@ -28,8 +28,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.project.ProjectAccess; import de.tudarmstadt.ukp.clarin.webanno.project.ProjectAccessImpl; import de.tudarmstadt.ukp.clarin.webanno.project.ProjectPermissionExtension; @@ -37,6 +35,8 @@ import de.tudarmstadt.ukp.clarin.webanno.project.exporters.ProjectPermissionsExporter; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; @Configuration public class ProjectServiceAutoConfiguration diff --git a/inception/inception-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/exporters/ProjectPermissionsExporter.java b/inception/inception-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/exporters/ProjectPermissionsExporter.java index 7bbe1941aba..70c95afc749 100644 --- a/inception/inception-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/exporters/ProjectPermissionsExporter.java +++ b/inception/inception-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/exporters/ProjectPermissionsExporter.java @@ -39,7 +39,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; 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.ProjectExporter; @@ -52,6 +51,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.config.ProjectServiceAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; /** *

diff --git a/inception/inception-project/src/test/java/de/tudarmstadt/ukp/clarin/webanno/project/ProjectServiceImplTest.java b/inception/inception-project/src/test/java/de/tudarmstadt/ukp/clarin/webanno/project/ProjectServiceImplTest.java index a7d33c5a356..438fd24f469 100644 --- a/inception/inception-project/src/test/java/de/tudarmstadt/ukp/clarin/webanno/project/ProjectServiceImplTest.java +++ b/inception/inception-project/src/test/java/de/tudarmstadt/ukp/clarin/webanno/project/ProjectServiceImplTest.java @@ -49,7 +49,6 @@ import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.annotation.Import; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.ProjectPermission; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; @@ -59,6 +58,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.logging.Logging; import de.tudarmstadt.ukp.inception.documents.api.RepositoryAutoConfiguration; import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; @DataJpaTest( // excludeAutoConfiguration = LiquibaseAutoConfiguration.class, // diff --git a/inception/inception-recommendation/pom.xml b/inception/inception-recommendation/pom.xml index 6fb7d9b6840..015ad993541 100644 --- a/inception/inception-recommendation/pom.xml +++ b/inception/inception-recommendation/pom.xml @@ -61,6 +61,10 @@ de.tudarmstadt.ukp.inception.app inception-api + + de.tudarmstadt.ukp.inception.app + inception-project-api + de.tudarmstadt.ukp.inception.app inception-diam diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/config/RecommenderServiceAutoConfiguration.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/config/RecommenderServiceAutoConfiguration.java index 1e961574bf9..15be093928c 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/config/RecommenderServiceAutoConfiguration.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/config/RecommenderServiceAutoConfiguration.java @@ -32,10 +32,10 @@ import org.springframework.context.annotation.Lazy; import org.springframework.security.core.session.SessionRegistry; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.preferences.PreferencesService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.recommendation.RecommendationEditorExtension; import de.tudarmstadt.ukp.inception.recommendation.actionbar.RecommenderActionBarExtension; import de.tudarmstadt.ukp.inception.recommendation.api.LearningRecordService; diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/service/RecommendationServiceImpl.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/service/RecommendationServiceImpl.java index 174b9805fbe..5ccbc837b05 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/service/RecommendationServiceImpl.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/service/RecommendationServiceImpl.java @@ -116,15 +116,12 @@ import org.springframework.security.core.session.SessionRegistry; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.util.WebAnnoCasUtil; import de.tudarmstadt.ukp.clarin.webanno.api.event.AfterCasWrittenEvent; import de.tudarmstadt.ukp.clarin.webanno.api.event.AfterDocumentCreatedEvent; import de.tudarmstadt.ukp.clarin.webanno.api.event.AfterDocumentResetEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.event.AfterProjectRemovedEvent; import de.tudarmstadt.ukp.clarin.webanno.api.event.BeforeDocumentRemovedEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.event.BeforeProjectRemovedEvent; import de.tudarmstadt.ukp.clarin.webanno.model.AnchoringMode; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; @@ -151,6 +148,9 @@ import de.tudarmstadt.ukp.inception.annotation.storage.CasStorageSession; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.preferences.PreferencesService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; +import de.tudarmstadt.ukp.inception.project.api.event.AfterProjectRemovedEvent; +import de.tudarmstadt.ukp.inception.project.api.event.BeforeProjectRemovedEvent; import de.tudarmstadt.ukp.inception.recommendation.api.LearningRecordService; import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.api.RecommenderFactoryRegistry; diff --git a/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/footer/RecommendationEventWebsocketControllerImplTest.java b/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/footer/RecommendationEventWebsocketControllerImplTest.java index c5b1526d2b3..541351e5a0d 100644 --- a/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/footer/RecommendationEventWebsocketControllerImplTest.java +++ b/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/footer/RecommendationEventWebsocketControllerImplTest.java @@ -62,7 +62,6 @@ import org.springframework.web.socket.client.standard.StandardWebSocketClient; import org.springframework.web.socket.messaging.WebSocketStompClient; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.diag.config.CasDoctorAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.model.PermissionLevel; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -80,6 +79,7 @@ import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.documents.config.DocumentServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.export.config.DocumentImportExportServiceAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.recommendation.event.RecommenderTaskNotificationEvent; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.support.findbugs.SuppressFBWarnings; diff --git a/inception/inception-remote/pom.xml b/inception/inception-remote/pom.xml index a00c985e466..028e939c62f 100644 --- a/inception/inception-remote/pom.xml +++ b/inception/inception-remote/pom.xml @@ -65,6 +65,10 @@ de.tudarmstadt.ukp.inception.app inception-api + + de.tudarmstadt.ukp.inception.app + inception-project-api + de.tudarmstadt.ukp.inception.app inception-api-formats 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 c763e2cfc97..84fcf250b19 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 @@ -60,7 +60,6 @@ import com.github.openjson.JSONObject; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; 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; @@ -75,6 +74,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.ZipUtils; import de.tudarmstadt.ukp.clarin.webanno.tsv.WebAnnoTsv3FormatSupport; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import io.swagger.v3.oas.annotations.Operation; /** 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 e0c0b37ebbe..ecb3b0e4509 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 @@ -90,7 +90,6 @@ import org.springframework.web.util.UriComponentsBuilder; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; 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; @@ -125,6 +124,7 @@ import de.tudarmstadt.ukp.clarin.webanno.webapp.remoteapi.config.RemoteApiAutoConfiguration; import de.tudarmstadt.ukp.inception.curation.service.CurationDocumentService; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.project.export.ProjectExportService; import de.tudarmstadt.ukp.inception.project.export.ProjectImportExportUtils; import io.swagger.v3.oas.annotations.Operation; diff --git a/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/webhooks/WebhookService.java b/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/webhooks/WebhookService.java index 0570274de70..979c18a18e0 100644 --- a/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/webhooks/WebhookService.java +++ b/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/webhooks/WebhookService.java @@ -53,12 +53,12 @@ import de.tudarmstadt.ukp.clarin.webanno.api.event.AnnotationStateChangeEvent; import de.tudarmstadt.ukp.clarin.webanno.api.event.DocumentStateChangedEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.event.ProjectStateChangedEvent; import de.tudarmstadt.ukp.clarin.webanno.support.JSONUtil; import de.tudarmstadt.ukp.clarin.webanno.webapp.remoteapi.config.RemoteApiAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.webapp.remoteapi.webhooks.json.AnnotationStateChangeMessage; import de.tudarmstadt.ukp.clarin.webanno.webapp.remoteapi.webhooks.json.DocumentStateChangeMessage; import de.tudarmstadt.ukp.clarin.webanno.webapp.remoteapi.webhooks.json.ProjectStateChangeMessage; +import de.tudarmstadt.ukp.inception.project.api.event.ProjectStateChangedEvent; /** *

diff --git a/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/webhooks/json/ProjectStateChangeMessage.java b/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/webhooks/json/ProjectStateChangeMessage.java index 047751f55ff..c352120e4b4 100644 --- a/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/webhooks/json/ProjectStateChangeMessage.java +++ b/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/webhooks/json/ProjectStateChangeMessage.java @@ -22,7 +22,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import de.tudarmstadt.ukp.clarin.webanno.api.event.ProjectStateChangedEvent; +import de.tudarmstadt.ukp.inception.project.api.event.ProjectStateChangedEvent; public class ProjectStateChangeMessage { diff --git a/inception/inception-remote/src/test/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/aero/AeroRemoteApiController_Authentication_Jwt_Test.java b/inception/inception-remote/src/test/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/aero/AeroRemoteApiController_Authentication_Jwt_Test.java index 613865d323b..d28f22f09d9 100644 --- a/inception/inception-remote/src/test/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/aero/AeroRemoteApiController_Authentication_Jwt_Test.java +++ b/inception/inception-remote/src/test/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/aero/AeroRemoteApiController_Authentication_Jwt_Test.java @@ -53,12 +53,12 @@ import com.giffing.wicket.spring.boot.starter.WicketAutoConfiguration; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.clarin.webanno.support.ApplicationContextProvider; import de.tudarmstadt.ukp.inception.log.config.EventLoggingAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.search.config.SearchServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.support.deployment.DeploymentModeServiceImpl; import io.jsonwebtoken.Claims; diff --git a/inception/inception-remote/src/test/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/aero/AeroRemoteApiController_Authentication_PreAuth_Test.java b/inception/inception-remote/src/test/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/aero/AeroRemoteApiController_Authentication_PreAuth_Test.java index d5826cb561b..5aa79d38dea 100644 --- a/inception/inception-remote/src/test/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/aero/AeroRemoteApiController_Authentication_PreAuth_Test.java +++ b/inception/inception-remote/src/test/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/aero/AeroRemoteApiController_Authentication_PreAuth_Test.java @@ -48,12 +48,12 @@ import com.giffing.wicket.spring.boot.starter.WicketAutoConfiguration; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.clarin.webanno.support.ApplicationContextProvider; import de.tudarmstadt.ukp.inception.log.config.EventLoggingAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.search.config.SearchServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.support.deployment.DeploymentModeServiceImpl; diff --git a/inception/inception-remote/src/test/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/aero/AeroRemoteApiController_Authentication_Test.java b/inception/inception-remote/src/test/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/aero/AeroRemoteApiController_Authentication_Test.java index 63beb59bd0f..646453a80e5 100644 --- a/inception/inception-remote/src/test/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/aero/AeroRemoteApiController_Authentication_Test.java +++ b/inception/inception-remote/src/test/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/aero/AeroRemoteApiController_Authentication_Test.java @@ -48,12 +48,12 @@ import com.giffing.wicket.spring.boot.starter.WicketAutoConfiguration; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.clarin.webanno.support.ApplicationContextProvider; import de.tudarmstadt.ukp.inception.log.config.EventLoggingAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.search.config.SearchServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.support.deployment.DeploymentModeServiceImpl; diff --git a/inception/inception-remote/src/test/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/webhooks/WebhookServiceTest.java b/inception/inception-remote/src/test/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/webhooks/WebhookServiceTest.java index 54893dca225..d98699611d1 100644 --- a/inception/inception-remote/src/test/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/webhooks/WebhookServiceTest.java +++ b/inception/inception-remote/src/test/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/webhooks/WebhookServiceTest.java @@ -58,7 +58,6 @@ import de.tudarmstadt.ukp.clarin.webanno.api.event.AnnotationStateChangeEvent; import de.tudarmstadt.ukp.clarin.webanno.api.event.DocumentStateChangedEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.event.ProjectStateChangedEvent; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -72,6 +71,7 @@ import de.tudarmstadt.ukp.clarin.webanno.webapp.remoteapi.webhooks.json.AnnotationStateChangeMessage; import de.tudarmstadt.ukp.clarin.webanno.webapp.remoteapi.webhooks.json.DocumentStateChangeMessage; import de.tudarmstadt.ukp.clarin.webanno.webapp.remoteapi.webhooks.json.ProjectStateChangeMessage; +import de.tudarmstadt.ukp.inception.project.api.event.ProjectStateChangedEvent; @SpringBootTest( // webEnvironment = WebEnvironment.RANDOM_PORT, // diff --git a/inception/inception-scheduling/pom.xml b/inception/inception-scheduling/pom.xml index 18246590471..e1d8408ac29 100644 --- a/inception/inception-scheduling/pom.xml +++ b/inception/inception-scheduling/pom.xml @@ -32,7 +32,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-scheduling/src/main/java/de/tudarmstadt/ukp/inception/scheduling/SchedulingServiceImpl.java b/inception/inception-scheduling/src/main/java/de/tudarmstadt/ukp/inception/scheduling/SchedulingServiceImpl.java index 132914fd8a2..e62424e9ca6 100644 --- a/inception/inception-scheduling/src/main/java/de/tudarmstadt/ukp/inception/scheduling/SchedulingServiceImpl.java +++ b/inception/inception-scheduling/src/main/java/de/tudarmstadt/ukp/inception/scheduling/SchedulingServiceImpl.java @@ -49,10 +49,10 @@ import org.springframework.security.core.session.SessionInformation; import org.springframework.security.core.session.SessionRegistry; -import de.tudarmstadt.ukp.clarin.webanno.api.event.AfterProjectRemovedEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.event.BeforeProjectRemovedEvent; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; +import de.tudarmstadt.ukp.inception.project.api.event.AfterProjectRemovedEvent; +import de.tudarmstadt.ukp.inception.project.api.event.BeforeProjectRemovedEvent; import de.tudarmstadt.ukp.inception.scheduling.config.SchedulingProperties; import de.tudarmstadt.ukp.inception.scheduling.config.SchedulingServiceAutoConfiguration; diff --git a/inception/inception-schema/pom.xml b/inception/inception-schema/pom.xml index 89113e4597b..99cb72e7b59 100644 --- a/inception/inception-schema/pom.xml +++ b/inception/inception-schema/pom.xml @@ -29,6 +29,10 @@ de.tudarmstadt.ukp.inception.app inception-api-formats + + de.tudarmstadt.ukp.inception.app + inception-project-api + de.tudarmstadt.ukp.inception.app inception-annotation-storage-api 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 a02a95178d5..504fd883f10 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 @@ -17,14 +17,14 @@ */ package de.tudarmstadt.ukp.inception.schema.exporters; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.ANNOTATION_FOLDER; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.DOCUMENT_FOLDER; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.PROJECT_FOLDER; import static de.tudarmstadt.ukp.clarin.webanno.api.export.FullProjectExportRequest.FORMAT_AUTO; import static de.tudarmstadt.ukp.clarin.webanno.model.Mode.ANNOTATION; import static de.tudarmstadt.ukp.clarin.webanno.security.UserDaoImpl.RESERVED_USERNAMES; import static de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst.INITIAL_CAS_PSEUDO_USER; import static de.tudarmstadt.ukp.clarin.webanno.support.io.FastIOUtils.copy; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.ANNOTATION_FOLDER; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.DOCUMENT_FOLDER; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.PROJECT_FOLDER; import static java.lang.Math.ceil; import static java.lang.System.currentTimeMillis; import static java.util.Arrays.asList; diff --git a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceEventAdapter.java b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceEventAdapter.java index 37cc8dabd22..3f49627f281 100644 --- a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceEventAdapter.java +++ b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceEventAdapter.java @@ -20,10 +20,10 @@ import org.springframework.context.event.EventListener; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.event.BeforeProjectRemovedEvent; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; +import de.tudarmstadt.ukp.inception.project.api.event.BeforeProjectRemovedEvent; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; diff --git a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceImpl.java b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceImpl.java index e899bcd679b..83774c57023 100644 --- a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceImpl.java +++ b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceImpl.java @@ -17,7 +17,6 @@ */ package de.tudarmstadt.ukp.inception.schema.service; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.withProjectLogger; import static de.tudarmstadt.ukp.clarin.webanno.api.annotation.util.WebAnnoCasUtil.getRealCas; import static de.tudarmstadt.ukp.clarin.webanno.api.annotation.util.WebAnnoCasUtil.isNativeUimaType; import static de.tudarmstadt.ukp.clarin.webanno.api.annotation.util.WebAnnoCasUtil.isSame; @@ -25,6 +24,7 @@ import static de.tudarmstadt.ukp.clarin.webanno.model.MultiValueMode.ARRAY; import static de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst.RELATION_TYPE; import static de.tudarmstadt.ukp.clarin.webanno.support.uima.ICasUtil.selectByAddr; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.withProjectLogger; import static de.tudarmstadt.ukp.inception.schema.AttachedAnnotation.Direction.INCOMING; import static de.tudarmstadt.ukp.inception.schema.AttachedAnnotation.Direction.LOOP; import static de.tudarmstadt.ukp.inception.schema.AttachedAnnotation.Direction.OUTGOING; 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 7d23491aec5..00b3085bb91 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 @@ -44,7 +44,6 @@ import org.springframework.util.FileSystemUtils; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; @@ -61,6 +60,7 @@ import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.documents.api.RepositoryAutoConfiguration; import de.tudarmstadt.ukp.inception.documents.config.DocumentServiceAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; 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 951166047b9..c5836649f32 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 @@ -45,7 +45,6 @@ import org.springframework.util.FileSystemUtils; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -56,6 +55,7 @@ import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.documents.api.RepositoryAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.adapter.IllegalFeatureValueException; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; diff --git a/inception/inception-search-core/pom.xml b/inception/inception-search-core/pom.xml index 0728d744f77..59ec7c8aff2 100644 --- a/inception/inception-search-core/pom.xml +++ b/inception/inception-search-core/pom.xml @@ -41,6 +41,10 @@ de.tudarmstadt.ukp.inception.app inception-api + + de.tudarmstadt.ukp.inception.app + inception-project-api + de.tudarmstadt.ukp.inception.app inception-documents-api diff --git a/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/SearchServiceImpl.java b/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/SearchServiceImpl.java index 2b2e4fb3c59..e57839e1584 100644 --- a/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/SearchServiceImpl.java +++ b/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/SearchServiceImpl.java @@ -54,12 +54,9 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.event.TransactionalEventListener; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.event.AfterCasWrittenEvent; import de.tudarmstadt.ukp.clarin.webanno.api.event.AfterDocumentCreatedEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.event.AfterProjectRemovedEvent; import de.tudarmstadt.ukp.clarin.webanno.api.event.BeforeDocumentRemovedEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.event.BeforeProjectRemovedEvent; import de.tudarmstadt.ukp.clarin.webanno.api.event.LayerConfigurationChangedEvent; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; @@ -70,6 +67,9 @@ import de.tudarmstadt.ukp.inception.annotation.storage.CasStorageSession; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.preferences.PreferencesService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; +import de.tudarmstadt.ukp.inception.project.api.event.AfterProjectRemovedEvent; +import de.tudarmstadt.ukp.inception.project.api.event.BeforeProjectRemovedEvent; import de.tudarmstadt.ukp.inception.scheduling.SchedulingService; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.search.config.SearchServiceAutoConfiguration; diff --git a/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/cli/SearchReindexCliCommand.java b/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/cli/SearchReindexCliCommand.java index 2df04e46eea..ce229664cc6 100644 --- a/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/cli/SearchReindexCliCommand.java +++ b/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/cli/SearchReindexCliCommand.java @@ -25,8 +25,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnNotWebApplication; import org.springframework.stereotype.Component; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.search.SearchService; import de.tudarmstadt.ukp.inception.search.model.Monitor; import picocli.CommandLine.Command; diff --git a/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/config/SearchServiceAutoConfiguration.java b/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/config/SearchServiceAutoConfiguration.java index ad16435efbc..3c96a70eabf 100644 --- a/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/config/SearchServiceAutoConfiguration.java +++ b/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/config/SearchServiceAutoConfiguration.java @@ -26,9 +26,9 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.preferences.PreferencesService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.scheduling.SchedulingService; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; diff --git a/inception/inception-search-mtas/pom.xml b/inception/inception-search-mtas/pom.xml index 4fe00770d6d..2addae94af9 100644 --- a/inception/inception-search-mtas/pom.xml +++ b/inception/inception-search-mtas/pom.xml @@ -27,7 +27,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api de.tudarmstadt.ukp.inception.app @@ -158,6 +158,11 @@ hsqldb test + + de.tudarmstadt.ukp.inception.app + inception-api + test + de.tudarmstadt.ukp.inception.app inception-schema diff --git a/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasDocumentIndex.java b/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasDocumentIndex.java index 5715b1df034..6acc0c2e138 100644 --- a/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasDocumentIndex.java +++ b/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasDocumentIndex.java @@ -21,9 +21,9 @@ */ package de.tudarmstadt.ukp.inception.search.index.mtas; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.PROJECT_FOLDER; import static de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState.FINISHED; import static de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState.IGNORE; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.PROJECT_FOLDER; import static de.tudarmstadt.ukp.inception.search.Metrics.VIRTUAL_FEATURE_SENTENCE; import static de.tudarmstadt.ukp.inception.search.Metrics.VIRTUAL_FEATURE_TOKEN; import static de.tudarmstadt.ukp.inception.search.Metrics.VIRTUAL_LAYER_SEGMENTATION; diff --git a/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasUimaParser.java b/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasUimaParser.java index a858b468c8c..5a31f218c47 100644 --- a/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasUimaParser.java +++ b/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasUimaParser.java @@ -56,7 +56,6 @@ import com.github.openjson.JSONObject; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.util.WebAnnoCasUtil; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; @@ -67,6 +66,7 @@ import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.inception.annotation.layer.relation.RelationAdapter; import de.tudarmstadt.ukp.inception.preferences.PreferencesService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupport; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupportRegistry; diff --git a/inception/inception-search-mtas/src/test/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasDocumentIndexTest.java b/inception/inception-search-mtas/src/test/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasDocumentIndexTest.java index 24d7a3dd3a1..1517db48d16 100644 --- a/inception/inception-search-mtas/src/test/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasDocumentIndexTest.java +++ b/inception/inception-search-mtas/src/test/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasDocumentIndexTest.java @@ -57,7 +57,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.conll.config.ConllFormatsAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.diag.config.CasDoctorAutoConfiguration; @@ -87,6 +86,7 @@ import de.tudarmstadt.ukp.inception.io.xmi.config.UimaFormatsPropertiesImpl.XmiFormatProperties; import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBaseServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.preferences.config.PreferencesServiceAutoConfig; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.scheduling.config.SchedulingServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.search.LayerStatistics; diff --git a/inception/inception-search-mtas/src/test/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasUpgradeTest.java b/inception/inception-search-mtas/src/test/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasUpgradeTest.java index ff7507fb5ca..f55298487b2 100644 --- a/inception/inception-search-mtas/src/test/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasUpgradeTest.java +++ b/inception/inception-search-mtas/src/test/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasUpgradeTest.java @@ -40,7 +40,6 @@ import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaPropertiesImpl; import de.tudarmstadt.ukp.clarin.webanno.diag.config.CasDoctorAutoConfiguration; @@ -59,6 +58,7 @@ import de.tudarmstadt.ukp.inception.io.xmi.XmiFormatSupport; import de.tudarmstadt.ukp.inception.io.xmi.config.UimaFormatsPropertiesImpl.XmiFormatProperties; import de.tudarmstadt.ukp.inception.preferences.config.PreferencesServiceAutoConfig; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.scheduling.config.SchedulingServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; diff --git a/inception/inception-sharing/pom.xml b/inception/inception-sharing/pom.xml index 3f0feab1860..9e65e72ebae 100644 --- a/inception/inception-sharing/pom.xml +++ b/inception/inception-sharing/pom.xml @@ -43,7 +43,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-sharing/src/main/java/de/tudarmstadt/ukp/inception/sharing/AcceptInvitePage.java b/inception/inception-sharing/src/main/java/de/tudarmstadt/ukp/inception/sharing/AcceptInvitePage.java index 12b669bfe6d..0e3aa002e3e 100644 --- a/inception/inception-sharing/src/main/java/de/tudarmstadt/ukp/inception/sharing/AcceptInvitePage.java +++ b/inception/inception-sharing/src/main/java/de/tudarmstadt/ukp/inception/sharing/AcceptInvitePage.java @@ -54,7 +54,6 @@ import org.springframework.security.core.session.SessionRegistry; import org.wicketstuff.annotation.mount.MountPath; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.config.LoginProperties; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; @@ -62,6 +61,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxFormComponentUpdatingBehavior; import de.tudarmstadt.ukp.clarin.webanno.ui.core.ApplicationSession; import de.tudarmstadt.ukp.clarin.webanno.ui.core.page.ProjectPageBase; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.sharing.config.InviteServiceProperties; import de.tudarmstadt.ukp.inception.sharing.model.ProjectInvite; import de.tudarmstadt.ukp.inception.support.markdown.MarkdownLabel; diff --git a/inception/inception-sharing/src/main/java/de/tudarmstadt/ukp/inception/sharing/InviteServiceImpl.java b/inception/inception-sharing/src/main/java/de/tudarmstadt/ukp/inception/sharing/InviteServiceImpl.java index d9a0f28558f..c89e229a14d 100644 --- a/inception/inception-sharing/src/main/java/de/tudarmstadt/ukp/inception/sharing/InviteServiceImpl.java +++ b/inception/inception-sharing/src/main/java/de/tudarmstadt/ukp/inception/sharing/InviteServiceImpl.java @@ -44,12 +44,12 @@ import org.springframework.context.event.EventListener; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; -import de.tudarmstadt.ukp.clarin.webanno.api.event.BeforeProjectRemovedEvent; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.ProjectState; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; +import de.tudarmstadt.ukp.inception.project.api.event.BeforeProjectRemovedEvent; import de.tudarmstadt.ukp.inception.sharing.config.InviteServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.sharing.config.InviteServiceProperties; import de.tudarmstadt.ukp.inception.sharing.model.ProjectInvite; diff --git a/inception/inception-sharing/src/main/java/de/tudarmstadt/ukp/inception/sharing/config/InviteServiceAutoConfiguration.java b/inception/inception-sharing/src/main/java/de/tudarmstadt/ukp/inception/sharing/config/InviteServiceAutoConfiguration.java index aae313886fe..78df35b6e5b 100644 --- a/inception/inception-sharing/src/main/java/de/tudarmstadt/ukp/inception/sharing/config/InviteServiceAutoConfiguration.java +++ b/inception/inception-sharing/src/main/java/de/tudarmstadt/ukp/inception/sharing/config/InviteServiceAutoConfiguration.java @@ -26,8 +26,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.sharing.InviteService; import de.tudarmstadt.ukp.inception.sharing.InviteServiceImpl; import de.tudarmstadt.ukp.inception.sharing.project.InviteProjectSettingsPanelFactory; diff --git a/inception/inception-sharing/src/test/java/de/tudarmstadt/ukp/inception/sharing/InviteServiceImplTest.java b/inception/inception-sharing/src/test/java/de/tudarmstadt/ukp/inception/sharing/InviteServiceImplTest.java index b3c1ff00a8e..787f1ce1024 100644 --- a/inception/inception-sharing/src/test/java/de/tudarmstadt/ukp/inception/sharing/InviteServiceImplTest.java +++ b/inception/inception-sharing/src/test/java/de/tudarmstadt/ukp/inception/sharing/InviteServiceImplTest.java @@ -40,8 +40,8 @@ import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.sharing.model.ProjectInvite; import de.tudarmstadt.ukp.inception.workload.extension.WorkloadManagerExtension; import de.tudarmstadt.ukp.inception.workload.model.WorkloadManagementService; diff --git a/inception/inception-ui-agreement/pom.xml b/inception/inception-ui-agreement/pom.xml index efbac982191..d5a14c1e4db 100644 --- a/inception/inception-ui-agreement/pom.xml +++ b/inception/inception-ui-agreement/pom.xml @@ -65,7 +65,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-ui-agreement/src/main/java/de/tudarmstadt/ukp/inception/ui/agreement/page/AgreementPage.java b/inception/inception-ui-agreement/src/main/java/de/tudarmstadt/ukp/inception/ui/agreement/page/AgreementPage.java index 438a390d688..4b55da85e15 100644 --- a/inception/inception-ui-agreement/src/main/java/de/tudarmstadt/ukp/inception/ui/agreement/page/AgreementPage.java +++ b/inception/inception-ui-agreement/src/main/java/de/tudarmstadt/ukp/inception/ui/agreement/page/AgreementPage.java @@ -63,7 +63,6 @@ import de.tudarmstadt.ukp.clarin.webanno.agreement.measures.AgreementMeasureSupport; import de.tudarmstadt.ukp.clarin.webanno.agreement.measures.AgreementMeasureSupportRegistry; import de.tudarmstadt.ukp.clarin.webanno.agreement.measures.DefaultAgreementTraits; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.util.WebAnnoCasUtil; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; @@ -78,6 +77,7 @@ import de.tudarmstadt.ukp.clarin.webanno.ui.core.page.ProjectPageBase; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.support.help.DocLink; diff --git a/inception/inception-ui-agreement/src/main/java/de/tudarmstadt/ukp/inception/ui/agreement/page/AgreementPageMenuItem.java b/inception/inception-ui-agreement/src/main/java/de/tudarmstadt/ukp/inception/ui/agreement/page/AgreementPageMenuItem.java index 9532284c1c1..d20d7f71d57 100644 --- a/inception/inception-ui-agreement/src/main/java/de/tudarmstadt/ukp/inception/ui/agreement/page/AgreementPageMenuItem.java +++ b/inception/inception-ui-agreement/src/main/java/de/tudarmstadt/ukp/inception/ui/agreement/page/AgreementPageMenuItem.java @@ -28,11 +28,11 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.image.IconType; import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5IconType; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.clarin.webanno.ui.core.menu.ProjectMenuItem; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import wicket.contrib.input.events.key.KeyType; @Component diff --git a/inception/inception-ui-annotation/pom.xml b/inception/inception-ui-annotation/pom.xml index e6ee72c7643..56e9c42b87a 100644 --- a/inception/inception-ui-annotation/pom.xml +++ b/inception/inception-ui-annotation/pom.xml @@ -48,6 +48,10 @@ de.tudarmstadt.ukp.inception.app inception-api-schema + + de.tudarmstadt.ukp.inception.app + inception-project-api + de.tudarmstadt.ukp.inception.app inception-annotation-storage-api diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/AnnotationPage.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/AnnotationPage.java index 422db523201..d6ff4981335 100755 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/AnnotationPage.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/AnnotationPage.java @@ -59,7 +59,6 @@ import org.wicketstuff.annotation.mount.MountPath; import org.wicketstuff.event.annotation.OnEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.actionbar.ActionBar; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationEditorState; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase; @@ -94,6 +93,7 @@ import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.editor.state.AnnotatorStateImpl; import de.tudarmstadt.ukp.inception.preferences.PreferencesService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotationPreference; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.selection.AnnotatorViewportChangedEvent; diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/AnnotationPageMenuItem.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/AnnotationPageMenuItem.java index 9dda0c01e2b..016b859cac9 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/AnnotationPageMenuItem.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/AnnotationPageMenuItem.java @@ -29,12 +29,12 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.image.IconType; import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5IconType; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.config.AnnotationUIAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.ui.core.menu.ProjectMenuItem; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import wicket.contrib.input.events.key.KeyType; /** diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/docnav/DocumentNavigator.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/docnav/DocumentNavigator.java index 68b859ed17f..53c05a444b1 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/docnav/DocumentNavigator.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/docnav/DocumentNavigator.java @@ -28,7 +28,6 @@ import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.spring.injection.annot.SpringBean; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.actionbar.export.ExportDocumentDialog; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; @@ -36,6 +35,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.wicket.input.InputBehavior; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.actionbar.open.OpenDocumentDialog; import de.tudarmstadt.ukp.inception.documents.DocumentAccess; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import wicket.contrib.input.events.key.KeyType; public class DocumentNavigator diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/open/OpenDocumentDialogPanel.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/open/OpenDocumentDialogPanel.java index 10f82334ccc..a2c8c3156f3 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/open/OpenDocumentDialogPanel.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/open/OpenDocumentDialogPanel.java @@ -44,7 +44,6 @@ import org.danekja.java.util.function.serializable.SerializableBiFunction; import org.wicketstuff.event.annotation.OnEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.Mode; @@ -56,6 +55,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.wicket.input.InputBehavior; import de.tudarmstadt.ukp.clarin.webanno.ui.core.page.ProjectPageBase; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import wicket.contrib.input.events.key.KeyType; diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/config/AnnotationUIAutoConfiguration.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/config/AnnotationUIAutoConfiguration.java index 399cee36cec..ead14d689e5 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/config/AnnotationUIAutoConfiguration.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/config/AnnotationUIAutoConfiguration.java @@ -27,7 +27,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.AnnotationPageMenuItem; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.actionbar.closesession.CloseSessionActionBarExtension; @@ -38,6 +37,7 @@ import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.actionbar.undo.actions.SpanAnnotationActionUndoSupport; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.actionbar.undo.actions.UndoableActionSupportRegistryImpl; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.actionbar.undo.actions.UndoableAnnotationActionSupport; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; @ConditionalOnWebApplication @Configuration diff --git a/inception/inception-ui-core/pom.xml b/inception/inception-ui-core/pom.xml index 7aee41af7b5..5c434d720a1 100644 --- a/inception/inception-ui-core/pom.xml +++ b/inception/inception-ui-core/pom.xml @@ -32,7 +32,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/page/ProjectPageBase.java b/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/page/ProjectPageBase.java index 9e03daf4c2f..397304d9d90 100644 --- a/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/page/ProjectPageBase.java +++ b/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/page/ProjectPageBase.java @@ -37,11 +37,11 @@ import org.apache.wicket.util.string.StringValue; import org.apache.wicket.util.string.StringValueConversionException; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.PermissionLevel; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.ui.core.AccessDeniedPage; import de.tudarmstadt.ukp.inception.ui.core.config.DashboardProperties; diff --git a/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/users/ManageUsersPage.java b/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/users/ManageUsersPage.java index 9f26062e3dc..661276f0159 100644 --- a/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/users/ManageUsersPage.java +++ b/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/users/ManageUsersPage.java @@ -42,7 +42,6 @@ import org.wicketstuff.annotation.mount.MountPath; import org.wicketstuff.event.annotation.OnEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.security.Realm; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; @@ -50,6 +49,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxLink; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaBehavior; import de.tudarmstadt.ukp.clarin.webanno.ui.core.page.ApplicationPageBase; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.security.oauth.OAuth2Adapter; import de.tudarmstadt.ukp.inception.security.saml.Saml2Adapter; diff --git a/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/inception/ui/core/menubar/HelpMenuBarItem.java b/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/inception/ui/core/menubar/HelpMenuBarItem.java index 32b32349243..6a30992553f 100644 --- a/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/inception/ui/core/menubar/HelpMenuBarItem.java +++ b/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/inception/ui/core/menubar/HelpMenuBarItem.java @@ -27,8 +27,8 @@ import org.apache.wicket.model.ResourceModel; import org.apache.wicket.spring.injection.annot.SpringBean; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.support.help.DocLink; public class HelpMenuBarItem diff --git a/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/inception/ui/core/menubar/MenuBar.java b/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/inception/ui/core/menubar/MenuBar.java index 7ee63fa6f68..088ed686a6f 100644 --- a/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/inception/ui/core/menubar/MenuBar.java +++ b/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/inception/ui/core/menubar/MenuBar.java @@ -34,7 +34,6 @@ import org.apache.wicket.request.resource.UrlResourceReference; import org.apache.wicket.spring.injection.annot.SpringBean; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.PermissionLevel; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; @@ -44,6 +43,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.wicket.ImageLink; import de.tudarmstadt.ukp.clarin.webanno.ui.core.logout.LogoutPanel; import de.tudarmstadt.ukp.clarin.webanno.ui.core.page.ProjectContext; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.ui.core.config.DashboardProperties; public class MenuBar diff --git a/inception/inception-ui-curation/pom.xml b/inception/inception-ui-curation/pom.xml index fb23bd601b8..4031ad602bd 100644 --- a/inception/inception-ui-curation/pom.xml +++ b/inception/inception-ui-curation/pom.xml @@ -70,7 +70,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api de.tudarmstadt.ukp.inception.app @@ -80,6 +80,10 @@ de.tudarmstadt.ukp.inception.app inception-api-editor + + de.tudarmstadt.ukp.inception.app + inception-api + de.tudarmstadt.ukp.inception.app inception-security diff --git a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/actionbar/CurationDocumentNavigator.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/actionbar/CurationDocumentNavigator.java index 01dc7c9b738..ddd2820381d 100644 --- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/actionbar/CurationDocumentNavigator.java +++ b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/actionbar/CurationDocumentNavigator.java @@ -28,13 +28,13 @@ import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.spring.injection.annot.SpringBean; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.actionbar.export.ExportDocumentDialog; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxLink; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.input.InputBehavior; import de.tudarmstadt.ukp.inception.documents.DocumentAccess; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.ui.curation.actionbar.opendocument.CurationOpenDocumentDialog; import wicket.contrib.input.events.key.KeyType; diff --git a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/BratSuggestionVisualizer.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/BratSuggestionVisualizer.java index 966732823c1..0a8b480b9b5 100644 --- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/BratSuggestionVisualizer.java +++ b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/BratSuggestionVisualizer.java @@ -55,7 +55,6 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.image.Icon; import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5IconType; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.comment.AnnotatorCommentDialogPanel; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.brat.annotation.BratRequestUtils; @@ -81,6 +80,7 @@ import de.tudarmstadt.ukp.inception.diam.model.ajax.AjaxResponse; import de.tudarmstadt.ukp.inception.diam.model.ajax.DefaultAjaxResponse; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequest; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; diff --git a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/config/CurationUIAutoConfiguration.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/config/CurationUIAutoConfiguration.java index d30e2ac9f42..b12fa413c4e 100644 --- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/config/CurationUIAutoConfiguration.java +++ b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/config/CurationUIAutoConfiguration.java @@ -23,10 +23,10 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.ui.curation.actionbar.CurationUndoActionBarExtension; import de.tudarmstadt.ukp.clarin.webanno.ui.curation.page.CurationPageMenuItem; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; @ConditionalOnWebApplication @Configuration diff --git a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/page/CurationPage.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/page/CurationPage.java index dac66ebac4c..d5742c9d1cc 100644 --- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/page/CurationPage.java +++ b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/page/CurationPage.java @@ -75,7 +75,6 @@ import com.googlecode.wicket.kendo.ui.widget.splitter.SplitterAdapter; import com.googlecode.wicket.kendo.ui.widget.splitter.SplitterBehavior; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.actionbar.ActionBar; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.paging.SentenceOrientedPagingStrategy; @@ -115,6 +114,7 @@ import de.tudarmstadt.ukp.inception.editor.AnnotationEditorRegistry; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.editor.state.AnnotatorStateImpl; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.paging.Unit; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequestedEvent; diff --git a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/page/CurationPageMenuItem.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/page/CurationPageMenuItem.java index 9697eb0cf02..9a0b51d7bd1 100644 --- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/page/CurationPageMenuItem.java +++ b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/page/CurationPageMenuItem.java @@ -28,11 +28,11 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.image.IconType; import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5IconType; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.clarin.webanno.ui.core.menu.ProjectMenuItem; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import wicket.contrib.input.events.key.KeyType; @ConditionalOnWebApplication diff --git a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/actionbar/opendocument/CurationOpenDocumentDialogPanel.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/actionbar/opendocument/CurationOpenDocumentDialogPanel.java index 198deee2d02..a37eaf5d596 100644 --- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/actionbar/opendocument/CurationOpenDocumentDialogPanel.java +++ b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/actionbar/opendocument/CurationOpenDocumentDialogPanel.java @@ -29,7 +29,6 @@ import org.apache.wicket.spring.injection.annot.SpringBean; import org.wicketstuff.event.annotation.OnEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; @@ -37,6 +36,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.wicket.input.InputBehavior; import de.tudarmstadt.ukp.clarin.webanno.ui.core.page.ProjectPageBase; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import wicket.contrib.input.events.key.KeyType; diff --git a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationSidebar.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationSidebar.java index fff24b02d7f..008b7ec35fa 100644 --- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationSidebar.java +++ b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationSidebar.java @@ -61,7 +61,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; @@ -84,6 +83,7 @@ import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorExtensionRegistry; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; diff --git a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationSidebarBehavior.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationSidebarBehavior.java index f608fca854e..7abf46f2fc8 100644 --- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationSidebarBehavior.java +++ b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationSidebarBehavior.java @@ -32,13 +32,13 @@ import org.apache.wicket.spring.injection.annot.SpringBean; import org.slf4j.Logger; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.AnnotationPage; import de.tudarmstadt.ukp.inception.annotation.events.PreparingToOpenDocumentEvent; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; public class CurationSidebarBehavior extends Behavior diff --git a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationSidebarFactory.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationSidebarFactory.java index 0a1ecc0dc86..aeed0f1ad51 100644 --- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationSidebarFactory.java +++ b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationSidebarFactory.java @@ -25,13 +25,13 @@ import org.apache.wicket.model.IModel; import org.slf4j.Logger; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.AnnotationPage; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.sidebar.AnnotationSidebarFactory_ImplBase; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.sidebar.AnnotationSidebar_ImplBase; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.ui.curation.sidebar.config.CurationSidebarAutoConfiguration; diff --git a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationSidebarServiceImpl.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationSidebarServiceImpl.java index 29abf6c5dbc..8de86341877 100644 --- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationSidebarServiceImpl.java +++ b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationSidebarServiceImpl.java @@ -52,7 +52,6 @@ import org.springframework.security.core.session.SessionRegistry; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; @@ -65,6 +64,7 @@ import de.tudarmstadt.ukp.inception.curation.model.CurationSettings; import de.tudarmstadt.ukp.inception.curation.model.CurationSettingsId; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; /** diff --git a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/config/CurationSidebarAutoConfiguration.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/config/CurationSidebarAutoConfiguration.java index 683cf7cdfc9..431cbdee52c 100644 --- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/config/CurationSidebarAutoConfiguration.java +++ b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/config/CurationSidebarAutoConfiguration.java @@ -27,10 +27,10 @@ import org.springframework.context.annotation.Configuration; import org.springframework.security.core.session.SessionRegistry; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; diff --git a/inception/inception-ui-dashboard-activity/pom.xml b/inception/inception-ui-dashboard-activity/pom.xml index 9bfeeac01e9..363f98ef3c4 100644 --- a/inception/inception-ui-dashboard-activity/pom.xml +++ b/inception/inception-ui-dashboard-activity/pom.xml @@ -64,7 +64,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-ui-dashboard-activity/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/activity/ActivitiesDashletControllerImpl.java b/inception/inception-ui-dashboard-activity/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/activity/ActivitiesDashletControllerImpl.java index e4e8459046d..eb0cf62c27e 100644 --- a/inception/inception-ui-dashboard-activity/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/activity/ActivitiesDashletControllerImpl.java +++ b/inception/inception-ui-dashboard-activity/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/activity/ActivitiesDashletControllerImpl.java @@ -38,7 +38,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.AnnotationPageMenuItem; @@ -55,6 +54,7 @@ import de.tudarmstadt.ukp.inception.curation.service.CurationDocumentService; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.log.EventRepository; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; @ConditionalOnWebApplication @RestController diff --git a/inception/inception-ui-dashboard/pom.xml b/inception/inception-ui-dashboard/pom.xml index c63f31a83c9..3ef88ee53fd 100644 --- a/inception/inception-ui-dashboard/pom.xml +++ b/inception/inception-ui-dashboard/pom.xml @@ -44,7 +44,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/admin/AdminDashboardPage.java b/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/admin/AdminDashboardPage.java index 7cbc09cae6a..8d6cf962e4a 100644 --- a/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/admin/AdminDashboardPage.java +++ b/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/admin/AdminDashboardPage.java @@ -24,13 +24,13 @@ import org.apache.wicket.spring.injection.annot.SpringBean; import org.wicketstuff.annotation.mount.MountPath; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.clarin.webanno.ui.core.login.LoginPage; import de.tudarmstadt.ukp.clarin.webanno.ui.core.menu.MenuItem; import de.tudarmstadt.ukp.clarin.webanno.ui.core.menu.MenuItemRegistry; import de.tudarmstadt.ukp.clarin.webanno.ui.core.page.ApplicationPageBase; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.ui.core.dashboard.DashboardMenu; import de.tudarmstadt.ukp.inception.ui.core.dashboard.dashlet.SystemStatusDashlet; diff --git a/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/admin/AdminDashboardPageMenuBarItem.java b/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/admin/AdminDashboardPageMenuBarItem.java index 5a92ffc5e12..11cf8fe1783 100644 --- a/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/admin/AdminDashboardPageMenuBarItem.java +++ b/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/admin/AdminDashboardPageMenuBarItem.java @@ -25,9 +25,9 @@ import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.spring.injection.annot.SpringBean; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; public class AdminDashboardPageMenuBarItem extends Panel diff --git a/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/dashlet/CurrentProjectDashlet.java b/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/dashlet/CurrentProjectDashlet.java index 6d00ff5b98c..1f3ca88f72c 100644 --- a/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/dashlet/CurrentProjectDashlet.java +++ b/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/dashlet/CurrentProjectDashlet.java @@ -28,9 +28,9 @@ import org.apache.wicket.model.Model; import org.apache.wicket.spring.injection.annot.SpringBean; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.support.markdown.MarkdownLabel; public class CurrentProjectDashlet diff --git a/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/project/ProjectDashboardPage.java b/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/project/ProjectDashboardPage.java index 49861169cab..961054a3518 100644 --- a/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/project/ProjectDashboardPage.java +++ b/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/project/ProjectDashboardPage.java @@ -34,7 +34,6 @@ import org.apache.wicket.spring.injection.annot.SpringBean; import org.wicketstuff.annotation.mount.MountPath; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.PermissionLevel; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; @@ -42,6 +41,7 @@ import de.tudarmstadt.ukp.clarin.webanno.ui.core.menu.MenuItem; import de.tudarmstadt.ukp.clarin.webanno.ui.core.menu.MenuItemRegistry; import de.tudarmstadt.ukp.clarin.webanno.ui.core.page.ProjectPageBase; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.ui.core.config.DashboardProperties; import de.tudarmstadt.ukp.inception.ui.core.dashboard.DashboardMenu; import de.tudarmstadt.ukp.inception.ui.core.dashboard.dashlet.CurrentProjectDashlet; diff --git a/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/project/ProjectDashboardPageMenuBarItem.java b/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/project/ProjectDashboardPageMenuBarItem.java index ad6ad9d0580..daabd512ed9 100644 --- a/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/project/ProjectDashboardPageMenuBarItem.java +++ b/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/project/ProjectDashboardPageMenuBarItem.java @@ -26,12 +26,12 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.spring.injection.annot.SpringBean; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.clarin.webanno.ui.core.page.ProjectContext; import de.tudarmstadt.ukp.clarin.webanno.ui.core.page.ProjectPageBase; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; public class ProjectDashboardPageMenuBarItem extends Panel diff --git a/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/projectlist/ProjectTemplateSelectionDialogPanel.java b/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/projectlist/ProjectTemplateSelectionDialogPanel.java index 1028d4fd02e..f295d25d2d1 100644 --- a/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/projectlist/ProjectTemplateSelectionDialogPanel.java +++ b/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/projectlist/ProjectTemplateSelectionDialogPanel.java @@ -45,14 +45,14 @@ import org.apache.wicket.spring.injection.annot.SpringBean; import org.slf4j.Logger; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.QuickProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxLink; import de.tudarmstadt.ukp.clarin.webanno.ui.core.page.ProjectPageBase; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.ui.core.dashboard.project.ProjectDashboardPage; public class ProjectTemplateSelectionDialogPanel diff --git a/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/projectlist/ProjectsOverviewPage.java b/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/projectlist/ProjectsOverviewPage.java index 48ff05e0b65..c0a1c99775c 100644 --- a/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/projectlist/ProjectsOverviewPage.java +++ b/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/projectlist/ProjectsOverviewPage.java @@ -73,7 +73,6 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.CssClassNameAppender; import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.PermissionLevel; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; @@ -93,6 +92,7 @@ import de.tudarmstadt.ukp.inception.annotation.filters.ProjectRoleFilterStateChanged; import de.tudarmstadt.ukp.inception.preferences.Key; import de.tudarmstadt.ukp.inception.preferences.PreferencesService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.project.export.ProjectExportService; import de.tudarmstadt.ukp.inception.support.markdown.TerseMarkdownLabel; import de.tudarmstadt.ukp.inception.ui.core.config.DashboardProperties; diff --git a/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/projectlist/ProjectsOverviewPageMenuBarItem.java b/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/projectlist/ProjectsOverviewPageMenuBarItem.java index 3fb656a38f6..50024edbab4 100644 --- a/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/projectlist/ProjectsOverviewPageMenuBarItem.java +++ b/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/projectlist/ProjectsOverviewPageMenuBarItem.java @@ -25,9 +25,9 @@ import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.spring.injection.annot.SpringBean; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; public class ProjectsOverviewPageMenuBarItem extends Panel diff --git a/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/settings/ProjectSettingsDashboardPageBase.java b/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/settings/ProjectSettingsDashboardPageBase.java index 96ec94a7be6..007c934d2cf 100644 --- a/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/settings/ProjectSettingsDashboardPageBase.java +++ b/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/settings/ProjectSettingsDashboardPageBase.java @@ -27,13 +27,13 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.spring.injection.annot.SpringBean; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.clarin.webanno.ui.core.menu.MenuItem; import de.tudarmstadt.ukp.clarin.webanno.ui.core.menu.MenuItemRegistry; import de.tudarmstadt.ukp.clarin.webanno.ui.core.page.ProjectPageBase; import de.tudarmstadt.ukp.inception.preferences.PreferencesService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.ui.core.dashboard.DashboardMenu; /** diff --git a/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/settings/ProjectSettingsMenuItemBase.java b/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/settings/ProjectSettingsMenuItemBase.java index e38856e4121..b126207c4f0 100644 --- a/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/settings/ProjectSettingsMenuItemBase.java +++ b/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/settings/ProjectSettingsMenuItemBase.java @@ -21,10 +21,10 @@ import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.ui.core.menu.ProjectMenuItem; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import wicket.contrib.input.events.key.KeyType; public abstract class ProjectSettingsMenuItemBase diff --git a/inception/inception-ui-external-search/pom.xml b/inception/inception-ui-external-search/pom.xml index 6ce7de2c27c..6b66b7e7d85 100644 --- a/inception/inception-ui-external-search/pom.xml +++ b/inception/inception-ui-external-search/pom.xml @@ -29,6 +29,10 @@ de.tudarmstadt.ukp.inception.app inception-ui-core + + de.tudarmstadt.ukp.inception.app + inception-project-api + de.tudarmstadt.ukp.inception.app inception-annotation-storage-api diff --git a/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/DocumentDetailsPage.java b/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/DocumentDetailsPage.java index a58ceda38a4..6f0910bf520 100644 --- a/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/DocumentDetailsPage.java +++ b/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/DocumentDetailsPage.java @@ -32,13 +32,13 @@ import org.apache.wicket.util.string.StringValue; import org.wicketstuff.annotation.mount.MountPath; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.clarin.webanno.ui.core.page.ProjectPageBase; import de.tudarmstadt.ukp.inception.externalsearch.ExternalSearchResult; import de.tudarmstadt.ukp.inception.externalsearch.ExternalSearchService; import de.tudarmstadt.ukp.inception.externalsearch.model.DocumentRepository; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; @MountPath(NS_PROJECT + "/${" + PAGE_PARAM_PROJECT + "}/search/${" + PAGE_PARAM_REPOSITORY_ID + "}/${" + PAGE_PARAM_COLLECTION_ID + "}/${" + PAGE_PARAM_DOCUMENT_ID + "}") 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 5b3b0b66b23..a3ae922710d 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 @@ -53,7 +53,6 @@ import org.wicketstuff.event.annotation.OnEvent; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -76,6 +75,7 @@ import de.tudarmstadt.ukp.inception.externalsearch.HighlightUtils; import de.tudarmstadt.ukp.inception.externalsearch.event.ExternalSearchQueryEvent; import de.tudarmstadt.ukp.inception.externalsearch.model.DocumentRepository; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.pipeline.RenderAnnotationsEvent; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequest; diff --git a/inception/inception-ui-kb/pom.xml b/inception/inception-ui-kb/pom.xml index 49f832e67be..0b0fbec6027 100644 --- a/inception/inception-ui-kb/pom.xml +++ b/inception/inception-ui-kb/pom.xml @@ -55,7 +55,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/KnowledgeBasePageMenuItem.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/KnowledgeBasePageMenuItem.java index b61e2ce9c81..11d5a2d8704 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/KnowledgeBasePageMenuItem.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/KnowledgeBasePageMenuItem.java @@ -29,12 +29,12 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.image.IconType; import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5IconType; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.clarin.webanno.ui.core.menu.ProjectMenuItem; import de.tudarmstadt.ukp.inception.kb.KnowledgeBaseService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.ui.kb.config.KnowledgeBaseServiceUIAutoConfiguration; import wicket.contrib.input.events.key.KeyType; diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/config/KnowledgeBaseServiceUIAutoConfiguration.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/config/KnowledgeBaseServiceUIAutoConfiguration.java index e25253acac0..10856dee0fd 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/config/KnowledgeBaseServiceUIAutoConfiguration.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/config/KnowledgeBaseServiceUIAutoConfiguration.java @@ -27,11 +27,11 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.inception.kb.KnowledgeBaseService; import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBaseProperties; import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBaseServiceAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.ui.kb.KnowledgeBasePageMenuItem; diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/initializers/NamedEntityIdentifierFeatureInitializer.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/initializers/NamedEntityIdentifierFeatureInitializer.java index f4a0947e06d..2d90ba63e68 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/initializers/NamedEntityIdentifierFeatureInitializer.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/initializers/NamedEntityIdentifierFeatureInitializer.java @@ -27,7 +27,6 @@ import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -35,6 +34,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.NamedEntityLayerInitializer; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TokenLayerInitializer; import de.tudarmstadt.ukp.dkpro.core.api.ner.type.NamedEntity; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.ui.kb.config.KnowledgeBaseServiceUIAutoConfiguration; diff --git a/inception/inception-ui-project/pom.xml b/inception/inception-ui-project/pom.xml index c0252211407..f3694103a27 100644 --- a/inception/inception-ui-project/pom.xml +++ b/inception/inception-ui-project/pom.xml @@ -59,6 +59,10 @@ de.tudarmstadt.ukp.inception.app inception-api + + de.tudarmstadt.ukp.inception.app + inception-project-api + de.tudarmstadt.ukp.inception.app inception-documents-api diff --git a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/ProjectPageMenuItem.java b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/ProjectPageMenuItem.java index 43ca5a01568..69a80edb417 100644 --- a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/ProjectPageMenuItem.java +++ b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/ProjectPageMenuItem.java @@ -24,9 +24,9 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.image.IconType; import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5IconType; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.ui.core.menu.MenuItem; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import wicket.contrib.input.events.key.KeyType; @Component diff --git a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/ProjectSelectionPanel.java b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/ProjectSelectionPanel.java index 0dc1ce6da03..77581d9e15f 100644 --- a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/ProjectSelectionPanel.java +++ b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/ProjectSelectionPanel.java @@ -31,7 +31,6 @@ import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.spring.injection.annot.SpringBean; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.model.Role; @@ -39,6 +38,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxLink; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.ListPanel_ImplBase; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.OverviewListChoice; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; class ProjectSelectionPanel extends ListPanel_ImplBase diff --git a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/ProjectSettingsPage.java b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/ProjectSettingsPage.java index 32ace39f094..3ea94969eba 100755 --- a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/ProjectSettingsPage.java +++ b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/ProjectSettingsPage.java @@ -44,7 +44,6 @@ import org.slf4j.LoggerFactory; import org.wicketstuff.annotation.mount.MountPath; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; @@ -58,6 +57,7 @@ import de.tudarmstadt.ukp.clarin.webanno.ui.core.settings.ProjectSettingsPanelFactory; import de.tudarmstadt.ukp.clarin.webanno.ui.core.settings.ProjectSettingsPanelRegistry; import de.tudarmstadt.ukp.clarin.webanno.ui.project.detail.ProjectDetailPanel; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; /** * This is the main page for Project Settings. diff --git a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/detail/ProjectDetailPanel.java b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/detail/ProjectDetailPanel.java index a5fb28efc0b..1e354f553f4 100644 --- a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/detail/ProjectDetailPanel.java +++ b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/detail/ProjectDetailPanel.java @@ -52,13 +52,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxButton; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxFormComponentUpdatingBehavior; import de.tudarmstadt.ukp.clarin.webanno.ui.core.page.ProjectPageBase; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; public class ProjectDetailPanel diff --git a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/ProjectLayersPanel.java b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/ProjectLayersPanel.java index 532021fca4d..30a1ec6dd6f 100644 --- a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/ProjectLayersPanel.java +++ b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/ProjectLayersPanel.java @@ -73,10 +73,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.api.event.LayerConfigurationChangedEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -95,6 +93,8 @@ import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Sentence; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.inception.export.LayerImportExportUtils; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; diff --git a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/users/UserPermissionsPanel.java b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/users/UserPermissionsPanel.java index 8adcd63257d..6b5cfe7c620 100644 --- a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/users/UserPermissionsPanel.java +++ b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/users/UserPermissionsPanel.java @@ -37,7 +37,6 @@ import org.apache.wicket.validation.IValidatable; import org.apache.wicket.validation.ValidationError; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.PermissionLevel; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.ProjectUserPermissions; @@ -45,6 +44,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxButton; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxLink; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaModelAdapter; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; public class UserPermissionsPanel extends Panel diff --git a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/users/UserSelectionPanel.java b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/users/UserSelectionPanel.java index 410644f8e3c..3fde6d3ca9a 100644 --- a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/users/UserSelectionPanel.java +++ b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/users/UserSelectionPanel.java @@ -41,7 +41,6 @@ import com.googlecode.wicket.kendo.ui.form.multiselect.lazy.MultiSelect; import com.googlecode.wicket.kendo.ui.renderer.ChoiceRenderer; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.PermissionLevel; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.ProjectUserPermissions; @@ -51,6 +50,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxFormComponentUpdatingBehavior; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.ListPanel_ImplBase; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.OverviewListChoice; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; class UserSelectionPanel extends ListPanel_ImplBase diff --git a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/inception/ui/project/dangerzone/ProjectDangerZonePanel.java b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/inception/ui/project/dangerzone/ProjectDangerZonePanel.java index 21d8062106b..7016c56e517 100644 --- a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/inception/ui/project/dangerzone/ProjectDangerZonePanel.java +++ b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/inception/ui/project/dangerzone/ProjectDangerZonePanel.java @@ -33,11 +33,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.dialog.ChallengeResponseDialog; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxLink; import de.tudarmstadt.ukp.clarin.webanno.ui.core.page.ProjectPageBase; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; public class ProjectDangerZonePanel extends Panel diff --git a/inception/inception-versioning/pom.xml b/inception/inception-versioning/pom.xml index fdba80fc3f9..75e5782ead9 100644 --- a/inception/inception-versioning/pom.xml +++ b/inception/inception-versioning/pom.xml @@ -59,7 +59,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api de.tudarmstadt.ukp.inception.app @@ -206,6 +206,11 @@ inception-project test + + de.tudarmstadt.ukp.inception.app + inception-api + test + de.tudarmstadt.ukp.inception.app inception-documents diff --git a/inception/inception-versioning/src/main/java/de/tudarmstadt/ukp/inception/versioning/VersioningServiceImpl.java b/inception/inception-versioning/src/main/java/de/tudarmstadt/ukp/inception/versioning/VersioningServiceImpl.java index 63888d834a4..ac1243d60e3 100644 --- a/inception/inception-versioning/src/main/java/de/tudarmstadt/ukp/inception/versioning/VersioningServiceImpl.java +++ b/inception/inception-versioning/src/main/java/de/tudarmstadt/ukp/inception/versioning/VersioningServiceImpl.java @@ -17,8 +17,8 @@ */ package de.tudarmstadt.ukp.inception.versioning; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.DOCUMENT_FOLDER; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.PROJECT_FOLDER; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.DOCUMENT_FOLDER; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.PROJECT_FOLDER; import java.io.File; import java.io.IOException; @@ -48,7 +48,6 @@ 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.event.BeforeProjectRemovedEvent; import de.tudarmstadt.ukp.clarin.webanno.export.model.ExportedAnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.export.model.ExportedAnnotationLayerReference; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; @@ -63,6 +62,7 @@ import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.export.LayerImportExportUtils; +import de.tudarmstadt.ukp.inception.project.api.event.BeforeProjectRemovedEvent; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; /** diff --git a/inception/inception-versioning/src/test/java/de/tudarmstadt/ukp/inception/versioning/VersioningServiceImplTest.java b/inception/inception-versioning/src/test/java/de/tudarmstadt/ukp/inception/versioning/VersioningServiceImplTest.java index 0780bd96e80..fb241e23782 100644 --- a/inception/inception-versioning/src/test/java/de/tudarmstadt/ukp/inception/versioning/VersioningServiceImplTest.java +++ b/inception/inception-versioning/src/test/java/de/tudarmstadt/ukp/inception/versioning/VersioningServiceImplTest.java @@ -50,7 +50,6 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.diag.config.CasDoctorAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -68,6 +67,7 @@ import de.tudarmstadt.ukp.inception.documents.config.DocumentServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.export.config.DocumentImportExportServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.io.xmi.config.UimaFormatsAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.versioning.config.VersioningServiceAutoConfiguration; diff --git a/inception/inception-websocket/pom.xml b/inception/inception-websocket/pom.xml index 0b85ecec621..ae78adefd17 100644 --- a/inception/inception-websocket/pom.xml +++ b/inception/inception-websocket/pom.xml @@ -31,7 +31,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api de.tudarmstadt.ukp.inception.app @@ -209,6 +209,11 @@ inception-annotation-storage test + + de.tudarmstadt.ukp.inception.app + inception-api + test + de.tudarmstadt.ukp.inception.app inception-export diff --git a/inception/inception-websocket/src/main/java/de/tudarmstadt/ukp/inception/websocket/controller/LoggedEventsWebsocketControllerImpl.java b/inception/inception-websocket/src/main/java/de/tudarmstadt/ukp/inception/websocket/controller/LoggedEventsWebsocketControllerImpl.java index 4308600669b..f386a96316c 100644 --- a/inception/inception-websocket/src/main/java/de/tudarmstadt/ukp/inception/websocket/controller/LoggedEventsWebsocketControllerImpl.java +++ b/inception/inception-websocket/src/main/java/de/tudarmstadt/ukp/inception/websocket/controller/LoggedEventsWebsocketControllerImpl.java @@ -36,10 +36,10 @@ import org.springframework.messaging.simp.annotation.SubscribeMapping; import org.springframework.stereotype.Controller; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.log.EventRepository; import de.tudarmstadt.ukp.inception.log.adapter.EventLoggingAdapterRegistry; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.websocket.model.LoggedEventMessage; @Controller diff --git a/inception/inception-websocket/src/test/java/de/tudarmstadt/ukp/inception/websocket/LoggedEventsWebsocketControllerImplTest.java b/inception/inception-websocket/src/test/java/de/tudarmstadt/ukp/inception/websocket/LoggedEventsWebsocketControllerImplTest.java index 2b507a21675..612ff17ca59 100644 --- a/inception/inception-websocket/src/test/java/de/tudarmstadt/ukp/inception/websocket/LoggedEventsWebsocketControllerImplTest.java +++ b/inception/inception-websocket/src/test/java/de/tudarmstadt/ukp/inception/websocket/LoggedEventsWebsocketControllerImplTest.java @@ -38,7 +38,6 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.test.context.junit.jupiter.SpringExtension; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; @@ -49,6 +48,7 @@ import de.tudarmstadt.ukp.inception.log.EventRepository; import de.tudarmstadt.ukp.inception.log.adapter.EventLoggingAdapterRegistryImpl; import de.tudarmstadt.ukp.inception.log.adapter.SpanEventAdapter; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.websocket.controller.LoggedEventsWebsocketControllerImpl; import de.tudarmstadt.ukp.inception.websocket.model.LoggedEventMessage; diff --git a/inception/inception-websocket/src/test/java/de/tudarmstadt/ukp/inception/websocket/WebSocketIntegrationTest.java b/inception/inception-websocket/src/test/java/de/tudarmstadt/ukp/inception/websocket/WebSocketIntegrationTest.java index b311a7dc70b..c7a809d0fa7 100644 --- a/inception/inception-websocket/src/test/java/de/tudarmstadt/ukp/inception/websocket/WebSocketIntegrationTest.java +++ b/inception/inception-websocket/src/test/java/de/tudarmstadt/ukp/inception/websocket/WebSocketIntegrationTest.java @@ -71,7 +71,6 @@ import org.springframework.web.socket.client.standard.StandardWebSocketClient; import org.springframework.web.socket.messaging.WebSocketStompClient; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.event.DocumentStateChangedEvent; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; @@ -90,6 +89,7 @@ import de.tudarmstadt.ukp.inception.documents.config.DocumentServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.export.config.DocumentImportExportServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.log.adapter.DocumentStateChangedEventAdapter; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.support.findbugs.SuppressFBWarnings; import de.tudarmstadt.ukp.inception.websocket.config.WebsocketAutoConfiguration; diff --git a/inception/inception-workload-dynamic/pom.xml b/inception/inception-workload-dynamic/pom.xml index f6b1190eb6c..6ba2435c9ef 100644 --- a/inception/inception-workload-dynamic/pom.xml +++ b/inception/inception-workload-dynamic/pom.xml @@ -37,6 +37,10 @@ de.tudarmstadt.ukp.inception.app inception-model + + de.tudarmstadt.ukp.inception.app + inception-project-api + de.tudarmstadt.ukp.inception.app inception-scheduling diff --git a/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImpl.java b/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImpl.java index 740c462bef8..58d6e3fdb2d 100644 --- a/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImpl.java +++ b/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImpl.java @@ -45,7 +45,6 @@ import org.springframework.security.core.session.SessionRegistry; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -58,6 +57,7 @@ import de.tudarmstadt.ukp.inception.annotation.storage.CasStorageSession; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.documents.api.SourceDocumentStateStats; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.workload.dynamic.config.DynamicWorkloadManagerAutoConfiguration; import de.tudarmstadt.ukp.inception.workload.dynamic.trait.DynamicWorkloadTraits; import de.tudarmstadt.ukp.inception.workload.dynamic.workflow.WorkflowExtension; diff --git a/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/annotation/DynamicAnnotatorWorkflowActionBarItemGroup.java b/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/annotation/DynamicAnnotatorWorkflowActionBarItemGroup.java index eca8af2ab61..7cbd416c5c1 100644 --- a/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/annotation/DynamicAnnotatorWorkflowActionBarItemGroup.java +++ b/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/annotation/DynamicAnnotatorWorkflowActionBarItemGroup.java @@ -45,7 +45,6 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.CssClassNameModifier; import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5IconType; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.actionbar.finish.FinishDocumentDialogContent; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.actionbar.finish.FinishDocumentDialogModel; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.exception.ValidationException; @@ -55,6 +54,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxLink; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.input.InputBehavior; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; import de.tudarmstadt.ukp.inception.workload.dynamic.DynamicWorkloadExtension; diff --git a/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/annotation/DynamicWorkflowActionBarExtension.java b/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/annotation/DynamicWorkflowActionBarExtension.java index 15a91643bee..f884dbc612b 100644 --- a/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/annotation/DynamicWorkflowActionBarExtension.java +++ b/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/annotation/DynamicWorkflowActionBarExtension.java @@ -23,9 +23,9 @@ import org.apache.wicket.markup.html.panel.Panel; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.actionbar.ActionBarExtension; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.workload.dynamic.config.DynamicWorkloadManagerAutoConfiguration; import de.tudarmstadt.ukp.inception.workload.extension.WorkloadManagerExtension; import de.tudarmstadt.ukp.inception.workload.model.WorkloadManagementService; diff --git a/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/annotation/DynamicWorkflowDocumentNavigationActionBarExtension.java b/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/annotation/DynamicWorkflowDocumentNavigationActionBarExtension.java index 4b4c6e8ae8e..a12ec15954b 100644 --- a/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/annotation/DynamicWorkflowDocumentNavigationActionBarExtension.java +++ b/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/annotation/DynamicWorkflowDocumentNavigationActionBarExtension.java @@ -32,13 +32,13 @@ import org.apache.wicket.spring.injection.annot.SpringBean; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.actionbar.ActionBarExtension; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.workload.dynamic.DynamicWorkloadExtension; import de.tudarmstadt.ukp.inception.workload.dynamic.config.DynamicWorkloadManagerAutoConfiguration; diff --git a/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/config/DynamicWorkloadManagerAutoConfiguration.java b/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/config/DynamicWorkloadManagerAutoConfiguration.java index dcfb0e86e1f..2784e91c355 100644 --- a/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/config/DynamicWorkloadManagerAutoConfiguration.java +++ b/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/config/DynamicWorkloadManagerAutoConfiguration.java @@ -26,9 +26,9 @@ import org.springframework.context.annotation.Lazy; import org.springframework.security.core.session.SessionRegistry; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.scheduling.SchedulingService; import de.tudarmstadt.ukp.inception.workload.dynamic.DynamicWorkloadExtension; import de.tudarmstadt.ukp.inception.workload.dynamic.DynamicWorkloadExtensionImpl; diff --git a/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/event/DynamicWorkloadUpdateDocumentStateTask.java b/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/event/DynamicWorkloadUpdateDocumentStateTask.java index 0800ce11bc2..366c9d86ae9 100644 --- a/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/event/DynamicWorkloadUpdateDocumentStateTask.java +++ b/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/event/DynamicWorkloadUpdateDocumentStateTask.java @@ -30,10 +30,10 @@ import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.scheduling.DebouncingTask; import de.tudarmstadt.ukp.inception.workload.dynamic.DynamicWorkloadExtension; import de.tudarmstadt.ukp.inception.workload.dynamic.trait.DynamicWorkloadTraits; diff --git a/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/management/DynamicWorkloadManagementPage.java b/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/management/DynamicWorkloadManagementPage.java index 675e6687a29..39379139526 100644 --- a/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/management/DynamicWorkloadManagementPage.java +++ b/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/management/DynamicWorkloadManagementPage.java @@ -83,7 +83,6 @@ import com.googlecode.wicket.kendo.ui.renderer.ChoiceRenderer; import de.agilecoders.wicket.core.markup.html.bootstrap.form.BootstrapRadioChoice; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.comment.AnnotatorCommentDialogPanel; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; @@ -107,6 +106,7 @@ import de.tudarmstadt.ukp.inception.annotation.filters.SourceDocumentFilterStateChanged; import de.tudarmstadt.ukp.inception.annotation.filters.SourceDocumentStateFilterPanel; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.support.help.DocLink; import de.tudarmstadt.ukp.inception.workload.dynamic.DynamicWorkloadExtension; import de.tudarmstadt.ukp.inception.workload.dynamic.management.support.AnnotatorColumn; diff --git a/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/management/DynamicWorkloadManagementPageMenuItem.java b/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/management/DynamicWorkloadManagementPageMenuItem.java index 81c6d2fca3c..a42024d6c08 100644 --- a/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/management/DynamicWorkloadManagementPageMenuItem.java +++ b/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/management/DynamicWorkloadManagementPageMenuItem.java @@ -29,11 +29,11 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.image.IconType; import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5IconType; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.clarin.webanno.ui.core.menu.ProjectMenuItem; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.workload.model.WorkloadManagementService; import wicket.contrib.input.events.key.KeyType; 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 b180ecf4da1..4cd388d5e53 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 @@ -45,7 +45,6 @@ import org.springframework.util.FileSystemUtils; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; @@ -62,6 +61,7 @@ import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.documents.api.RepositoryAutoConfiguration; import de.tudarmstadt.ukp.inception.documents.config.DocumentServiceAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.scheduling.config.SchedulingServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; 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 3ee653d4d19..3afc98f011a 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 @@ -48,7 +48,6 @@ import org.springframework.util.FileSystemUtils; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; @@ -64,6 +63,7 @@ import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.documents.api.RepositoryAutoConfiguration; import de.tudarmstadt.ukp.inception.documents.config.DocumentServiceAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.scheduling.config.SchedulingServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; diff --git a/inception/inception-workload-matrix/pom.xml b/inception/inception-workload-matrix/pom.xml index 79b7e23fc25..3bb84d71511 100644 --- a/inception/inception-workload-matrix/pom.xml +++ b/inception/inception-workload-matrix/pom.xml @@ -30,6 +30,10 @@ de.tudarmstadt.ukp.inception.app inception-api + + de.tudarmstadt.ukp.inception.app + inception-project-api + de.tudarmstadt.ukp.inception.app inception-documents-api diff --git a/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/MatrixWorkloadExtensionImpl.java b/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/MatrixWorkloadExtensionImpl.java index b09247740be..a7cefb992a1 100644 --- a/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/MatrixWorkloadExtensionImpl.java +++ b/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/MatrixWorkloadExtensionImpl.java @@ -33,7 +33,6 @@ import org.springframework.core.annotation.Order; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.ProjectState; @@ -43,6 +42,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.JSONUtil; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.documents.api.SourceDocumentStateStats; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.workload.matrix.config.MatrixWorkloadManagerAutoConfiguration; import de.tudarmstadt.ukp.inception.workload.matrix.trait.MatrixWorkloadTraits; import de.tudarmstadt.ukp.inception.workload.matrix.trait.MatrixWorkloadTraitsEditor; diff --git a/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/annotation/MatrixWorkflowActionBarItemGroup.java b/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/annotation/MatrixWorkflowActionBarItemGroup.java index c3f7b63606b..a2738fdcad9 100644 --- a/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/annotation/MatrixWorkflowActionBarItemGroup.java +++ b/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/annotation/MatrixWorkflowActionBarItemGroup.java @@ -48,7 +48,6 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.CssClassNameModifier; import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5IconType; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.actionbar.finish.FinishDocumentDialogContent; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.actionbar.finish.FinishDocumentDialogModel; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.exception.ValidationException; @@ -62,6 +61,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.wicket.input.InputBehavior; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.preferences.PreferencesService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; import de.tudarmstadt.ukp.inception.workload.matrix.MatrixWorkloadExtension; diff --git a/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/annotation/MatrixWorkflowDocumentNavigationActionBarExtension.java b/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/annotation/MatrixWorkflowDocumentNavigationActionBarExtension.java index 35132619006..496d9a97f34 100644 --- a/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/annotation/MatrixWorkflowDocumentNavigationActionBarExtension.java +++ b/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/annotation/MatrixWorkflowDocumentNavigationActionBarExtension.java @@ -29,12 +29,12 @@ import org.apache.wicket.spring.injection.annot.SpringBean; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.actionbar.ActionBarExtension; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.workload.matrix.MatrixWorkloadExtension; import de.tudarmstadt.ukp.inception.workload.matrix.config.MatrixWorkloadManagerAutoConfiguration; import de.tudarmstadt.ukp.inception.workload.model.WorkloadManagementService; diff --git a/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/config/MatrixWorkloadManagerAutoConfiguration.java b/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/config/MatrixWorkloadManagerAutoConfiguration.java index 02f9c306e7a..6ef345657a4 100644 --- a/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/config/MatrixWorkloadManagerAutoConfiguration.java +++ b/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/config/MatrixWorkloadManagerAutoConfiguration.java @@ -21,9 +21,9 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.scheduling.SchedulingService; import de.tudarmstadt.ukp.inception.workload.matrix.MatrixWorkloadExtension; import de.tudarmstadt.ukp.inception.workload.matrix.MatrixWorkloadExtensionImpl; diff --git a/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/event/MatrixWorkloadStateWatcher.java b/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/event/MatrixWorkloadStateWatcher.java index cf7b3a6eb82..6bfe932643e 100644 --- a/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/event/MatrixWorkloadStateWatcher.java +++ b/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/event/MatrixWorkloadStateWatcher.java @@ -20,7 +20,7 @@ import org.springframework.context.event.EventListener; import de.tudarmstadt.ukp.clarin.webanno.api.event.AnnotationStateChangeEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.event.ProjectPermissionsChangedEvent; +import de.tudarmstadt.ukp.inception.project.api.event.ProjectPermissionsChangedEvent; import de.tudarmstadt.ukp.inception.scheduling.SchedulingService; import de.tudarmstadt.ukp.inception.workload.event.RecalculateProjectStateTask; import de.tudarmstadt.ukp.inception.workload.matrix.config.MatrixWorkloadManagerAutoConfiguration; diff --git a/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/event/MatrixWorkloadUpdateDocumentStateTask.java b/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/event/MatrixWorkloadUpdateDocumentStateTask.java index a4c4c8e4bca..8f8613f793b 100644 --- a/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/event/MatrixWorkloadUpdateDocumentStateTask.java +++ b/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/event/MatrixWorkloadUpdateDocumentStateTask.java @@ -30,10 +30,10 @@ import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.scheduling.DebouncingTask; import de.tudarmstadt.ukp.inception.workload.matrix.MatrixWorkloadExtension; import de.tudarmstadt.ukp.inception.workload.model.WorkloadManagementService; diff --git a/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/management/MatrixWorkloadManagementPage.java b/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/management/MatrixWorkloadManagementPage.java index 82830a57f13..08cf1fd959c 100755 --- a/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/management/MatrixWorkloadManagementPage.java +++ b/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/management/MatrixWorkloadManagementPage.java @@ -74,7 +74,6 @@ import com.googlecode.wicket.jquery.ui.widget.menu.IMenuItem; import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.CssClassNameAppender; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.comment.AnnotatorCommentDialogPanel; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; @@ -93,6 +92,7 @@ import de.tudarmstadt.ukp.clarin.webanno.ui.core.page.ProjectPageBase; import de.tudarmstadt.ukp.inception.curation.service.CurationDocumentService; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.support.help.DocLink; import de.tudarmstadt.ukp.inception.workload.matrix.MatrixWorkloadExtension; import de.tudarmstadt.ukp.inception.workload.matrix.management.event.AnnotatorColumnCellClickEvent; diff --git a/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/management/MatrixWorkloadManagementPageMenuItem.java b/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/management/MatrixWorkloadManagementPageMenuItem.java index 3e77a162c40..45ad407e2e9 100644 --- a/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/management/MatrixWorkloadManagementPageMenuItem.java +++ b/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/management/MatrixWorkloadManagementPageMenuItem.java @@ -28,11 +28,11 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.image.IconType; import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5IconType; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.clarin.webanno.ui.core.menu.ProjectMenuItem; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.workload.model.WorkloadManagementService; import wicket.contrib.input.events.key.KeyType; 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 22f4c530cf8..21c81e0bd6f 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 @@ -41,7 +41,6 @@ import org.springframework.util.FileSystemUtils; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -57,6 +56,7 @@ import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.documents.api.RepositoryAutoConfiguration; import de.tudarmstadt.ukp.inception.documents.config.DocumentServiceAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.scheduling.config.SchedulingServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; diff --git a/inception/inception-workload/pom.xml b/inception/inception-workload/pom.xml index 9072aa27d71..04322457989 100644 --- a/inception/inception-workload/pom.xml +++ b/inception/inception-workload/pom.xml @@ -33,7 +33,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-workload/src/main/java/de/tudarmstadt/ukp/inception/workload/event/RecalculateProjectStateTask.java b/inception/inception-workload/src/main/java/de/tudarmstadt/ukp/inception/workload/event/RecalculateProjectStateTask.java index 4ea11bde605..c14af4035d3 100644 --- a/inception/inception-workload/src/main/java/de/tudarmstadt/ukp/inception/workload/event/RecalculateProjectStateTask.java +++ b/inception/inception-workload/src/main/java/de/tudarmstadt/ukp/inception/workload/event/RecalculateProjectStateTask.java @@ -25,8 +25,8 @@ import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.scheduling.DebouncingTask; import de.tudarmstadt.ukp.inception.workload.extension.WorkloadManagerExtension; import de.tudarmstadt.ukp.inception.workload.model.WorkloadManagementService; diff --git a/inception/pom.xml b/inception/pom.xml index 232c9d80402..4b9a5403ca1 100644 --- a/inception/pom.xml +++ b/inception/pom.xml @@ -157,6 +157,7 @@ inception-model-vdoc inception-model-export inception-project + inception-project-api inception-project-initializers inception-project-initializers-basic inception-project-initializers-doclabeling