diff --git a/inception/inception-active-learning/pom.xml b/inception/inception-active-learning/pom.xml index 28dc6403940..315e1f981b5 100644 --- a/inception/inception-active-learning/pom.xml +++ b/inception/inception-active-learning/pom.xml @@ -26,6 +26,10 @@ inception-active-learning INCEpTION - Recommendation - Active Learning + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api + de.tudarmstadt.ukp.inception.app inception-ui-annotation @@ -44,7 +48,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-documents-api de.tudarmstadt.ukp.inception.app @@ -54,6 +58,10 @@ de.tudarmstadt.ukp.inception.app inception-model + + de.tudarmstadt.ukp.inception.app + inception-model-vdoc + de.tudarmstadt.ukp.inception.app inception-support diff --git a/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/ActiveLearningServiceImpl.java b/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/ActiveLearningServiceImpl.java index df12932ac33..9703be05e73 100644 --- a/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/ActiveLearningServiceImpl.java +++ b/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/ActiveLearningServiceImpl.java @@ -37,7 +37,6 @@ import org.springframework.context.ApplicationEventPublisher; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; @@ -46,6 +45,7 @@ import de.tudarmstadt.ukp.inception.active.learning.event.ActiveLearningRecommendationEvent; import de.tudarmstadt.ukp.inception.active.learning.strategy.ActiveLearningStrategy; import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanAdapter; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.recommendation.api.LearningRecordService; import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.api.model.AnnotationSuggestion; diff --git a/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/config/ActiveLearningAutoConfiguration.java b/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/config/ActiveLearningAutoConfiguration.java index a181df455cf..147b858bfa7 100644 --- a/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/config/ActiveLearningAutoConfiguration.java +++ b/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/config/ActiveLearningAutoConfiguration.java @@ -24,13 +24,13 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.inception.active.learning.ActiveLearningService; import de.tudarmstadt.ukp.inception.active.learning.ActiveLearningServiceImpl; import de.tudarmstadt.ukp.inception.active.learning.log.ActiveLearningRecommendationEventAdapter; import de.tudarmstadt.ukp.inception.active.learning.log.ActiveLearningSuggestionOfferedAdapter; import de.tudarmstadt.ukp.inception.active.learning.sidebar.ActiveLearningSidebarFactory; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.recommendation.api.LearningRecordService; import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.config.RecommenderServiceAutoConfiguration; diff --git a/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/sidebar/ActiveLearningSidebar.java b/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/sidebar/ActiveLearningSidebar.java index 60f8a33aea1..7664dac6576 100644 --- a/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/sidebar/ActiveLearningSidebar.java +++ b/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/sidebar/ActiveLearningSidebar.java @@ -17,8 +17,8 @@ */ package de.tudarmstadt.ukp.inception.active.learning.sidebar; -import static de.tudarmstadt.ukp.clarin.webanno.api.CasUpgradeMode.AUTO_CAS_UPGRADE; import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasAccessMode.SHARED_READ_ONLY_ACCESS; +import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasUpgradeMode.AUTO_CAS_UPGRADE; import static de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst.SPAN_TYPE; import static de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaBehavior.visibleWhen; import static de.tudarmstadt.ukp.inception.active.learning.sidebar.ActiveLearningUserStateMetaData.CURRENT_AL_USER_STATE; @@ -66,9 +66,8 @@ import org.slf4j.LoggerFactory; import org.wicketstuff.event.annotation.OnEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.keybindings.KeyBindingsPanel; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -99,6 +98,7 @@ import de.tudarmstadt.ukp.inception.annotation.layer.relation.RelationCreatedEvent; import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanCreatedEvent; import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanDeletedEvent; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.recommendation.api.LearningRecordService; import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; diff --git a/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/sidebar/ActiveLearningSidebarFactory.java b/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/sidebar/ActiveLearningSidebarFactory.java index 644dea682d9..d06a1889f6f 100644 --- a/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/sidebar/ActiveLearningSidebarFactory.java +++ b/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/sidebar/ActiveLearningSidebarFactory.java @@ -21,7 +21,7 @@ import org.apache.wicket.model.IModel; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.AnnotationPage; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.sidebar.AnnotationSidebarFactory_ImplBase; diff --git a/inception/inception-agreement/pom.xml b/inception/inception-agreement/pom.xml index 80115d97405..3ef054f2a7e 100644 --- a/inception/inception-agreement/pom.xml +++ b/inception/inception-agreement/pom.xml @@ -40,6 +40,10 @@ uimafit-core + + de.tudarmstadt.ukp.inception.app + inception-documents-api + de.tudarmstadt.ukp.inception.app inception-curation-legacy 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 9514bdca760..9f4a3d40d56 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.DocumentService; 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; @@ -84,6 +83,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxFormComponentUpdatingBehavior; 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.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 9bb1f2494df..4df41bd7ac1 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.DocumentService; 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.schema.AnnotationSchemaService; public class PairwiseUnitizingAgreementTable diff --git a/inception/inception-api/.activate-run-jcasgen b/inception/inception-annotation-storage-api/.activate-run-jcasgen similarity index 100% rename from inception/inception-api/.activate-run-jcasgen rename to inception/inception-annotation-storage-api/.activate-run-jcasgen diff --git a/inception/inception-annotation-storage-api/LICENSE.txt b/inception/inception-annotation-storage-api/LICENSE.txt new file mode 100644 index 00000000000..d6456956733 --- /dev/null +++ b/inception/inception-annotation-storage-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-annotation-storage-api/pom.xml b/inception/inception-annotation-storage-api/pom.xml new file mode 100644 index 00000000000..df22ae9fa90 --- /dev/null +++ b/inception/inception-annotation-storage-api/pom.xml @@ -0,0 +1,45 @@ + + + 4.0.0 + + de.tudarmstadt.ukp.inception.app + inception-app + 30.0-SNAPSHOT + + inception-annotation-storage-api + INCEpTION - Core - Annotation Storage - API + + + de.tudarmstadt.ukp.inception.app + inception-model + + + + org.apache.uima + uimaj-core + + + + + org.apache.uima + uimafit-core + test + + + \ No newline at end of file diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/CasAccessMode.java b/inception/inception-annotation-storage-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/CasAccessMode.java similarity index 98% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/CasAccessMode.java rename to inception/inception-annotation-storage-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/CasAccessMode.java index f8f532d175d..b8058e33b05 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/CasAccessMode.java +++ b/inception/inception-annotation-storage-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/CasAccessMode.java @@ -17,8 +17,6 @@ */ package de.tudarmstadt.ukp.clarin.webanno.api.casstorage; -import de.tudarmstadt.ukp.clarin.webanno.api.CasUpgradeMode; - public enum CasAccessMode { /** diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/CasProvider.java b/inception/inception-annotation-storage-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/CasProvider.java similarity index 94% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/CasProvider.java rename to inception/inception-annotation-storage-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/CasProvider.java index c4f215a888b..0fe21d233ee 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/CasProvider.java +++ b/inception/inception-annotation-storage-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/CasProvider.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.clarin.webanno.api; +package de.tudarmstadt.ukp.clarin.webanno.api.casstorage; import java.io.IOException; import java.io.Serializable; diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/CasSessionException.java b/inception/inception-annotation-storage-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/CasSessionException.java similarity index 100% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/CasSessionException.java rename to inception/inception-annotation-storage-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/CasSessionException.java diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/CasStorageService.java b/inception/inception-annotation-storage-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/CasStorageService.java similarity index 94% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/CasStorageService.java rename to inception/inception-annotation-storage-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/CasStorageService.java index 93f35ba9b4e..f71abcff8f5 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/CasStorageService.java +++ b/inception/inception-annotation-storage-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/CasStorageService.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.clarin.webanno.api; +package de.tudarmstadt.ukp.clarin.webanno.api.casstorage; import java.io.IOException; import java.io.InputStream; @@ -24,11 +24,6 @@ import org.apache.uima.cas.CAS; -import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasAccessMode; -import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasSessionException; -import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageServiceAction; -import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageServiceLoader; -import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.ConcurentCasModificationException; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; public interface CasStorageService diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/CasStorageServiceAction.java b/inception/inception-annotation-storage-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/CasStorageServiceAction.java similarity index 100% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/CasStorageServiceAction.java rename to inception/inception-annotation-storage-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/CasStorageServiceAction.java diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/CasStorageServiceLoader.java b/inception/inception-annotation-storage-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/CasStorageServiceLoader.java similarity index 100% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/CasStorageServiceLoader.java rename to inception/inception-annotation-storage-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/CasStorageServiceLoader.java diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/CasUpgradeMode.java b/inception/inception-annotation-storage-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/CasUpgradeMode.java similarity index 96% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/CasUpgradeMode.java rename to inception/inception-annotation-storage-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/CasUpgradeMode.java index 6cf96d6681f..d3ca18cf310 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/CasUpgradeMode.java +++ b/inception/inception-annotation-storage-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/CasUpgradeMode.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.clarin.webanno.api; +package de.tudarmstadt.ukp.clarin.webanno.api.casstorage; public enum CasUpgradeMode { diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/ConcurentCasModificationException.java b/inception/inception-annotation-storage-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/ConcurentCasModificationException.java similarity index 100% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/ConcurentCasModificationException.java rename to inception/inception-annotation-storage-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/ConcurentCasModificationException.java diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/WriteAccessNotPermittedException.java b/inception/inception-annotation-storage-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/WriteAccessNotPermittedException.java similarity index 100% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/WriteAccessNotPermittedException.java rename to inception/inception-annotation-storage-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/casstorage/WriteAccessNotPermittedException.java diff --git a/inception/inception-api/src/main/resources/META-INF/org.apache.uima.fit/types.txt.README b/inception/inception-annotation-storage-api/src/main/resources/META-INF/org.apache.uima.fit/types.txt.README similarity index 100% rename from inception/inception-api/src/main/resources/META-INF/org.apache.uima.fit/types.txt.README rename to inception/inception-annotation-storage-api/src/main/resources/META-INF/org.apache.uima.fit/types.txt.README diff --git a/inception/inception-api/src/main/resources/de/tudarmstadt/ukp/clarin/webanno/api/type/webanno-internal.xml b/inception/inception-annotation-storage-api/src/main/resources/de/tudarmstadt/ukp/clarin/webanno/api/type/webanno-internal.xml similarity index 100% rename from inception/inception-api/src/main/resources/de/tudarmstadt/ukp/clarin/webanno/api/type/webanno-internal.xml rename to inception/inception-annotation-storage-api/src/main/resources/de/tudarmstadt/ukp/clarin/webanno/api/type/webanno-internal.xml diff --git a/inception/inception-api/src/test/java/de/tudarmstadt/ukp/clarin/webanno/api/type/CASMetadataTest.java b/inception/inception-annotation-storage-api/src/test/java/de/tudarmstadt/ukp/clarin/webanno/api/type/CASMetadataTest.java similarity index 100% rename from inception/inception-api/src/test/java/de/tudarmstadt/ukp/clarin/webanno/api/type/CASMetadataTest.java rename to inception/inception-annotation-storage-api/src/test/java/de/tudarmstadt/ukp/clarin/webanno/api/type/CASMetadataTest.java diff --git a/inception/inception-api/suppressions.xml b/inception/inception-annotation-storage-api/suppressions.xml similarity index 100% rename from inception/inception-api/suppressions.xml rename to inception/inception-annotation-storage-api/suppressions.xml diff --git a/inception/inception-annotation-storage/pom.xml b/inception/inception-annotation-storage/pom.xml index a9d60914696..d715f3f16bb 100644 --- a/inception/inception-annotation-storage/pom.xml +++ b/inception/inception-annotation-storage/pom.xml @@ -54,6 +54,14 @@ de.tudarmstadt.ukp.inception.app inception-api + + de.tudarmstadt.ukp.inception.app + inception-documents-api + + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api + de.tudarmstadt.ukp.inception.app inception-api-annotation 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 34d0d296848..1c7b34cfa96 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,8 +17,6 @@ */ package de.tudarmstadt.ukp.inception.annotation.storage; -import static de.tudarmstadt.ukp.clarin.webanno.api.CasUpgradeMode.AUTO_CAS_UPGRADE; -import static de.tudarmstadt.ukp.clarin.webanno.api.CasUpgradeMode.NO_CAS_UPGRADE; 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; @@ -26,6 +24,8 @@ 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; import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasAccessMode.UNMANAGED_NON_INITIALIZING_ACCESS; +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 java.lang.System.currentTimeMillis; import static java.util.Collections.newSetFromMap; @@ -67,13 +67,13 @@ import com.github.benmanes.caffeine.cache.Scheduler; import com.github.benmanes.caffeine.cache.stats.CacheStats; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; -import de.tudarmstadt.ukp.clarin.webanno.api.CasStorageService; -import de.tudarmstadt.ukp.clarin.webanno.api.CasUpgradeMode; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasAccessMode; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasSessionException; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageServiceAction; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageServiceLoader; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasUpgradeMode; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.ConcurentCasModificationException; import de.tudarmstadt.ukp.clarin.webanno.api.event.LayerConfigurationChangedEvent; import de.tudarmstadt.ukp.clarin.webanno.diag.CasDoctor; diff --git a/inception/inception-annotation-storage/src/main/java/de/tudarmstadt/ukp/inception/annotation/storage/CasStorageSession.java b/inception/inception-annotation-storage/src/main/java/de/tudarmstadt/ukp/inception/annotation/storage/CasStorageSession.java index f4013672346..c19414810f3 100644 --- a/inception/inception-annotation-storage/src/main/java/de/tudarmstadt/ukp/inception/annotation/storage/CasStorageSession.java +++ b/inception/inception-annotation-storage/src/main/java/de/tudarmstadt/ukp/inception/annotation/storage/CasStorageSession.java @@ -31,10 +31,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.tudarmstadt.ukp.clarin.webanno.api.CasStorageService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.util.WebAnnoCasUtil; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasAccessMode; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasSessionException; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.WriteAccessNotPermittedException; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; diff --git a/inception/inception-annotation-storage/src/main/java/de/tudarmstadt/ukp/inception/annotation/storage/config/CasStorageServiceAutoConfiguration.java b/inception/inception-annotation-storage/src/main/java/de/tudarmstadt/ukp/inception/annotation/storage/config/CasStorageServiceAutoConfiguration.java index 6c9ae8f8fe7..4a4ab40163e 100644 --- a/inception/inception-annotation-storage/src/main/java/de/tudarmstadt/ukp/inception/annotation/storage/config/CasStorageServiceAutoConfiguration.java +++ b/inception/inception-annotation-storage/src/main/java/de/tudarmstadt/ukp/inception/annotation/storage/config/CasStorageServiceAutoConfiguration.java @@ -22,13 +22,13 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import de.tudarmstadt.ukp.clarin.webanno.api.CasStorageService; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; import de.tudarmstadt.ukp.clarin.webanno.diag.CasDoctor; import de.tudarmstadt.ukp.inception.annotation.storage.CasStorageServiceImpl; import de.tudarmstadt.ukp.inception.annotation.storage.CasStorageServiceSharedAccessCacheAdapter; import de.tudarmstadt.ukp.inception.annotation.storage.driver.CasStorageDriver; import de.tudarmstadt.ukp.inception.annotation.storage.driver.filesystem.FileSystemCasStorageDriver; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; @Configuration 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 bf6e1aa0b69..e49490f680b 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 @@ -58,7 +58,6 @@ import de.tudarmstadt.ukp.clarin.webanno.api.annotation.util.WebAnnoCasUtil; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.ConcurentCasModificationException; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; import de.tudarmstadt.ukp.clarin.webanno.api.type.CASMetadata; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.WicketUtil; @@ -67,6 +66,7 @@ import de.tudarmstadt.ukp.inception.annotation.storage.config.CasStorageBackupProperties; import de.tudarmstadt.ukp.inception.annotation.storage.config.CasStorageProperties; import de.tudarmstadt.ukp.inception.annotation.storage.driver.CasStorageDriver; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; public class FileSystemCasStorageDriver implements CasStorageDriver diff --git a/inception/inception-annotation-storage/src/test/java/de/tudarmstadt/ukp/inception/annotation/storage/CasStorageServiceImplTest.java b/inception/inception-annotation-storage/src/test/java/de/tudarmstadt/ukp/inception/annotation/storage/CasStorageServiceImplTest.java index 0420d4d48f1..b820632223f 100644 --- a/inception/inception-annotation-storage/src/test/java/de/tudarmstadt/ukp/inception/annotation/storage/CasStorageServiceImplTest.java +++ b/inception/inception-annotation-storage/src/test/java/de/tudarmstadt/ukp/inception/annotation/storage/CasStorageServiceImplTest.java @@ -17,13 +17,13 @@ */ package de.tudarmstadt.ukp.inception.annotation.storage; -import static de.tudarmstadt.ukp.clarin.webanno.api.CasUpgradeMode.AUTO_CAS_UPGRADE; -import static de.tudarmstadt.ukp.clarin.webanno.api.CasUpgradeMode.FORCE_CAS_UPGRADE; -import static de.tudarmstadt.ukp.clarin.webanno.api.CasUpgradeMode.NO_CAS_UPGRADE; 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; import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasAccessMode.UNMANAGED_NON_INITIALIZING_ACCESS; +import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasUpgradeMode.AUTO_CAS_UPGRADE; +import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasUpgradeMode.FORCE_CAS_UPGRADE; +import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasUpgradeMode.NO_CAS_UPGRADE; import static de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst.INITIAL_CAS_PSEUDO_USER; import static de.tudarmstadt.ukp.inception.annotation.storage.CasMetadataUtils.getInternalTypeSystem; import static de.tudarmstadt.ukp.inception.annotation.storage.CasStorageSession.openNested; @@ -59,10 +59,9 @@ import org.slf4j.LoggerFactory; import org.slf4j.MDC; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.util.WebAnnoCasUtil; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasSessionException; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; import de.tudarmstadt.ukp.clarin.webanno.api.event.LayerConfigurationChangedEvent; import de.tudarmstadt.ukp.clarin.webanno.api.type.CASMetadata; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -72,6 +71,7 @@ import de.tudarmstadt.ukp.inception.annotation.storage.config.CasStorageCachePropertiesImpl; import de.tudarmstadt.ukp.inception.annotation.storage.config.CasStoragePropertiesImpl; import de.tudarmstadt.ukp.inception.annotation.storage.driver.filesystem.FileSystemCasStorageDriver; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; public class CasStorageServiceImplTest { diff --git a/inception/inception-api-annotation/pom.xml b/inception/inception-api-annotation/pom.xml index 3f640a96cb6..8e120e7ec79 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-documents-api + de.tudarmstadt.ukp.inception.app inception-api-schema @@ -71,6 +75,10 @@ de.tudarmstadt.ukp.inception.app inception-model + + de.tudarmstadt.ukp.inception.app + inception-model-vdoc + de.tudarmstadt.ukp.inception.app inception-support diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/actionbar/export/ExportDocumentDialogContent.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/actionbar/export/ExportDocumentDialogContent.java index 90aa06ea5cc..72a5edd4530 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/actionbar/export/ExportDocumentDialogContent.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/actionbar/export/ExportDocumentDialogContent.java @@ -42,12 +42,12 @@ import org.slf4j.LoggerFactory; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.format.FormatSupport; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxFormComponentUpdatingBehavior; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxLink; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.AjaxDownloadLink; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.InputStreamResourceStream; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; /** diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/config/AnnotationAutoConfiguration.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/config/AnnotationAutoConfiguration.java index 80b6e81da5d..6dba82dd4e2 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/config/AnnotationAutoConfiguration.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/config/AnnotationAutoConfiguration.java @@ -33,10 +33,10 @@ import de.tudarmstadt.ukp.clarin.webanno.api.annotation.rendering.PreRenderer; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.rendering.PreRendererImpl; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.rendering.RenderNotificationRenderStep; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; +import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.preferences.PreferencesService; import de.tudarmstadt.ukp.inception.rendering.coloring.ColoringService; -import de.tudarmstadt.ukp.inception.rendering.config.AnnotationEditorProperties; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; @@ -88,7 +88,7 @@ public UserPreferencesService userPreferencesService( AnnotationEditorDefaultPreferencesProperties aDefaultPreferences, AnnotationSchemaService aAnnotationService, RepositoryProperties aRepositoryProperties, ColoringService aColoringService, - AnnotationEditorProperties aAnnotationEditorProperties, + AnnotationSchemaProperties aAnnotationEditorProperties, PreferencesService aPreferencesService) { return new UserPreferencesServiceImpl(aDefaultPreferences, aAnnotationService, 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 9e53572c3a7..9251f2940ba 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 @@ -53,7 +53,6 @@ import org.wicketstuff.urlfragment.UrlFragment; import org.wicketstuff.urlfragment.UrlParametersReceivingBehavior; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; 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; @@ -67,6 +66,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.uima.ICasUtil; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.DecoratedObject; 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.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; 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 0e907c15e78..84a51fedda1 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 @@ -56,6 +56,7 @@ 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; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.AjaxCallback; @@ -67,7 +68,6 @@ import de.tudarmstadt.ukp.inception.preferences.PreferencesService; import de.tudarmstadt.ukp.inception.rendering.coloring.ColoringStrategyType; import de.tudarmstadt.ukp.inception.rendering.coloring.ReadonlyColoringBehaviour; -import de.tudarmstadt.ukp.inception.rendering.config.AnnotationEditorProperties; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotationPreference; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; @@ -87,7 +87,7 @@ public class AnnotationPreferencesDialogContent private @SpringBean AnnotationEditorRegistry annotationEditorRegistry; private @SpringBean UserDao userDao; private @SpringBean UserPreferencesService userPreferencesService; - private @SpringBean AnnotationEditorProperties annotationEditorProperties; + private @SpringBean AnnotationSchemaProperties annotationEditorProperties; private @SpringBean PreferencesService preferencesService; private final Form form; 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 4255b8cf915..656ef8dcc20 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 @@ -49,16 +49,16 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.config.AnnotationAutoConfiguration; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; +import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Mode; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.ApplicationContextProvider; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.preferences.Key; import de.tudarmstadt.ukp.inception.preferences.PreferencesService; import de.tudarmstadt.ukp.inception.rendering.coloring.ColoringService; import de.tudarmstadt.ukp.inception.rendering.coloring.ColoringStrategyType; -import de.tudarmstadt.ukp.inception.rendering.config.AnnotationEditorProperties; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotationPreference; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; @@ -81,14 +81,14 @@ public class UserPreferencesServiceImpl private final AnnotationSchemaService annotationService; private final RepositoryProperties repositoryProperties; private final ColoringService coloringService; - private final AnnotationEditorProperties annotationEditorProperties; + private final AnnotationSchemaProperties annotationEditorProperties; private final PreferencesService preferencesService; public UserPreferencesServiceImpl( AnnotationEditorDefaultPreferencesProperties aDefaultPreferences, AnnotationSchemaService aAnnotationService, RepositoryProperties aRepositoryProperties, ColoringService aColoringService, - AnnotationEditorProperties aAnnotationEditorProperties, + AnnotationSchemaProperties aAnnotationEditorProperties, PreferencesService aPreferencesService) { defaultPreferences = aDefaultPreferences; diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/LabelRenderer.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/LabelRenderer.java index 3c574729f36..3317ca7e52d 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/LabelRenderer.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/LabelRenderer.java @@ -17,7 +17,7 @@ */ package de.tudarmstadt.ukp.clarin.webanno.api.annotation.rendering; -import static de.tudarmstadt.ukp.inception.schema.adapter.TypeUtil.getUiLabelText; +import static de.tudarmstadt.ukp.inception.schema.feature.TypeUtil.getUiLabelText; import org.springframework.core.annotation.Order; diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureEditor.java index 7a3d4c4b770..bbe3bcc8b93 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureEditor.java @@ -90,12 +90,12 @@ import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeUtil; import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditorValueChangedEvent; import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.feature.TypeUtil; import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; public class LinkFeatureEditor diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainLayerTraitsEditor.html b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainLayerTraitsEditor.html index 2a5fc08b4ad..8c4abfbfa86 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainLayerTraitsEditor.html +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainLayerTraitsEditor.html @@ -62,9 +62,5 @@ -
- - -
\ No newline at end of file diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainLayerTraitsEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainLayerTraitsEditor.java index e3815bfb34f..22a01cb47cf 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainLayerTraitsEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainLayerTraitsEditor.java @@ -20,27 +20,25 @@ import static de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaBehavior.visibleWhen; import static org.apache.commons.lang3.StringUtils.isBlank; -import org.apache.wicket.AttributeModifier; import org.apache.wicket.markup.html.form.CheckBox; import org.apache.wicket.markup.html.form.Form; -import org.apache.wicket.markup.html.form.TextArea; import org.apache.wicket.model.IModel; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.spring.injection.annot.SpringBean; +import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.inception.annotation.layer.LayerTraitsEditor_ImplBase; import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.AnchoringModeSelect; import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.OverlapModeSelect; import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.ValidationModeSelect; -import de.tudarmstadt.ukp.inception.rendering.config.AnnotationEditorProperties; public class ChainLayerTraitsEditor extends LayerTraitsEditor_ImplBase { private static final long serialVersionUID = -9082045435380184514L; - private @SpringBean AnnotationEditorProperties annotationEditorProperties; + private @SpringBean AnnotationSchemaProperties annotationEditorProperties; public ChainLayerTraitsEditor(String aId, ChainLayerSupport aLayerSupport, IModel aLayer) @@ -57,25 +55,15 @@ protected void initializeForm(Form aForm) aForm.add(new OverlapModeSelect("overlapMode", getLayerModel())); - CheckBox linkedListBehavior = new CheckBox("linkedListBehavior"); + var linkedListBehavior = new CheckBox("linkedListBehavior"); linkedListBehavior.setOutputMarkupId(true); linkedListBehavior.setModel(PropertyModel.of(getLayerModel(), "linkedListBehavior")); aForm.add(linkedListBehavior); - CheckBox crossSentence = new CheckBox("crossSentence"); + var crossSentence = new CheckBox("crossSentence"); crossSentence.setOutputMarkupPlaceholderTag(true); crossSentence.setModel(PropertyModel.of(getLayerModel(), "crossSentence")); crossSentence.add(visibleWhen(() -> !isBlank(getLayerModelObject().getType()))); aForm.add(crossSentence); - - TextArea onClickJavascriptAction = new TextArea("onClickJavascriptAction"); - onClickJavascriptAction - .setVisible(annotationEditorProperties.isConfigurableJavaScriptActionEnabled()); - onClickJavascriptAction - .setModel(PropertyModel.of(getLayerModel(), "onClickJavascriptAction")); - onClickJavascriptAction.add(new AttributeModifier("placeholder", - "alert($PARAM.PID + ' ' + $PARAM.PNAME + ' ' + $PARAM.DOCID + ' ' + " - + "$PARAM.DOCNAME + ' ' + $PARAM.fieldname);")); - aForm.add(onClickJavascriptAction); } } diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainRenderer.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainRenderer.java index 95a81c14fd1..e8fff42592c 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainRenderer.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainRenderer.java @@ -19,7 +19,7 @@ import static de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst.COREFERENCE_RELATION_FEATURE; import static de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst.COREFERENCE_TYPE_FEATURE; -import static de.tudarmstadt.ukp.inception.schema.adapter.TypeUtil.getUiLabelText; +import static de.tudarmstadt.ukp.inception.schema.feature.TypeUtil.getUiLabelText; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; import static java.util.stream.Collectors.toList; diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationLayerTraitsEditor.html b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationLayerTraitsEditor.html index 4ba4abcbbc2..b77224e4255 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationLayerTraitsEditor.html +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationLayerTraitsEditor.html @@ -60,9 +60,5 @@
-
- - -
\ No newline at end of file diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationLayerTraitsEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationLayerTraitsEditor.java index 5d36f6d1123..8b42520ec4a 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationLayerTraitsEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationLayerTraitsEditor.java @@ -19,27 +19,25 @@ import static de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaBehavior.enabledWhen; -import org.apache.wicket.AttributeModifier; import org.apache.wicket.markup.html.form.CheckBox; import org.apache.wicket.markup.html.form.Form; -import org.apache.wicket.markup.html.form.TextArea; import org.apache.wicket.model.IModel; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.spring.injection.annot.SpringBean; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.coloring.ColoringRulesConfigurationPanel; +import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.inception.annotation.layer.LayerTraitsEditor_ImplBase; import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.OverlapModeSelect; import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.ValidationModeSelect; -import de.tudarmstadt.ukp.inception.rendering.config.AnnotationEditorProperties; public class RelationLayerTraitsEditor extends LayerTraitsEditor_ImplBase { private static final long serialVersionUID = -9082045435380184514L; - private @SpringBean AnnotationEditorProperties annotationEditorProperties; + private @SpringBean AnnotationSchemaProperties annotationEditorProperties; public RelationLayerTraitsEditor(String aId, RelationLayerSupport aLayerSupport, IModel aLayer) @@ -50,13 +48,13 @@ public RelationLayerTraitsEditor(String aId, RelationLayerSupport aLayerSupport, @Override protected void initializeForm(Form aForm) { - CheckBox renderArcs = new CheckBox("renderArcs", getTraitsModel().bind("renderArcs")); + var renderArcs = new CheckBox("renderArcs", getTraitsModel().bind("renderArcs")); renderArcs.setOutputMarkupPlaceholderTag(true); aForm.add(renderArcs); aForm.add(new ValidationModeSelect("validationMode", getLayerModel())); - OverlapModeSelect overlapMode = new OverlapModeSelect("overlapMode", getLayerModel()); + var overlapMode = new OverlapModeSelect("overlapMode", getLayerModel()); // Not configurable for layers that attach to tokens (currently that is the only layer on // which we use the attach feature) overlapMode.add(enabledWhen(() -> getLayerModelObject().getAttachFeature() == null)); @@ -65,28 +63,12 @@ protected void initializeForm(Form aForm) aForm.add(new ColoringRulesConfigurationPanel("coloringRules", getLayerModel(), getTraitsModel().bind("coloringRules.rules"))); - CheckBox crossSentence = new CheckBox("crossSentence"); + var crossSentence = new CheckBox("crossSentence"); crossSentence.setOutputMarkupPlaceholderTag(true); crossSentence.setModel(PropertyModel.of(getLayerModel(), "crossSentence")); // Not configurable for layers that attach to tokens (currently that is the only layer on // which we use the attach feature) crossSentence.add(enabledWhen(() -> getLayerModelObject().getAttachFeature() == null)); aForm.add(crossSentence); - - aForm.add(createJavaScriptActionField()); - } - - @Deprecated - private TextArea createJavaScriptActionField() - { - TextArea onClickJavascriptAction = new TextArea("onClickJavascriptAction"); - onClickJavascriptAction - .setVisible(annotationEditorProperties.isConfigurableJavaScriptActionEnabled()); - onClickJavascriptAction - .setModel(PropertyModel.of(getLayerModel(), "onClickJavascriptAction")); - onClickJavascriptAction.add(new AttributeModifier("placeholder", - "alert($PARAM.PID + ' ' + $PARAM.PNAME + ' ' + $PARAM.DOCID + ' ' + " - + "$PARAM.DOCNAME + ' ' + $PARAM.fieldname);")); - return onClickJavascriptAction; } } diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanLayerTraitsEditor.html b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanLayerTraitsEditor.html index 96c68879e34..16207ed3ea8 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanLayerTraitsEditor.html +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanLayerTraitsEditor.html @@ -68,9 +68,5 @@
-
- - -
\ No newline at end of file diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanLayerTraitsEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanLayerTraitsEditor.java index 875490775f7..8cd38168453 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanLayerTraitsEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanLayerTraitsEditor.java @@ -20,15 +20,14 @@ import static de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaBehavior.enabledWhen; import static de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaBehavior.visibleWhen; -import org.apache.wicket.AttributeModifier; import org.apache.wicket.markup.html.form.CheckBox; import org.apache.wicket.markup.html.form.Form; -import org.apache.wicket.markup.html.form.TextArea; import org.apache.wicket.model.IModel; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.spring.injection.annot.SpringBean; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.coloring.ColoringRulesConfigurationPanel; +import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Sentence; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.SurfaceForm; @@ -37,14 +36,13 @@ import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.AnchoringModeSelect; import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.OverlapModeSelect; import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.ValidationModeSelect; -import de.tudarmstadt.ukp.inception.rendering.config.AnnotationEditorProperties; public class SpanLayerTraitsEditor extends LayerTraitsEditor_ImplBase { private static final long serialVersionUID = -9082045435380184514L; - private @SpringBean AnnotationEditorProperties annotationEditorProperties; + private @SpringBean AnnotationSchemaProperties annotationEditorProperties; public SpanLayerTraitsEditor(String aId, SpanLayerSupport aLayerSupport, IModel aLayer) @@ -77,16 +75,6 @@ protected void initializeForm(Form aForm) crossSentence.add(visibleWhen(this::isCrossSentenceModeVisible)); aForm.add(crossSentence); - var onClickJavascriptAction = new TextArea("onClickJavascriptAction"); - onClickJavascriptAction - .setVisible(annotationEditorProperties.isConfigurableJavaScriptActionEnabled()); - onClickJavascriptAction - .setModel(PropertyModel.of(getLayerModel(), "onClickJavascriptAction")); - onClickJavascriptAction.add(new AttributeModifier("placeholder", - "alert($PARAM.PID + ' ' + $PARAM.PNAME + ' ' + $PARAM.DOCID + ' ' + " - + "$PARAM.DOCNAME + ' ' + $PARAM.fieldname);")); - aForm.add(onClickJavascriptAction); - var showTextInHover = new CheckBox("showTextInHover"); showTextInHover.setOutputMarkupPlaceholderTag(true); showTextInHover.setModel(PropertyModel.of(getLayerModel(), "showTextInHover")); diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/editor/state/AnnotatorStateImpl.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/editor/state/AnnotatorStateImpl.java index d9482b46236..1ecd659c99a 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/editor/state/AnnotatorStateImpl.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/editor/state/AnnotatorStateImpl.java @@ -39,6 +39,7 @@ import org.apache.wicket.core.request.handler.IPartialPageRequestHandler; import org.apache.wicket.request.cycle.RequestCycle; +import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.constraints.model.ParsedConstraints; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; @@ -50,7 +51,6 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Tag; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; -import de.tudarmstadt.ukp.inception.rendering.config.AnnotationEditorProperties; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotationPreference; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorStateMetaDataKey; @@ -403,7 +403,7 @@ public List getSelectableLayers() } @Override - public void refreshSelectableLayers(AnnotationEditorProperties aProperties) + public void refreshSelectableLayers(AnnotationSchemaProperties aProperties) { selectableLayers.clear(); diff --git a/inception/inception-api-editor/pom.xml b/inception/inception-api-editor/pom.xml index b821aa72a37..fc88931bfbd 100644 --- a/inception/inception-api-editor/pom.xml +++ b/inception/inception-api-editor/pom.xml @@ -35,6 +35,10 @@ de.tudarmstadt.ukp.inception.app inception-api + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api + de.tudarmstadt.ukp.inception.app inception-api-schema @@ -43,6 +47,10 @@ de.tudarmstadt.ukp.inception.app inception-api-render + + de.tudarmstadt.ukp.inception.app + inception-model-vdoc + de.tudarmstadt.ukp.inception.app inception-model diff --git a/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorBase.java b/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorBase.java index 423768dc303..0df22cd19bb 100644 --- a/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorBase.java +++ b/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorBase.java @@ -39,14 +39,14 @@ import org.apache.wicket.spring.injection.annot.SpringBean; import org.slf4j.Logger; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; +import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.AjaxComponentRespondListener; 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.editor.action.AnnotationActionHandler; -import de.tudarmstadt.ukp.inception.rendering.config.AnnotationEditorProperties; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.pipeline.RenderingPipeline; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequest; @@ -61,7 +61,7 @@ public abstract class AnnotationEditorBase private static final long serialVersionUID = 8637373389151630602L; private static final Logger LOG = getLogger(MethodHandles.lookup().lookupClass()); - private @SpringBean AnnotationEditorProperties properties; + private @SpringBean AnnotationSchemaProperties properties; private @SpringBean AnnotationEditorExtensionRegistry extensionRegistry; private @SpringBean UserDao userService; private @SpringBean RenderingPipeline renderingPipeline; diff --git a/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorFactory.java b/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorFactory.java index be3c012529f..d4196b9e847 100644 --- a/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorFactory.java +++ b/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorFactory.java @@ -24,7 +24,7 @@ import org.apache.wicket.model.IModel; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; diff --git a/inception/inception-api-render/pom.xml b/inception/inception-api-render/pom.xml index 6a6d6b4366f..2fe2dd6788b 100644 --- a/inception/inception-api-render/pom.xml +++ b/inception/inception-api-render/pom.xml @@ -26,10 +26,18 @@ INCEpTION - Core - Annotation rendering API + + de.tudarmstadt.ukp.inception.app + inception-api + de.tudarmstadt.ukp.inception.app inception-model + + de.tudarmstadt.ukp.inception.app + inception-model-vdoc + de.tudarmstadt.ukp.inception.app inception-constraints @@ -57,10 +65,6 @@ org.apache.commons commons-lang3 - - org.apache.commons - commons-collections4 - org.slf4j @@ -76,18 +80,9 @@ spring-beans - - com.fasterxml.jackson.core - jackson-databind - com.fasterxml.jackson.core jackson-annotations - - - org.dkpro.core - dkpro-core-api-segmentation-asl - \ No newline at end of file diff --git a/inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/editorstate/LayerSelectionState.java b/inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/editorstate/LayerSelectionState.java index d454fb358e5..a2cffd10a61 100644 --- a/inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/editorstate/LayerSelectionState.java +++ b/inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/editorstate/LayerSelectionState.java @@ -19,8 +19,8 @@ import java.util.List; +import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; -import de.tudarmstadt.ukp.inception.rendering.config.AnnotationEditorProperties; public interface LayerSelectionState { @@ -75,7 +75,7 @@ public interface LayerSelectionState */ void setAnnotationLayers(List aAnnotationLayers); - void refreshSelectableLayers(AnnotationEditorProperties aProperties); + void refreshSelectableLayers(AnnotationSchemaProperties aProperties); List getSelectableLayers(); } diff --git a/inception/inception-api-schema/pom.xml b/inception/inception-api-schema/pom.xml index f1b1bb5da76..76428916938 100644 --- a/inception/inception-api-schema/pom.xml +++ b/inception/inception-api-schema/pom.xml @@ -28,15 +28,19 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-annotation-storage-api de.tudarmstadt.ukp.inception.app - inception-api-render + inception-model de.tudarmstadt.ukp.inception.app - inception-model + inception-model-vdoc + + + de.tudarmstadt.ukp.inception.app + inception-api-render de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/AnnotationSchemaService.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/AnnotationSchemaService.java index 8dcb94edf46..ff56e354768 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/AnnotationSchemaService.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/AnnotationSchemaService.java @@ -29,7 +29,7 @@ import org.apache.uima.resource.metadata.TypeSystemDescription; import org.springframework.security.access.prepost.PreAuthorize; -import de.tudarmstadt.ukp.clarin.webanno.api.CasUpgradeMode; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasUpgradeMode; import de.tudarmstadt.ukp.clarin.webanno.api.type.CASMetadata; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/TypeUtil.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/TypeUtil.java similarity index 98% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/TypeUtil.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/TypeUtil.java index 7aae345f999..aa32681fbdd 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/TypeUtil.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/TypeUtil.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.schema.adapter; +package de.tudarmstadt.ukp.inception.schema.feature; import static java.lang.Long.parseLong; @@ -32,6 +32,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.MultiValueMode; import de.tudarmstadt.ukp.inception.rendering.vmodel.VObject; +import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; /** * Utility Class for {@link TypeAdapter} with static methods such as getting {@link TypeAdapter} diff --git a/inception/inception-api/pom.xml b/inception/inception-api/pom.xml index 4abf2d54e8a..35c5f8b7d66 100644 --- a/inception/inception-api/pom.xml +++ b/inception/inception-api/pom.xml @@ -80,16 +80,10 @@ org.apache.wicket wicket-core + - org.apache.wicket - wicket-util - - - - - org.apache.uima - uimafit-core - test + org.dkpro.core + dkpro-core-api-segmentation-asl \ No newline at end of file diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/package-info.java b/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/AnnotationSchemaAutoConfiguration.java similarity index 69% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/package-info.java rename to inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/AnnotationSchemaAutoConfiguration.java index a253101f4ed..48d46746f53 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/package-info.java +++ b/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/AnnotationSchemaAutoConfiguration.java @@ -15,7 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/** - * Provides Interfaces for different dao method implementations. - */ -package de.tudarmstadt.ukp.clarin.webanno.api; +package de.tudarmstadt.ukp.clarin.webanno.api.config; + +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +@Configuration +@EnableConfigurationProperties({ AnnotationSchemaPropertiesImpl.class }) +public class AnnotationSchemaAutoConfiguration +{ + // No Beans +} diff --git a/inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/config/AnnotationEditorProperties.java b/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/AnnotationSchemaProperties.java similarity index 83% rename from inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/config/AnnotationEditorProperties.java rename to inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/AnnotationSchemaProperties.java index 63f7a996c33..33281158525 100644 --- a/inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/config/AnnotationEditorProperties.java +++ b/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/AnnotationSchemaProperties.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.rendering.config; +package de.tudarmstadt.ukp.clarin.webanno.api.config; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Sentence; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; -public interface AnnotationEditorProperties +public interface AnnotationSchemaProperties { boolean isTokenLayerEditable(); @@ -39,11 +39,4 @@ default boolean isLayerBlocked(AnnotationLayer aLayer) return false; } - - /** - * @deprecated Configurable JavaScript action to be removed soon. - */ - @SuppressWarnings("javadoc") - @Deprecated - boolean isConfigurableJavaScriptActionEnabled(); } diff --git a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/config/AnnotationEditorPropertiesImpl.java b/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/AnnotationSchemaPropertiesImpl.java similarity index 70% rename from inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/config/AnnotationEditorPropertiesImpl.java rename to inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/AnnotationSchemaPropertiesImpl.java index d032b524972..be8f49724e2 100644 --- a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/config/AnnotationEditorPropertiesImpl.java +++ b/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/AnnotationSchemaPropertiesImpl.java @@ -15,27 +15,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.schema.config; +package de.tudarmstadt.ukp.clarin.webanno.api.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.jmx.export.annotation.ManagedAttribute; import org.springframework.jmx.export.annotation.ManagedResource; -import de.tudarmstadt.ukp.inception.rendering.config.AnnotationEditorProperties; - /** *

- * This class is exposed as a Spring Component via {@code AnnotationSchemaServiceAutoConfiguration}. + * This class is exposed as a Spring Component via {@link AnnotationSchemaAutoConfiguration}. *

*/ @ConfigurationProperties("ui") @ManagedResource -public class AnnotationEditorPropertiesImpl - implements AnnotationEditorProperties +public class AnnotationSchemaPropertiesImpl + implements AnnotationSchemaProperties { private boolean tokenLayerEditable; private boolean sentenceLayerEditable; - private boolean configurableJavaScriptActionEnabled = false; @ManagedAttribute @Override @@ -62,16 +59,4 @@ public void setSentenceLayerEditable(boolean aSentenceLayerEditable) { sentenceLayerEditable = aSentenceLayerEditable; } - - public void setConfigurableJavaScriptActionEnabled(boolean aConfigurableJavaScriptActionEnabled) - { - configurableJavaScriptActionEnabled = aConfigurableJavaScriptActionEnabled; - } - - @Deprecated - @Override - public boolean isConfigurableJavaScriptActionEnabled() - { - return configurableJavaScriptActionEnabled; - } } diff --git a/inception/inception-api/src/main/resources/META-INF/spring.factories b/inception/inception-api/src/main/resources/META-INF/spring.factories index c99c85dc4c5..96d6ad8e87e 100644 --- a/inception/inception-api/src/main/resources/META-INF/spring.factories +++ b/inception/inception-api/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryAutoConfiguration \ No newline at end of file +de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration \ No newline at end of file diff --git a/inception/inception-app-webapp/pom.xml b/inception/inception-app-webapp/pom.xml index 43daec0f194..4e93d9b8a88 100644 --- a/inception/inception-app-webapp/pom.xml +++ b/inception/inception-app-webapp/pom.xml @@ -26,7 +26,7 @@ inception-app-webapp - INCEpTION - Web-Application + INCEpTION - App - Web-Application war @@ -154,7 +154,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-documents-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-app-webapp/src/main/java/de/tudarmstadt/ukp/inception/app/config/InceptionServletContextInitializer.java b/inception/inception-app-webapp/src/main/java/de/tudarmstadt/ukp/inception/app/config/InceptionServletContextInitializer.java index c442f6771cf..57885390719 100644 --- a/inception/inception-app-webapp/src/main/java/de/tudarmstadt/ukp/inception/app/config/InceptionServletContextInitializer.java +++ b/inception/inception-app-webapp/src/main/java/de/tudarmstadt/ukp/inception/app/config/InceptionServletContextInitializer.java @@ -38,8 +38,8 @@ import org.springframework.security.web.session.HttpSessionEventPublisher; import org.springframework.web.filter.OncePerRequestFilter; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LoggingFilter; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; @Configuration public class InceptionServletContextInitializer diff --git a/inception/inception-app-webapp/src/main/java/de/tudarmstadt/ukp/inception/cli/InceptionCliRunner.java b/inception/inception-app-webapp/src/main/java/de/tudarmstadt/ukp/inception/cli/InceptionCliRunner.java index 347108728be..b3e4e256f43 100644 --- a/inception/inception-app-webapp/src/main/java/de/tudarmstadt/ukp/inception/cli/InceptionCliRunner.java +++ b/inception/inception-app-webapp/src/main/java/de/tudarmstadt/ukp/inception/cli/InceptionCliRunner.java @@ -29,8 +29,8 @@ import org.springframework.context.ApplicationContextAware; import org.springframework.stereotype.Component; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; import de.tudarmstadt.ukp.clarin.webanno.support.logging.Logging; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import picocli.CommandLine; import picocli.CommandLine.Command; import picocli.CommandLine.IFactory; diff --git a/inception/inception-bom/pom.xml b/inception/inception-bom/pom.xml index 20290df21f3..2b14187ef0b 100644 --- a/inception/inception-bom/pom.xml +++ b/inception/inception-bom/pom.xml @@ -352,6 +352,11 @@ inception-annotation-storage 30.0-SNAPSHOT + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api + 30.0-SNAPSHOT + de.tudarmstadt.ukp.inception.app inception-api-formats @@ -362,6 +367,11 @@ inception-documents 30.0-SNAPSHOT + + de.tudarmstadt.ukp.inception.app + inception-documents-api + 30.0-SNAPSHOT + de.tudarmstadt.ukp.inception.app inception-api-editor @@ -402,6 +412,11 @@ inception-export 30.0-SNAPSHOT + + de.tudarmstadt.ukp.inception.app + inception-export-api + 30.0-SNAPSHOT + de.tudarmstadt.ukp.inception.app @@ -543,6 +558,16 @@ inception-diam 30.0-SNAPSHOT + + de.tudarmstadt.ukp.inception.app + inception-api-diam + 30.0-SNAPSHOT + + + de.tudarmstadt.ukp.inception.app + inception-diam-compactv2 + 30.0-SNAPSHOT + de.tudarmstadt.ukp.inception.app inception-diam-editor @@ -563,6 +588,11 @@ inception-model-export 30.0-SNAPSHOT + + de.tudarmstadt.ukp.inception.app + inception-model-vdoc + 30.0-SNAPSHOT + de.tudarmstadt.ukp.inception.app inception-io-xml diff --git a/inception/inception-boot-loader/pom.xml b/inception/inception-boot-loader/pom.xml index 1e2769b95f0..30a81da56a5 100644 --- a/inception/inception-boot-loader/pom.xml +++ b/inception/inception-boot-loader/pom.xml @@ -23,7 +23,7 @@ 30.0-SNAPSHOT inception-boot-loader - INCEpTION - Boot loader + INCEpTION - App - Boot loader jar 1.8 diff --git a/inception/inception-bootstrap/pom.xml b/inception/inception-bootstrap/pom.xml index f6c18f3fa96..98208228ed2 100644 --- a/inception/inception-bootstrap/pom.xml +++ b/inception/inception-bootstrap/pom.xml @@ -24,7 +24,7 @@ 4.0.0 inception-bootstrap - INCEpTION - Bootstrap + INCEpTION - UI - Bootstrap org.apache.wicket diff --git a/inception/inception-brat-editor/pom.xml b/inception/inception-brat-editor/pom.xml index 34797535987..7ce581f6c27 100644 --- a/inception/inception-brat-editor/pom.xml +++ b/inception/inception-brat-editor/pom.xml @@ -33,6 +33,10 @@ de.tudarmstadt.ukp.inception.app inception-api + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api + de.tudarmstadt.ukp.inception.app inception-api-editor @@ -53,6 +57,10 @@ de.tudarmstadt.ukp.inception.app inception-model + + de.tudarmstadt.ukp.inception.app + inception-model-vdoc + de.tudarmstadt.ukp.inception.app inception-preferences @@ -65,6 +73,10 @@ de.tudarmstadt.ukp.inception.app inception-diam + + de.tudarmstadt.ukp.inception.app + inception-api-diam + de.tudarmstadt.ukp.inception.app inception-external-editor diff --git a/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/annotation/BratAnnotationEditor.java b/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/annotation/BratAnnotationEditor.java index 7a635ceb9d8..2f76dd45392 100644 --- a/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/annotation/BratAnnotationEditor.java +++ b/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/annotation/BratAnnotationEditor.java @@ -38,7 +38,7 @@ import org.apache.wicket.spring.injection.annot.SpringBean; import org.springframework.core.annotation.Order; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.brat.config.BratAnnotationEditorProperties; import de.tudarmstadt.ukp.clarin.webanno.brat.config.command.LoadCollectionCommand; import de.tudarmstadt.ukp.clarin.webanno.brat.message.GetDocumentResponse; diff --git a/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/annotation/BratLineOrientedAnnotationEditorFactory.java b/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/annotation/BratLineOrientedAnnotationEditorFactory.java index e4b65161e74..b10a3749f22 100644 --- a/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/annotation/BratLineOrientedAnnotationEditorFactory.java +++ b/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/annotation/BratLineOrientedAnnotationEditorFactory.java @@ -19,8 +19,8 @@ import org.apache.wicket.model.IModel; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.paging.LineOrientedPagingStrategy; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.brat.config.BratAnnotationEditorAutoConfiguration; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorBase; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorFactoryImplBase; diff --git a/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/annotation/BratSentenceOrientedAnnotationEditorFactory.java b/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/annotation/BratSentenceOrientedAnnotationEditorFactory.java index e34cbfd4188..34ac638b8e7 100644 --- a/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/annotation/BratSentenceOrientedAnnotationEditorFactory.java +++ b/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/annotation/BratSentenceOrientedAnnotationEditorFactory.java @@ -19,8 +19,8 @@ import org.apache.wicket.model.IModel; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.paging.SentenceOrientedPagingStrategy; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.brat.config.BratAnnotationEditorAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorBase; diff --git a/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/annotation/BratTokenWrappingAnnotationEditorFactory.java b/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/annotation/BratTokenWrappingAnnotationEditorFactory.java index e9bfca2ddf5..93202b928a3 100644 --- a/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/annotation/BratTokenWrappingAnnotationEditorFactory.java +++ b/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/annotation/BratTokenWrappingAnnotationEditorFactory.java @@ -19,8 +19,8 @@ import org.apache.wicket.model.IModel; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.paging.TokenWrappingPagingStrategy; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.brat.config.BratAnnotationEditorAutoConfiguration; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorBase; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorFactoryImplBase; diff --git a/inception/inception-build/pom.xml b/inception/inception-build/pom.xml index 79ae644fe17..7368157aaeb 100644 --- a/inception/inception-build/pom.xml +++ b/inception/inception-build/pom.xml @@ -23,6 +23,6 @@ 30.0-SNAPSHOT inception-build - INCEpTION - Build resources + INCEpTION - Dev - Build resources jar \ No newline at end of file diff --git a/inception/inception-concept-linking/pom.xml b/inception/inception-concept-linking/pom.xml index 60cdcb1bece..32757ea9cd0 100644 --- a/inception/inception-concept-linking/pom.xml +++ b/inception/inception-concept-linking/pom.xml @@ -103,7 +103,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-documents-api @@ -174,6 +174,11 @@ + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api + test + com.jayway.jsonpath json-path diff --git a/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/config/EntityLinkingServiceAutoConfiguration.java b/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/config/EntityLinkingServiceAutoConfiguration.java index 591adaddb11..537172f6918 100644 --- a/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/config/EntityLinkingServiceAutoConfiguration.java +++ b/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/config/EntityLinkingServiceAutoConfiguration.java @@ -28,7 +28,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; import de.tudarmstadt.ukp.inception.conceptlinking.feature.CasingFeatureGenerator; import de.tudarmstadt.ukp.inception.conceptlinking.feature.EntityRankingFeatureGenerator; import de.tudarmstadt.ukp.inception.conceptlinking.feature.FrequencyFeatureGenerator; @@ -38,6 +37,7 @@ import de.tudarmstadt.ukp.inception.conceptlinking.recommender.NamedEntityLinkerFactory; import de.tudarmstadt.ukp.inception.conceptlinking.service.ConceptLinkingService; import de.tudarmstadt.ukp.inception.conceptlinking.service.ConceptLinkingServiceImpl; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.kb.KnowledgeBaseService; import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBaseServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; diff --git a/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/feature/FrequencyFeatureGenerator.java b/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/feature/FrequencyFeatureGenerator.java index 82ad78962a6..d1933e60717 100644 --- a/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/feature/FrequencyFeatureGenerator.java +++ b/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/feature/FrequencyFeatureGenerator.java @@ -23,10 +23,10 @@ import java.io.File; import java.util.Map; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; import de.tudarmstadt.ukp.inception.conceptlinking.config.EntityLinkingServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.conceptlinking.model.CandidateEntity; import de.tudarmstadt.ukp.inception.conceptlinking.util.FileUtils; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; /** * Assigns frequency priors from a pre-defined dictionary. diff --git a/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/feature/SemanticSignatureFeatureGenerator.java b/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/feature/SemanticSignatureFeatureGenerator.java index 294c5cd8935..b67fa7e5802 100644 --- a/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/feature/SemanticSignatureFeatureGenerator.java +++ b/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/feature/SemanticSignatureFeatureGenerator.java @@ -52,12 +52,12 @@ import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; import de.tudarmstadt.ukp.inception.conceptlinking.config.EntityLinkingProperties; import de.tudarmstadt.ukp.inception.conceptlinking.model.CandidateEntity; import de.tudarmstadt.ukp.inception.conceptlinking.model.Property; import de.tudarmstadt.ukp.inception.conceptlinking.model.SemanticSignature; import de.tudarmstadt.ukp.inception.conceptlinking.util.FileUtils; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.kb.KnowledgeBaseService; import de.tudarmstadt.ukp.inception.kb.event.KnowledgeBaseConfigurationChangedEvent; import de.tudarmstadt.ukp.inception.kb.model.KnowledgeBase; diff --git a/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/service/ConceptLinkingServiceImpl.java b/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/service/ConceptLinkingServiceImpl.java index eeb0f347084..d41e3f5d0bf 100644 --- a/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/service/ConceptLinkingServiceImpl.java +++ b/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/service/ConceptLinkingServiceImpl.java @@ -57,7 +57,6 @@ import org.springframework.context.event.EventListener; import org.springframework.core.annotation.AnnotationAwareOrderComparator; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.logging.BaseLoggers; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.WicketUtil; @@ -68,6 +67,7 @@ import de.tudarmstadt.ukp.inception.conceptlinking.model.CandidateEntity; import de.tudarmstadt.ukp.inception.conceptlinking.ranking.BaselineRankingStrategy; import de.tudarmstadt.ukp.inception.conceptlinking.util.FileUtils; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.kb.ConceptFeatureValueType; import de.tudarmstadt.ukp.inception.kb.KnowledgeBaseService; import de.tudarmstadt.ukp.inception.kb.RepositoryType; diff --git a/inception/inception-concept-linking/src/test/java/de/tudarmstadt/ukp/inception/conceptlinking/service/ConceptLinkingServiceImplTest.java b/inception/inception-concept-linking/src/test/java/de/tudarmstadt/ukp/inception/conceptlinking/service/ConceptLinkingServiceImplTest.java index 73de0a2956f..0b3257c9136 100644 --- a/inception/inception-concept-linking/src/test/java/de/tudarmstadt/ukp/inception/conceptlinking/service/ConceptLinkingServiceImplTest.java +++ b/inception/inception-concept-linking/src/test/java/de/tudarmstadt/ukp/inception/conceptlinking/service/ConceptLinkingServiceImplTest.java @@ -40,10 +40,10 @@ import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.inception.conceptlinking.config.EntityLinkingPropertiesImpl; import de.tudarmstadt.ukp.inception.conceptlinking.util.TestFixtures; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.kb.KnowledgeBaseService; import de.tudarmstadt.ukp.inception.kb.KnowledgeBaseServiceImpl; import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBaseProperties; diff --git a/inception/inception-constraints/pom.xml b/inception/inception-constraints/pom.xml index 36675e18dc1..15181ca8553 100644 --- a/inception/inception-constraints/pom.xml +++ b/inception/inception-constraints/pom.xml @@ -54,10 +54,18 @@ de.tudarmstadt.ukp.inception.app inception-model-export + + de.tudarmstadt.ukp.inception.app + inception-export-api + de.tudarmstadt.ukp.inception.app inception-api + + de.tudarmstadt.ukp.inception.app + inception-documents-api + de.tudarmstadt.ukp.inception.app inception-support 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 dc59467235e..20a774ec712 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 @@ -43,7 +43,6 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; import de.tudarmstadt.ukp.clarin.webanno.constraints.grammar.ASTConstraintsSet; import de.tudarmstadt.ukp.clarin.webanno.constraints.grammar.ConstraintsParser; import de.tudarmstadt.ukp.clarin.webanno.constraints.grammar.ParseException; @@ -51,6 +50,7 @@ import de.tudarmstadt.ukp.clarin.webanno.constraints.model.Scope; import de.tudarmstadt.ukp.clarin.webanno.model.ConstraintSet; import de.tudarmstadt.ukp.clarin.webanno.model.Project; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; @Component(ConstraintsService.SERVICE_NAME) public class ConstraintsServiceImpl diff --git a/inception/inception-curation/pom.xml b/inception/inception-curation/pom.xml index 4264f7c1418..f470cf39357 100644 --- a/inception/inception-curation/pom.xml +++ b/inception/inception-curation/pom.xml @@ -25,6 +25,10 @@ inception-curation INCEpTION - Curation + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api + de.tudarmstadt.ukp.inception.app inception-api-annotation @@ -35,7 +39,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-render + inception-documents-api de.tudarmstadt.ukp.inception.app @@ -45,10 +49,18 @@ de.tudarmstadt.ukp.inception.app inception-model + + de.tudarmstadt.ukp.inception.app + inception-model-vdoc + de.tudarmstadt.ukp.inception.app inception-model-export + + de.tudarmstadt.ukp.inception.app + inception-export-api + de.tudarmstadt.ukp.inception.app inception-api 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 47a084f1cbe..8722bdaaf1a 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,8 +24,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import de.tudarmstadt.ukp.clarin.webanno.api.CasStorageService; 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.schema.AnnotationSchemaService; diff --git a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/config/CurationServiceAutoConfiguration.java b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/config/CurationServiceAutoConfiguration.java index de4e01db141..9b220c95d58 100644 --- a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/config/CurationServiceAutoConfiguration.java +++ b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/config/CurationServiceAutoConfiguration.java @@ -29,7 +29,7 @@ import org.springframework.context.annotation.Lazy; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; +import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.inception.curation.export.CuratedDocumentsExporter; import de.tudarmstadt.ukp.inception.curation.export.CurationWorkflowExporter; import de.tudarmstadt.ukp.inception.curation.merge.DefaultMergeStrategyFactory; @@ -45,7 +45,7 @@ import de.tudarmstadt.ukp.inception.curation.service.CurationServiceImpl; import de.tudarmstadt.ukp.inception.curation.settings.CurationProjectSettingsMenuItem; import de.tudarmstadt.ukp.inception.curation.settings.CurationProjectSettingsPanelFactory; -import de.tudarmstadt.ukp.inception.rendering.config.AnnotationEditorProperties; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; @Configuration @@ -81,7 +81,7 @@ public CurationService curationService( @Bean public CurationMergeService curationMergeService(AnnotationSchemaService aAnnotationService, - AnnotationEditorProperties aAnnotationEditorProperties, + AnnotationSchemaProperties aAnnotationEditorProperties, ApplicationEventPublisher aApplicationEventPublisher) { return new CurationMergeServiceImpl(aAnnotationService, aApplicationEventPublisher); diff --git a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporter.java b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporter.java index e5d807b15e2..f38ffc73f4e 100644 --- a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporter.java +++ b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporter.java @@ -51,7 +51,6 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.export.FullProjectExportRequest; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportException; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportTaskMonitor; @@ -64,6 +63,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; import de.tudarmstadt.ukp.inception.annotation.storage.CasStorageSession; import de.tudarmstadt.ukp.inception.curation.config.CurationServiceAutoConfiguration; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.documents.exporters.SourceDocumentExporter; /** 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 52ef31f7b33..123cc0ff0ed 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,8 +36,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.CasStorageService; 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; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; diff --git a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporterTest.java b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporterTest.java index 3e69c33c985..97d22eb6e0e 100644 --- a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporterTest.java +++ b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporterTest.java @@ -40,10 +40,8 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import de.tudarmstadt.ukp.clarin.webanno.api.CasStorageService; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectImportRequest; import de.tudarmstadt.ukp.clarin.webanno.diag.ChecksRegistry; import de.tudarmstadt.ukp.clarin.webanno.diag.RepairsRegistry; @@ -56,6 +54,8 @@ import de.tudarmstadt.ukp.inception.annotation.storage.config.CasStoragePropertiesImpl; import de.tudarmstadt.ukp.inception.annotation.storage.driver.CasStorageDriver; 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.export.DocumentImportExportServiceImpl; import de.tudarmstadt.ukp.inception.export.config.DocumentImportExportServiceProperties; import de.tudarmstadt.ukp.inception.export.config.DocumentImportExportServicePropertiesImpl; 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 4ca289243e9..dbcd83a87c7 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,9 +41,8 @@ import org.springframework.util.FileSystemUtils; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryAutoConfiguration; +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; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -55,6 +54,8 @@ import de.tudarmstadt.ukp.inception.annotation.storage.config.CasStorageServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.curation.config.CurationDocumentServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.curation.service.CurationDocumentService; +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.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; @@ -73,6 +74,7 @@ CasStorageServiceAutoConfiguration.class, // RepositoryAutoConfiguration.class, // AnnotationSchemaServiceAutoConfiguration.class, // + AnnotationSchemaAutoConfiguration.class, // SecurityAutoConfiguration.class, // CurationDocumentServiceAutoConfiguration.class }) public class CurationDocumentServiceImplTest diff --git a/inception/inception-diag/pom.xml b/inception/inception-diag/pom.xml index efe9e82d7fe..0bd1812baec 100644 --- a/inception/inception-diag/pom.xml +++ b/inception/inception-diag/pom.xml @@ -50,7 +50,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-annotation-storage-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-diam-api/LICENSE.txt b/inception/inception-diam-api/LICENSE.txt new file mode 100644 index 00000000000..4bb722fd42c --- /dev/null +++ b/inception/inception-diam-api/LICENSE.txt @@ -0,0 +1,292 @@ + + 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. + +=== brat === + +Copyright (C) 2010-2012 The brat contributors, all rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +=== JQuery SVG === + +Copyright 2007 - 2014 Keith Wood + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software +and associated documentation files (the "Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, publish, distribute, +sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or +substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT +NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +=== JQuery JSON === + +Copyright 2009-2011 Brantley Harris +Copyright 2010–2014 Timo Tijhof + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +=== JSON-Patch === + +(The MIT License) + +Copyright (c) 2013, 2014 Joachim Wester + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +'Software'), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/inception/inception-diam-api/pom.xml b/inception/inception-diam-api/pom.xml new file mode 100644 index 00000000000..02fc1367428 --- /dev/null +++ b/inception/inception-diam-api/pom.xml @@ -0,0 +1,34 @@ + + + + + inception-app + de.tudarmstadt.ukp.inception.app + 30.0-SNAPSHOT + + 4.0.0 + inception-api-diam + INCEpTION - DIAM - API + + + com.fasterxml.jackson.core + jackson-annotations + + + diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/ajax/AjaxResponse.java b/inception/inception-diam-api/src/main/java/de/tudarmstadt/ukp/inception/diam/model/ajax/AjaxResponse.java similarity index 100% rename from inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/ajax/AjaxResponse.java rename to inception/inception-diam-api/src/main/java/de/tudarmstadt/ukp/inception/diam/model/ajax/AjaxResponse.java diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/ajax/DefaultAjaxResponse.java b/inception/inception-diam-api/src/main/java/de/tudarmstadt/ukp/inception/diam/model/ajax/DefaultAjaxResponse.java similarity index 100% rename from inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/ajax/DefaultAjaxResponse.java rename to inception/inception-diam-api/src/main/java/de/tudarmstadt/ukp/inception/diam/model/ajax/DefaultAjaxResponse.java diff --git a/inception/inception-diam-compactv2/LICENSE.txt b/inception/inception-diam-compactv2/LICENSE.txt new file mode 100644 index 00000000000..4bb722fd42c --- /dev/null +++ b/inception/inception-diam-compactv2/LICENSE.txt @@ -0,0 +1,292 @@ + + 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. + +=== brat === + +Copyright (C) 2010-2012 The brat contributors, all rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +=== JQuery SVG === + +Copyright 2007 - 2014 Keith Wood + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software +and associated documentation files (the "Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, publish, distribute, +sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or +substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT +NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +=== JQuery JSON === + +Copyright 2009-2011 Brantley Harris +Copyright 2010–2014 Timo Tijhof + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +=== JSON-Patch === + +(The MIT License) + +Copyright (c) 2013, 2014 Joachim Wester + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +'Software'), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/inception/inception-diam-compactv2/pom.xml b/inception/inception-diam-compactv2/pom.xml new file mode 100644 index 00000000000..b025824232e --- /dev/null +++ b/inception/inception-diam-compactv2/pom.xml @@ -0,0 +1,91 @@ + + + + + inception-app + de.tudarmstadt.ukp.inception.app + 30.0-SNAPSHOT + + 4.0.0 + inception-diam-compactv2 + INCEpTION - DIAM - Compact Serialization v2 + + + de.tudarmstadt.ukp.inception.app + inception-api-diam + + + de.tudarmstadt.ukp.inception.app + inception-api-render + + + de.tudarmstadt.ukp.inception.app + inception-api + + + de.tudarmstadt.ukp.inception.app + inception-model-vdoc + + + de.tudarmstadt.ukp.inception.app + inception-support + + + de.tudarmstadt.ukp.inception.app + inception-model + + + + org.apache.commons + commons-math3 + + + org.apache.commons + commons-lang3 + + + + org.slf4j + slf4j-api + + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-annotations + + + + org.springframework + spring-context + + + + org.dkpro.core + dkpro-core-api-segmentation-asl + + + diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactAnnotatedText.java b/inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactAnnotatedText.java similarity index 100% rename from inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactAnnotatedText.java rename to inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactAnnotatedText.java diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactAnnotation.java b/inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactAnnotation.java similarity index 100% rename from inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactAnnotation.java rename to inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactAnnotation.java diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactAnnotationAttributes.java b/inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactAnnotationAttributes.java similarity index 100% rename from inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactAnnotationAttributes.java rename to inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactAnnotationAttributes.java diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactAnnotationMarker.java b/inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactAnnotationMarker.java similarity index 100% rename from inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactAnnotationMarker.java rename to inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactAnnotationMarker.java diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactArgument.java b/inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactArgument.java similarity index 100% rename from inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactArgument.java rename to inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactArgument.java diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactComment.java b/inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactComment.java similarity index 100% rename from inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactComment.java rename to inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactComment.java diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactLayer.java b/inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactLayer.java similarity index 100% rename from inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactLayer.java rename to inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactLayer.java diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactRange.java b/inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactRange.java similarity index 100% rename from inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactRange.java rename to inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactRange.java diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactRangeList.java b/inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactRangeList.java similarity index 100% rename from inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactRangeList.java rename to inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactRangeList.java diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactRelation.java b/inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactRelation.java similarity index 100% rename from inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactRelation.java rename to inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactRelation.java diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactRelationAttributes.java b/inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactRelationAttributes.java similarity index 100% rename from inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactRelationAttributes.java rename to inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactRelationAttributes.java diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSerializerV2.java b/inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSerializerV2.java similarity index 100% rename from inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSerializerV2.java rename to inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSerializerV2.java diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSerializerV2Impl.java b/inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSerializerV2Impl.java similarity index 95% rename from inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSerializerV2Impl.java rename to inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSerializerV2Impl.java index c560ba3553e..71dbc3c0f31 100644 --- a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSerializerV2Impl.java +++ b/inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSerializerV2Impl.java @@ -28,11 +28,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; 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.diam.editor.config.DiamAutoConfig; -import de.tudarmstadt.ukp.inception.rendering.config.AnnotationEditorProperties; +import de.tudarmstadt.ukp.inception.diam.model.compactv2.config.DiamCompactV2AutoConfig; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequest; import de.tudarmstadt.ukp.inception.rendering.vmodel.VAnnotationMarker; import de.tudarmstadt.ukp.inception.rendering.vmodel.VArc; @@ -44,7 +44,7 @@ /** *

- * This class is exposed as a Spring Component via {@link DiamAutoConfig#compactSerializerV2}. + * This class is exposed as a Spring Component via {@link DiamCompactV2AutoConfig#compactSerializerV2}. *

*/ public class CompactSerializerV2Impl @@ -54,9 +54,9 @@ public class CompactSerializerV2Impl public static final String ID = "compact_v2"; - private final AnnotationEditorProperties properties; + private final AnnotationSchemaProperties properties; - public CompactSerializerV2Impl(AnnotationEditorProperties aProperties) + public CompactSerializerV2Impl(AnnotationSchemaProperties aProperties) { properties = aProperties; } diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSpan.java b/inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSpan.java similarity index 100% rename from inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSpan.java rename to inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSpan.java diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSpanAttributes.java b/inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSpanAttributes.java similarity index 100% rename from inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSpanAttributes.java rename to inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSpanAttributes.java diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactTextMarker.java b/inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactTextMarker.java similarity index 100% rename from inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactTextMarker.java rename to inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactTextMarker.java diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/ScoreSerializer.java b/inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/ScoreSerializer.java similarity index 100% rename from inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/ScoreSerializer.java rename to inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/ScoreSerializer.java diff --git a/inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/config/DiamCompactV2AutoConfig.java b/inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/config/DiamCompactV2AutoConfig.java new file mode 100644 index 00000000000..3ae5121e2ce --- /dev/null +++ b/inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/config/DiamCompactV2AutoConfig.java @@ -0,0 +1,35 @@ +/* + * Licensed to the Technische Universität Darmstadt under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The Technische Universität Darmstadt + * licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. + * + * 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. + */ +package de.tudarmstadt.ukp.inception.diam.model.compactv2.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; +import de.tudarmstadt.ukp.inception.diam.model.compactv2.CompactSerializerV2; +import de.tudarmstadt.ukp.inception.diam.model.compactv2.CompactSerializerV2Impl; + +@Configuration +public class DiamCompactV2AutoConfig +{ + @Bean + public CompactSerializerV2 compactSerializerV2(AnnotationSchemaProperties aProperties) + { + return new CompactSerializerV2Impl(aProperties); + } +} diff --git a/inception/inception-diam-compactv2/src/main/resources/META-INF/spring.factories b/inception/inception-diam-compactv2/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000000..1f0730e6681 --- /dev/null +++ b/inception/inception-diam-compactv2/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +de.tudarmstadt.ukp.inception.diam.model.compactv2.config.DiamCompactV2AutoConfig diff --git a/inception/inception-diam/src/test/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSerializerV2ImplTest.java b/inception/inception-diam-compactv2/src/test/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSerializerV2ImplTest.java similarity index 95% rename from inception/inception-diam/src/test/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSerializerV2ImplTest.java rename to inception/inception-diam-compactv2/src/test/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSerializerV2ImplTest.java index 9dafbcf1d3d..425f4fcc58a 100644 --- a/inception/inception-diam/src/test/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSerializerV2ImplTest.java +++ b/inception/inception-diam-compactv2/src/test/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSerializerV2ImplTest.java @@ -24,6 +24,7 @@ import org.junit.jupiter.api.Test; +import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaPropertiesImpl; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.support.JSONUtil; import de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst; @@ -38,7 +39,6 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VRange; import de.tudarmstadt.ukp.inception.rendering.vmodel.VSpan; import de.tudarmstadt.ukp.inception.rendering.vmodel.VTextMarker; -import de.tudarmstadt.ukp.inception.schema.config.AnnotationEditorPropertiesImpl; public class CompactSerializerV2ImplTest { @@ -83,7 +83,7 @@ void thatSerializationWorks() throws Exception var req = RenderRequest.builder() // .withWindow(0, Integer.MAX_VALUE) // .build(); - var sut = new CompactSerializerV2Impl(new AnnotationEditorPropertiesImpl()); + var sut = new CompactSerializerV2Impl(new AnnotationSchemaPropertiesImpl()); var cdoc = sut.render(vdoc, req); var actual = JSONUtil.toPrettyJsonString(cdoc); diff --git a/inception/inception-diam/src/test/resources/compactv2/reference.json b/inception/inception-diam-compactv2/src/test/resources/compactv2/reference.json similarity index 100% rename from inception/inception-diam/src/test/resources/compactv2/reference.json rename to inception/inception-diam-compactv2/src/test/resources/compactv2/reference.json diff --git a/inception/inception-diam-compactv2/src/test/resources/log4j2-test.xml b/inception/inception-diam-compactv2/src/test/resources/log4j2-test.xml new file mode 100644 index 00000000000..17ef451253c --- /dev/null +++ b/inception/inception-diam-compactv2/src/test/resources/log4j2-test.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/inception/inception-diam-editor/pom.xml b/inception/inception-diam-editor/pom.xml index cbf223d1b60..5604157377b 100644 --- a/inception/inception-diam-editor/pom.xml +++ b/inception/inception-diam-editor/pom.xml @@ -30,6 +30,10 @@ de.tudarmstadt.ukp.inception.app inception-diam + + de.tudarmstadt.ukp.inception.app + inception-diam-compactv2 + de.tudarmstadt.ukp.inception.app inception-ui-annotation @@ -38,6 +42,10 @@ de.tudarmstadt.ukp.inception.app inception-api-annotation + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api + de.tudarmstadt.ukp.inception.app inception-api-render diff --git a/inception/inception-diam-editor/src/main/java/de/tudarmstadt/ukp/inception/diam/sidebar/DiamSidebar.java b/inception/inception-diam-editor/src/main/java/de/tudarmstadt/ukp/inception/diam/sidebar/DiamSidebar.java index 9fb672b2680..dbb56b679b0 100644 --- a/inception/inception-diam-editor/src/main/java/de/tudarmstadt/ukp/inception/diam/sidebar/DiamSidebar.java +++ b/inception/inception-diam-editor/src/main/java/de/tudarmstadt/ukp/inception/diam/sidebar/DiamSidebar.java @@ -20,7 +20,7 @@ import org.apache.wicket.model.IModel; import org.wicketstuff.event.annotation.OnEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.AnnotationPage; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.sidebar.AnnotationSidebar_ImplBase; import de.tudarmstadt.ukp.inception.annotation.events.DocumentOpenedEvent; diff --git a/inception/inception-diam-editor/src/main/java/de/tudarmstadt/ukp/inception/diam/sidebar/DiamSidebarFactory.java b/inception/inception-diam-editor/src/main/java/de/tudarmstadt/ukp/inception/diam/sidebar/DiamSidebarFactory.java index 36773f1bae0..061d48d67bb 100644 --- a/inception/inception-diam-editor/src/main/java/de/tudarmstadt/ukp/inception/diam/sidebar/DiamSidebarFactory.java +++ b/inception/inception-diam-editor/src/main/java/de/tudarmstadt/ukp/inception/diam/sidebar/DiamSidebarFactory.java @@ -27,7 +27,7 @@ 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.CasProvider; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.support.JSONUtil; import de.tudarmstadt.ukp.clarin.webanno.support.WatchedResourceFile; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.AnnotationPage; diff --git a/inception/inception-diam/pom.xml b/inception/inception-diam/pom.xml index 0665598b416..a726f66494e 100644 --- a/inception/inception-diam/pom.xml +++ b/inception/inception-diam/pom.xml @@ -30,6 +30,14 @@ de.tudarmstadt.ukp.inception.app inception-api + + de.tudarmstadt.ukp.inception.app + inception-documents-api + + + de.tudarmstadt.ukp.inception.app + inception-api-diam + de.tudarmstadt.ukp.inception.app inception-api-editor @@ -38,6 +46,10 @@ de.tudarmstadt.ukp.inception.app inception-api-annotation + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api + de.tudarmstadt.ukp.inception.app inception-api-render @@ -50,6 +62,10 @@ de.tudarmstadt.ukp.inception.app inception-model + + de.tudarmstadt.ukp.inception.app + inception-model-vdoc + de.tudarmstadt.ukp.inception.app inception-preferences @@ -141,10 +157,6 @@ org.apache.commons commons-lang3 - - org.apache.commons - commons-math3 - com.github.ben-manes.caffeine diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/LazyDetailsHandler.java b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/LazyDetailsHandler.java index d562def0532..502d0e168f1 100644 --- a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/LazyDetailsHandler.java +++ b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/LazyDetailsHandler.java @@ -23,8 +23,8 @@ import org.apache.wicket.request.Request; import org.springframework.core.annotation.Order; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.inception.diam.editor.config.DiamAutoConfig; import de.tudarmstadt.ukp.inception.diam.editor.lazydetails.LazyDetailsLookupService; import de.tudarmstadt.ukp.inception.diam.model.ajax.AjaxResponse; diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/config/DiamAutoConfig.java b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/config/DiamAutoConfig.java index 43a46fefb02..ba9eecfd6f6 100644 --- a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/config/DiamAutoConfig.java +++ b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/config/DiamAutoConfig.java @@ -24,6 +24,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; +import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.inception.diam.editor.actions.CreateRelationAnnotationHandler; import de.tudarmstadt.ukp.inception.diam.editor.actions.CreateSpanAnnotationHandler; @@ -46,12 +47,9 @@ import de.tudarmstadt.ukp.inception.diam.editor.lazydetails.LazyDetailsLookupServiceImpl; import de.tudarmstadt.ukp.inception.diam.model.compact.CompactSerializer; import de.tudarmstadt.ukp.inception.diam.model.compact.CompactSerializerImpl; -import de.tudarmstadt.ukp.inception.diam.model.compactv2.CompactSerializerV2; -import de.tudarmstadt.ukp.inception.diam.model.compactv2.CompactSerializerV2Impl; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorExtensionRegistry; import de.tudarmstadt.ukp.inception.preferences.ClientSiderUserPreferencesProviderRegistry; import de.tudarmstadt.ukp.inception.preferences.PreferencesService; -import de.tudarmstadt.ukp.inception.rendering.config.AnnotationEditorProperties; import de.tudarmstadt.ukp.inception.rendering.pipeline.RenderingPipeline; import de.tudarmstadt.ukp.inception.rendering.vmodel.serialization.VDocumentSerializerExtensionPoint; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; @@ -158,17 +156,11 @@ public LoadAnnotationsHandler loadAnnotationsHandler(RenderingPipeline aRenderin } @Bean - public CompactSerializer compactSerializer(AnnotationEditorProperties aProperties) + public CompactSerializer compactSerializer(AnnotationSchemaProperties aProperties) { return new CompactSerializerImpl(aProperties); } - @Bean - public CompactSerializerV2 compactSerializerV2(AnnotationEditorProperties aProperties) - { - return new CompactSerializerV2Impl(aProperties); - } - @Bean public LoadPreferences loadPreferences(UserDao aUserService, PreferencesService aPreferencesService) diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/lazydetails/LazyDetailsLookupService.java b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/lazydetails/LazyDetailsLookupService.java index d990a35808d..c3571b7edc8 100644 --- a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/lazydetails/LazyDetailsLookupService.java +++ b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/lazydetails/LazyDetailsLookupService.java @@ -22,7 +22,7 @@ import org.apache.wicket.request.IRequestParameters; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/lazydetails/LazyDetailsLookupServiceImpl.java b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/lazydetails/LazyDetailsLookupServiceImpl.java index f7980828b95..9805f4a5036 100644 --- a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/lazydetails/LazyDetailsLookupServiceImpl.java +++ b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/lazydetails/LazyDetailsLookupServiceImpl.java @@ -30,7 +30,7 @@ import org.apache.wicket.request.IRequestParameters; import org.apache.wicket.util.string.StringValue; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/messages/MAnnotation.java b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/messages/MAnnotation.java index da3d4600e9a..759403544a6 100644 --- a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/messages/MAnnotation.java +++ b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/messages/MAnnotation.java @@ -22,7 +22,7 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.rendering.vmodel.VObject; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeUtil; +import de.tudarmstadt.ukp.inception.schema.feature.TypeUtil; public abstract class MAnnotation { diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compact/CompactSerializerImpl.java b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compact/CompactSerializerImpl.java index a3e1bb0d6f6..f36ffca358e 100644 --- a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compact/CompactSerializerImpl.java +++ b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compact/CompactSerializerImpl.java @@ -22,11 +22,11 @@ import java.util.List; +import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; 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.diam.editor.config.DiamAutoConfig; -import de.tudarmstadt.ukp.inception.rendering.config.AnnotationEditorProperties; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequest; import de.tudarmstadt.ukp.inception.rendering.vmodel.VAnnotationMarker; import de.tudarmstadt.ukp.inception.rendering.vmodel.VArc; @@ -46,9 +46,9 @@ public class CompactSerializerImpl { public static final String ID = "compact"; - private final AnnotationEditorProperties properties; + private final AnnotationSchemaProperties properties; - public CompactSerializerImpl(AnnotationEditorProperties aProperties) + public CompactSerializerImpl(AnnotationSchemaProperties aProperties) { properties = aProperties; } 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 2845df666b4..4fc71f3e104 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,10 +56,8 @@ import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; 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.config.RepositoryProperties; import de.tudarmstadt.ukp.clarin.webanno.api.event.AfterCasWrittenEvent; import de.tudarmstadt.ukp.clarin.webanno.api.event.TransientAnnotationStateChangedEvent; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; @@ -74,6 +72,8 @@ import de.tudarmstadt.ukp.inception.diam.messages.MViewportUpdate; import de.tudarmstadt.ukp.inception.diam.model.websocket.ViewportDefinition; 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.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 0095cabe210..d88dc8be3b3 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,12 +73,9 @@ import org.springframework.web.socket.client.standard.StandardWebSocketClient; import org.springframework.web.socket.messaging.WebSocketStompClient; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; 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.api.config.RepositoryAutoConfiguration; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -98,6 +95,9 @@ import de.tudarmstadt.ukp.inception.diam.messages.MViewportInit; import de.tudarmstadt.ukp.inception.diam.messages.MViewportUpdate; import de.tudarmstadt.ukp.inception.diam.model.websocket.ViewportDefinition; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +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.export.config.DocumentImportExportServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequest; diff --git a/inception/inception-documents-api/LICENSE.txt b/inception/inception-documents-api/LICENSE.txt new file mode 100644 index 00000000000..d6456956733 --- /dev/null +++ b/inception/inception-documents-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-documents-api/pom.xml b/inception/inception-documents-api/pom.xml new file mode 100644 index 00000000000..dd4f4c0fbe3 --- /dev/null +++ b/inception/inception-documents-api/pom.xml @@ -0,0 +1,80 @@ + + + 4.0.0 + + de.tudarmstadt.ukp.inception.app + inception-app + 30.0-SNAPSHOT + + inception-documents-api + INCEpTION - Core - Documents - API + + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api + + + de.tudarmstadt.ukp.inception.app + inception-model + + + de.tudarmstadt.ukp.inception.app + inception-security + + + de.tudarmstadt.ukp.inception.app + inception-support + + + + + + org.apache.wicket + wicket-core + + + + + + org.springframework + spring-context + + + org.springframework.security + spring-security-core + + + org.springframework.boot + spring-boot + + + + + + org.apache.uima + uimaj-core + + + + + org.slf4j + slf4j-api + + + \ No newline at end of file diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/DocumentService.java b/inception/inception-documents-api/src/main/java/de/tudarmstadt/ukp/inception/documents/api/DocumentService.java similarity index 99% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/DocumentService.java rename to inception/inception-documents-api/src/main/java/de/tudarmstadt/ukp/inception/documents/api/DocumentService.java index 7059908b3fa..2cc0a2c04de 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/DocumentService.java +++ b/inception/inception-documents-api/src/main/java/de/tudarmstadt/ukp/inception/documents/api/DocumentService.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.documents.api; import java.io.File; import java.io.IOException; @@ -35,9 +35,8 @@ import org.springframework.security.access.prepost.PreAuthorize; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasAccessMode; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasUpgradeMode; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.ConcurentCasModificationException; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; -import de.tudarmstadt.ukp.clarin.webanno.api.event.AnnotationStateChangeEvent; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentStateChangeFlag; @@ -726,7 +725,7 @@ AnnotationDocumentState setAnnotationDocumentState(AnnotationDocument aDocument, /** * Sets the state of multiple annotation documents at once. This method does not generate - * {@link AnnotationStateChangeEvent} events. This means in particular that webhooks for + * {@code AnnotationStateChangeEvent} events. This means in particular that webhooks for * annotation document changes will not fire and that workload managers will not know that they * need to recalculate the document and project states. * diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/RepositoryAutoConfiguration.java b/inception/inception-documents-api/src/main/java/de/tudarmstadt/ukp/inception/documents/api/RepositoryAutoConfiguration.java similarity index 95% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/RepositoryAutoConfiguration.java rename to inception/inception-documents-api/src/main/java/de/tudarmstadt/ukp/inception/documents/api/RepositoryAutoConfiguration.java index fe68450c027..e8316070acd 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/RepositoryAutoConfiguration.java +++ b/inception/inception-documents-api/src/main/java/de/tudarmstadt/ukp/inception/documents/api/RepositoryAutoConfiguration.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.config; +package de.tudarmstadt.ukp.inception.documents.api; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/RepositoryProperties.java b/inception/inception-documents-api/src/main/java/de/tudarmstadt/ukp/inception/documents/api/RepositoryProperties.java similarity index 97% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/RepositoryProperties.java rename to inception/inception-documents-api/src/main/java/de/tudarmstadt/ukp/inception/documents/api/RepositoryProperties.java index 544df9c88e2..a9852406e3e 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/RepositoryProperties.java +++ b/inception/inception-documents-api/src/main/java/de/tudarmstadt/ukp/inception/documents/api/RepositoryProperties.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.config; +package de.tudarmstadt.ukp.inception.documents.api; import java.io.File; diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/SourceDocumentStateStats.java b/inception/inception-documents-api/src/main/java/de/tudarmstadt/ukp/inception/documents/api/SourceDocumentStateStats.java similarity index 98% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/SourceDocumentStateStats.java rename to inception/inception-documents-api/src/main/java/de/tudarmstadt/ukp/inception/documents/api/SourceDocumentStateStats.java index d125c95a7c3..9f278fc4028 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/SourceDocumentStateStats.java +++ b/inception/inception-documents-api/src/main/java/de/tudarmstadt/ukp/inception/documents/api/SourceDocumentStateStats.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.documents.api; import de.tudarmstadt.ukp.clarin.webanno.model.ProjectState; diff --git a/inception/inception-documents-api/src/main/resources/META-INF/spring.factories b/inception/inception-documents-api/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000000..c5eed2b461e --- /dev/null +++ b/inception/inception-documents-api/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +de.tudarmstadt.ukp.inception.documents.api.RepositoryAutoConfiguration diff --git a/inception/inception-api/src/test/java/de/tudarmstadt/ukp/clarin/webanno/api/SourceDocumentStateStatsTest.java b/inception/inception-documents-api/src/test/java/de/tudarmstadt/ukp/inception/documents/api/SourceDocumentStateStatsTest.java similarity index 97% rename from inception/inception-api/src/test/java/de/tudarmstadt/ukp/clarin/webanno/api/SourceDocumentStateStatsTest.java rename to inception/inception-documents-api/src/test/java/de/tudarmstadt/ukp/inception/documents/api/SourceDocumentStateStatsTest.java index fe127f7408e..d08bb854f2f 100644 --- a/inception/inception-api/src/test/java/de/tudarmstadt/ukp/clarin/webanno/api/SourceDocumentStateStatsTest.java +++ b/inception/inception-documents-api/src/test/java/de/tudarmstadt/ukp/inception/documents/api/SourceDocumentStateStatsTest.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.documents.api; import static de.tudarmstadt.ukp.clarin.webanno.model.ProjectState.ANNOTATION_FINISHED; import static de.tudarmstadt.ukp.clarin.webanno.model.ProjectState.ANNOTATION_IN_PROGRESS; @@ -29,6 +29,8 @@ 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 d6ac2e2479c..0d4803df977 100644 --- a/inception/inception-documents/pom.xml +++ b/inception/inception-documents/pom.xml @@ -23,12 +23,24 @@ 30.0-SNAPSHOT inception-documents - INCEpTION - Core - Persistence API + INCEpTION - Core - Documents + + de.tudarmstadt.ukp.inception.app + inception-documents-api + de.tudarmstadt.ukp.inception.app inception-model-export + + de.tudarmstadt.ukp.inception.app + inception-export-api + + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api + de.tudarmstadt.ukp.inception.app inception-annotation-storage 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 c6f5bb1223b..301d88a8c98 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 @@ -31,7 +31,6 @@ import org.slf4j.LoggerFactory; import org.springframework.security.access.AccessDeniedException; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; @@ -40,6 +39,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; 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; /** 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 391652812af..d64293d7598 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,9 +17,6 @@ */ package de.tudarmstadt.ukp.inception.documents; -import static de.tudarmstadt.ukp.clarin.webanno.api.CasUpgradeMode.AUTO_CAS_UPGRADE; -import static de.tudarmstadt.ukp.clarin.webanno.api.CasUpgradeMode.FORCE_CAS_UPGRADE; -import static de.tudarmstadt.ukp.clarin.webanno.api.CasUpgradeMode.NO_CAS_UPGRADE; 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; @@ -27,6 +24,9 @@ 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; +import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasUpgradeMode.AUTO_CAS_UPGRADE; +import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasUpgradeMode.FORCE_CAS_UPGRADE; +import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasUpgradeMode.NO_CAS_UPGRADE; import static de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState.IGNORE; import static de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentStateChangeFlag.EXPLICIT_ANNOTATOR_USER_ACTION; import static de.tudarmstadt.ukp.clarin.webanno.model.PermissionLevel.ANNOTATOR; @@ -102,15 +102,12 @@ import org.springframework.context.event.EventListener; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.CasStorageService; -import de.tudarmstadt.ukp.clarin.webanno.api.CasUpgradeMode; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; -import de.tudarmstadt.ukp.clarin.webanno.api.SourceDocumentStateStats; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasAccessMode; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasUpgradeMode; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.ConcurentCasModificationException; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; 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; @@ -129,6 +126,9 @@ import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.clarin.webanno.support.logging.BaseLoggers; import de.tudarmstadt.ukp.inception.annotation.storage.CasStorageSession; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +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.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 e630aed51d2..210b72e51ce 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.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; -import de.tudarmstadt.ukp.clarin.webanno.api.SourceDocumentStateStats; 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.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 c4f6166103d..153b491475c 100644 --- a/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/config/DocumentServiceAutoConfiguration.java +++ b/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/config/DocumentServiceAutoConfiguration.java @@ -24,15 +24,15 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import de.tudarmstadt.ukp.clarin.webanno.api.CasStorageService; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.inception.documents.DocumentAccess; import de.tudarmstadt.ukp.inception.documents.DocumentAccessImpl; import de.tudarmstadt.ukp.inception.documents.DocumentServiceImpl; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.documents.exporters.SourceDocumentExporter; @Configuration 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 1ac59ce9fcf..ea25a7d2f95 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 @@ -45,8 +45,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; import de.tudarmstadt.ukp.clarin.webanno.api.export.FullProjectExportRequest; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportException; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportTaskMonitor; @@ -57,6 +55,8 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.documents.config.DocumentServiceAutoConfiguration; /** diff --git a/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/metrics/DocumentsMetricsImpl.java b/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/metrics/DocumentsMetricsImpl.java index 9c7310edb96..e42dcd4026a 100644 --- a/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/metrics/DocumentsMetricsImpl.java +++ b/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/metrics/DocumentsMetricsImpl.java @@ -23,7 +23,7 @@ import org.springframework.jmx.export.annotation.ManagedResource; import org.springframework.stereotype.Service; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; @ManagedResource @Service 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 9c8810068f0..7328b6b88a4 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 @@ -17,9 +17,9 @@ */ package de.tudarmstadt.ukp.inception.documents; -import static de.tudarmstadt.ukp.clarin.webanno.api.CasUpgradeMode.AUTO_CAS_UPGRADE; 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; +import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasUpgradeMode.AUTO_CAS_UPGRADE; import static de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst.INITIAL_CAS_PSEUDO_USER; import static de.tudarmstadt.ukp.inception.annotation.storage.CasMetadataUtils.getInternalTypeSystem; import static de.tudarmstadt.ukp.inception.annotation.storage.CasStorageSession.openNested; @@ -59,11 +59,9 @@ import org.slf4j.MDC; import org.springframework.context.ApplicationEventPublisher; -import de.tudarmstadt.ukp.clarin.webanno.api.CasStorageService; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; +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; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; @@ -76,6 +74,8 @@ import de.tudarmstadt.ukp.inception.annotation.storage.config.CasStoragePropertiesImpl; import de.tudarmstadt.ukp.inception.annotation.storage.driver.CasStorageDriver; 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; @ExtendWith(MockitoExtension.class) public class DocumentServiceImplConcurrencyTest diff --git a/inception/inception-example-imls-data-majority/pom.xml b/inception/inception-example-imls-data-majority/pom.xml index d37386c6115..bec8545a4df 100644 --- a/inception/inception-example-imls-data-majority/pom.xml +++ b/inception/inception-example-imls-data-majority/pom.xml @@ -31,6 +31,11 @@ + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api + provided + de.tudarmstadt.ukp.inception.app inception-recommendation-api @@ -56,11 +61,6 @@ inception-support provided - - de.tudarmstadt.ukp.inception.app - inception-api - provided - de.tudarmstadt.ukp.inception.app inception-annotation-storage diff --git a/inception/inception-export-api/LICENSE.txt b/inception/inception-export-api/LICENSE.txt new file mode 100644 index 00000000000..d6456956733 --- /dev/null +++ b/inception/inception-export-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-export-api/pom.xml b/inception/inception-export-api/pom.xml new file mode 100644 index 00000000000..8bbc69596c4 --- /dev/null +++ b/inception/inception-export-api/pom.xml @@ -0,0 +1,70 @@ + + + 4.0.0 + + de.tudarmstadt.ukp.inception.app + inception-app + 30.0-SNAPSHOT + + inception-export-api + INCEpTION - Export - API + + + de.tudarmstadt.ukp.inception.app + inception-api-formats + + + 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.apache.commons + commons-lang3 + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + de.tudarmstadt.ukp.inception.app:inception-api-formats + + + + + + + \ No newline at end of file diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/FullProjectExportRequest.java b/inception/inception-export-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/FullProjectExportRequest.java similarity index 100% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/FullProjectExportRequest.java rename to inception/inception-export-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/FullProjectExportRequest.java diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExportException.java b/inception/inception-export-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExportException.java similarity index 100% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExportException.java rename to inception/inception-export-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExportException.java diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExportRequest_ImplBase.java b/inception/inception-export-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExportRequest_ImplBase.java similarity index 100% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExportRequest_ImplBase.java rename to inception/inception-export-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExportRequest_ImplBase.java diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExportTaskHandle.java b/inception/inception-export-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExportTaskHandle.java similarity index 100% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExportTaskHandle.java rename to inception/inception-export-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExportTaskHandle.java diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExportTaskMonitor.java b/inception/inception-export-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExportTaskMonitor.java similarity index 100% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExportTaskMonitor.java rename to inception/inception-export-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExportTaskMonitor.java diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExportTaskState.java b/inception/inception-export-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExportTaskState.java similarity index 100% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExportTaskState.java rename to inception/inception-export-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExportTaskState.java diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExporter.java b/inception/inception-export-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExporter.java similarity index 100% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExporter.java rename to inception/inception-export-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectExporter.java diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectImportRequest.java b/inception/inception-export-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectImportRequest.java similarity index 100% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectImportRequest.java rename to inception/inception-export-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/ProjectImportRequest.java diff --git a/inception/inception-export/pom.xml b/inception/inception-export/pom.xml index 3d70967a670..48cf3995b9d 100644 --- a/inception/inception-export/pom.xml +++ b/inception/inception-export/pom.xml @@ -31,10 +31,22 @@ de.tudarmstadt.ukp.inception.app inception-model-export + + de.tudarmstadt.ukp.inception.app + inception-export-api + de.tudarmstadt.ukp.inception.app inception-api + + de.tudarmstadt.ukp.inception.app + inception-documents-api + + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api + de.tudarmstadt.ukp.inception.app inception-diag 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 13b058e1eca..1886c5c26b6 100644 --- a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/DocumentImportExportServiceImpl.java +++ b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/DocumentImportExportServiceImpl.java @@ -76,10 +76,9 @@ import org.springframework.core.annotation.AnnotationAwareOrderComparator; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.CasStorageService; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.util.WebAnnoCasUtil; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; +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.CasDoctor; import de.tudarmstadt.ukp.clarin.webanno.diag.ChecksRegistry; @@ -97,6 +96,7 @@ 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.annotation.storage.CasStorageSession; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.export.config.DocumentImportExportServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.export.config.DocumentImportExportServiceProperties; import de.tudarmstadt.ukp.inception.export.config.DocumentImportExportServiceProperties.CasDoctorOnImportPolicy; 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 a579914fb2e..2af32be5a5b 100644 --- a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/config/DocumentImportExportServiceAutoConfiguration.java +++ b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/config/DocumentImportExportServiceAutoConfiguration.java @@ -24,13 +24,13 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; -import de.tudarmstadt.ukp.clarin.webanno.api.CasStorageService; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; +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; import de.tudarmstadt.ukp.clarin.webanno.diag.RepairsRegistry; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.export.DocumentImportExportServiceImpl; import de.tudarmstadt.ukp.inception.export.exporters.ProjectLogExporter; import de.tudarmstadt.ukp.inception.export.exporters.ProjectMetaInfExporter; diff --git a/inception/inception-export/src/test/java/de/tudarmstadt/ukp/inception/export/DocumentImportExportServiceImplTest.java b/inception/inception-export/src/test/java/de/tudarmstadt/ukp/inception/export/DocumentImportExportServiceImplTest.java index 67ac9d09d4b..2bae0b596da 100644 --- a/inception/inception-export/src/test/java/de/tudarmstadt/ukp/inception/export/DocumentImportExportServiceImplTest.java +++ b/inception/inception-export/src/test/java/de/tudarmstadt/ukp/inception/export/DocumentImportExportServiceImplTest.java @@ -67,7 +67,6 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.slf4j.MDC; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; import de.tudarmstadt.ukp.clarin.webanno.api.type.CASMetadata; import de.tudarmstadt.ukp.clarin.webanno.diag.ChecksRegistry; import de.tudarmstadt.ukp.clarin.webanno.diag.RepairsRegistry; @@ -83,6 +82,7 @@ import de.tudarmstadt.ukp.inception.annotation.storage.config.CasStorageCachePropertiesImpl; import de.tudarmstadt.ukp.inception.annotation.storage.config.CasStoragePropertiesImpl; import de.tudarmstadt.ukp.inception.annotation.storage.driver.filesystem.FileSystemCasStorageDriver; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.export.config.DocumentImportExportServiceProperties; import de.tudarmstadt.ukp.inception.export.config.DocumentImportExportServicePropertiesImpl; import de.tudarmstadt.ukp.inception.io.xmi.XmiFormatSupport; diff --git a/inception/inception-external-editor/pom.xml b/inception/inception-external-editor/pom.xml index 0417acf4dc4..87d24fb4296 100644 --- a/inception/inception-external-editor/pom.xml +++ b/inception/inception-external-editor/pom.xml @@ -29,6 +29,14 @@ de.tudarmstadt.ukp.inception.app inception-api + + de.tudarmstadt.ukp.inception.app + inception-documents-api + + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api + de.tudarmstadt.ukp.inception.app inception-api-editor @@ -53,6 +61,10 @@ de.tudarmstadt.ukp.inception.app inception-model + + de.tudarmstadt.ukp.inception.app + inception-model-vdoc + de.tudarmstadt.ukp.inception.app inception-support @@ -69,6 +81,14 @@ de.tudarmstadt.ukp.inception.app inception-diam + + de.tudarmstadt.ukp.inception.app + inception-api-diam + + + de.tudarmstadt.ukp.inception.app + inception-diam-compactv2 + de.tudarmstadt.ukp.inception.app inception-preferences diff --git a/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/ExternalAnnotationEditor.java b/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/ExternalAnnotationEditor.java index d8915fbc8fb..f8e1cfc95b0 100644 --- a/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/ExternalAnnotationEditor.java +++ b/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/ExternalAnnotationEditor.java @@ -33,8 +33,8 @@ import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.spring.injection.annot.SpringBean; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.editor.view.DocumentViewExtensionPoint; import de.tudarmstadt.ukp.inception.externaleditor.config.ExternalEditorPluginDescripion; diff --git a/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/ExternalAnnotationEditorBase.java b/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/ExternalAnnotationEditorBase.java index f062b44e0a3..46a8755f797 100644 --- a/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/ExternalAnnotationEditorBase.java +++ b/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/ExternalAnnotationEditorBase.java @@ -46,8 +46,7 @@ import com.googlecode.wicket.jquery.ui.widget.menu.IMenuItem; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.support.JSONUtil; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaMenuItem; @@ -57,6 +56,7 @@ import de.tudarmstadt.ukp.inception.diam.editor.actions.EditorAjaxRequestHandlerBase; 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.editor.AnnotationEditorBase; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorExtensionRegistry; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorFactory; diff --git a/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/ExternalAnnotationEditorFactory.java b/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/ExternalAnnotationEditorFactory.java index 424ac1002d2..12257334cbd 100644 --- a/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/ExternalAnnotationEditorFactory.java +++ b/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/ExternalAnnotationEditorFactory.java @@ -25,8 +25,8 @@ import com.networknt.schema.JsonSchema; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.paging.NoPagingStrategy; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.support.JSONUtil; import de.tudarmstadt.ukp.clarin.webanno.support.WatchedResourceFile; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorBase; diff --git a/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xhtml/XHtmlXmlDocumentIFrameView.java b/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xhtml/XHtmlXmlDocumentIFrameView.java index 550e86a5f9a..733a97df56c 100644 --- a/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xhtml/XHtmlXmlDocumentIFrameView.java +++ b/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xhtml/XHtmlXmlDocumentIFrameView.java @@ -22,8 +22,8 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.spring.injection.annot.SpringBean; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; public class XHtmlXmlDocumentIFrameView extends WebMarkupContainer diff --git a/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xhtml/XHtmlXmlDocumentViewControllerImpl.java b/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xhtml/XHtmlXmlDocumentViewControllerImpl.java index 769aa1cca40..4e1f4c07ea6 100644 --- a/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xhtml/XHtmlXmlDocumentViewControllerImpl.java +++ b/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xhtml/XHtmlXmlDocumentViewControllerImpl.java @@ -51,9 +51,9 @@ import org.xml.sax.helpers.AttributesImpl; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.ServletContextUtils; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorRegistry; import de.tudarmstadt.ukp.inception.externaleditor.XmlDocumentViewControllerImplBase; import de.tudarmstadt.ukp.inception.externaleditor.policy.DefaultHtmlDocumentPolicy; diff --git a/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xml/XmlDocumentIFrameView.java b/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xml/XmlDocumentIFrameView.java index 51831284fc0..8609d0a0b34 100644 --- a/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xml/XmlDocumentIFrameView.java +++ b/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xml/XmlDocumentIFrameView.java @@ -22,8 +22,8 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.spring.injection.annot.SpringBean; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; public class XmlDocumentIFrameView extends WebMarkupContainer diff --git a/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xml/XmlDocumentViewControllerImpl.java b/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xml/XmlDocumentViewControllerImpl.java index 33e3ac0761e..268258de56b 100644 --- a/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xml/XmlDocumentViewControllerImpl.java +++ b/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xml/XmlDocumentViewControllerImpl.java @@ -45,8 +45,8 @@ import org.xml.sax.helpers.AttributesImpl; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorRegistry; import de.tudarmstadt.ukp.inception.externaleditor.ExternalAnnotationEditor; import de.tudarmstadt.ukp.inception.externaleditor.ExternalAnnotationEditorFactory; diff --git a/inception/inception-external-search-core/pom.xml b/inception/inception-external-search-core/pom.xml index 647bae00e39..64f0336c607 100644 --- a/inception/inception-external-search-core/pom.xml +++ b/inception/inception-external-search-core/pom.xml @@ -47,7 +47,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-export-api diff --git a/inception/inception-feature-lookup/pom.xml b/inception/inception-feature-lookup/pom.xml index ecba4e12dc4..4455506ff25 100644 --- a/inception/inception-feature-lookup/pom.xml +++ b/inception/inception-feature-lookup/pom.xml @@ -49,6 +49,10 @@ de.tudarmstadt.ukp.inception.app inception-model + + de.tudarmstadt.ukp.inception.app + inception-model-vdoc + org.apache.uima diff --git a/inception/inception-guidelines/pom.xml b/inception/inception-guidelines/pom.xml index 01a5f37376f..926fffe0013 100644 --- a/inception/inception-guidelines/pom.xml +++ b/inception/inception-guidelines/pom.xml @@ -25,6 +25,10 @@ inception-guidelines INCEpTION - Core - Annotation Guidelines + + de.tudarmstadt.ukp.inception.app + inception-documents-api + de.tudarmstadt.ukp.inception.app inception-api-annotation @@ -53,6 +57,10 @@ de.tudarmstadt.ukp.inception.app inception-model-export + + de.tudarmstadt.ukp.inception.app + inception-export-api + de.tudarmstadt.ukp.inception.app inception-api 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 34564a20d28..fe6f3cac436 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 @@ -36,8 +36,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; import de.tudarmstadt.ukp.clarin.webanno.model.Project; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.guidelines.config.GuidelinesServiceAutoConfiguration; /** diff --git a/inception/inception-guidelines/src/main/java/de/tudarmstadt/ukp/inception/guidelines/config/GuidelinesServiceAutoConfiguration.java b/inception/inception-guidelines/src/main/java/de/tudarmstadt/ukp/inception/guidelines/config/GuidelinesServiceAutoConfiguration.java index c01701ddd75..fc3981d1f70 100644 --- a/inception/inception-guidelines/src/main/java/de/tudarmstadt/ukp/inception/guidelines/config/GuidelinesServiceAutoConfiguration.java +++ b/inception/inception-guidelines/src/main/java/de/tudarmstadt/ukp/inception/guidelines/config/GuidelinesServiceAutoConfiguration.java @@ -20,7 +20,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.guidelines.GuidelinesService; import de.tudarmstadt.ukp.inception.guidelines.GuidelinesServiceImpl; import de.tudarmstadt.ukp.inception.guidelines.exporters.GuidelinesExporter; diff --git a/inception/inception-html-apache-annotator-editor/pom.xml b/inception/inception-html-apache-annotator-editor/pom.xml index 08978857b6d..f68994f4dec 100644 --- a/inception/inception-html-apache-annotator-editor/pom.xml +++ b/inception/inception-html-apache-annotator-editor/pom.xml @@ -27,7 +27,11 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-documents-api + + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-html-apache-annotator-editor/src/main/java/de/tudarmstadt/ukp/inception/apacheannotatoreditor/ApacheAnnotatorHtmlAnnotationEditor.java b/inception/inception-html-apache-annotator-editor/src/main/java/de/tudarmstadt/ukp/inception/apacheannotatoreditor/ApacheAnnotatorHtmlAnnotationEditor.java index f6074f1bc2c..92e3434ca08 100644 --- a/inception/inception-html-apache-annotator-editor/src/main/java/de/tudarmstadt/ukp/inception/apacheannotatoreditor/ApacheAnnotatorHtmlAnnotationEditor.java +++ b/inception/inception-html-apache-annotator-editor/src/main/java/de/tudarmstadt/ukp/inception/apacheannotatoreditor/ApacheAnnotatorHtmlAnnotationEditor.java @@ -27,10 +27,10 @@ import org.apache.wicket.model.Model; import org.apache.wicket.spring.injection.annot.SpringBean; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.inception.apacheannotatoreditor.resources.ApacheAnnotatorJsCssResourceReference; import de.tudarmstadt.ukp.inception.apacheannotatoreditor.resources.ApacheAnnotatorJsJavascriptResourceReference; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorFactory; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.editor.view.DocumentViewFactory; diff --git a/inception/inception-html-apache-annotator-editor/src/main/java/de/tudarmstadt/ukp/inception/apacheannotatoreditor/ApacheAnnotatorHtmlAnnotationEditorFactory.java b/inception/inception-html-apache-annotator-editor/src/main/java/de/tudarmstadt/ukp/inception/apacheannotatoreditor/ApacheAnnotatorHtmlAnnotationEditorFactory.java index a41079899af..a61a5acc803 100644 --- a/inception/inception-html-apache-annotator-editor/src/main/java/de/tudarmstadt/ukp/inception/apacheannotatoreditor/ApacheAnnotatorHtmlAnnotationEditorFactory.java +++ b/inception/inception-html-apache-annotator-editor/src/main/java/de/tudarmstadt/ukp/inception/apacheannotatoreditor/ApacheAnnotatorHtmlAnnotationEditorFactory.java @@ -25,8 +25,8 @@ import com.networknt.schema.JsonSchema; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.paging.NoPagingStrategy; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.JSONUtil; import de.tudarmstadt.ukp.clarin.webanno.support.WatchedResourceFile; diff --git a/inception/inception-html-editor/pom.xml b/inception/inception-html-editor/pom.xml index 021b1db43a7..4d00dfff1f9 100644 --- a/inception/inception-html-editor/pom.xml +++ b/inception/inception-html-editor/pom.xml @@ -23,12 +23,16 @@ 30.0-SNAPSHOT inception-html-editor - INCEpTION - Editor - HTML + Annotator JS + INCEpTION - Editor - HTML + Annotator JS (deprecated) de.tudarmstadt.ukp.inception.app - inception-api + inception-documents-api + + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-html-editor/src/main/java/de/tudarmstadt/ukp/inception/annotatorjs/AnnotatorJsHtmlAnnotationEditor.java b/inception/inception-html-editor/src/main/java/de/tudarmstadt/ukp/inception/annotatorjs/AnnotatorJsHtmlAnnotationEditor.java index 0f56eddcdd2..d2203982cb1 100644 --- a/inception/inception-html-editor/src/main/java/de/tudarmstadt/ukp/inception/annotatorjs/AnnotatorJsHtmlAnnotationEditor.java +++ b/inception/inception-html-editor/src/main/java/de/tudarmstadt/ukp/inception/annotatorjs/AnnotatorJsHtmlAnnotationEditor.java @@ -27,10 +27,10 @@ import org.apache.wicket.model.Model; import org.apache.wicket.spring.injection.annot.SpringBean; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.inception.annotatorjs.resources.AnnotatorJsCssResourceReference; import de.tudarmstadt.ukp.inception.annotatorjs.resources.AnnotatorJsJavascriptResourceReference; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorFactory; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.editor.view.DocumentViewFactory; diff --git a/inception/inception-html-editor/src/main/java/de/tudarmstadt/ukp/inception/annotatorjs/AnnotatorJsHtmlAnnotationEditorFactory.java b/inception/inception-html-editor/src/main/java/de/tudarmstadt/ukp/inception/annotatorjs/AnnotatorJsHtmlAnnotationEditorFactory.java index dbfbda51a02..f30560aac13 100644 --- a/inception/inception-html-editor/src/main/java/de/tudarmstadt/ukp/inception/annotatorjs/AnnotatorJsHtmlAnnotationEditorFactory.java +++ b/inception/inception-html-editor/src/main/java/de/tudarmstadt/ukp/inception/annotatorjs/AnnotatorJsHtmlAnnotationEditorFactory.java @@ -19,8 +19,8 @@ import org.apache.wicket.model.IModel; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.paging.NoPagingStrategy; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.resource.Strings; import de.tudarmstadt.ukp.inception.annotatorjs.config.AnnotatorJsAnnotationEditorSupportAutoConfiguration; diff --git a/inception/inception-html-recogito-editor/pom.xml b/inception/inception-html-recogito-editor/pom.xml index e26abb4ffda..920707fd74a 100644 --- a/inception/inception-html-recogito-editor/pom.xml +++ b/inception/inception-html-recogito-editor/pom.xml @@ -27,7 +27,11 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-annotation-storage-api + + + de.tudarmstadt.ukp.inception.app + inception-documents-api de.tudarmstadt.ukp.inception.app @@ -49,6 +53,10 @@ de.tudarmstadt.ukp.inception.app inception-model + + de.tudarmstadt.ukp.inception.app + inception-model-vdoc + de.tudarmstadt.ukp.inception.app inception-support diff --git a/inception/inception-html-recogito-editor/src/main/java/de/tudarmstadt/ukp/inception/recogitojseditor/RecogitoHtmlAnnotationEditor.java b/inception/inception-html-recogito-editor/src/main/java/de/tudarmstadt/ukp/inception/recogitojseditor/RecogitoHtmlAnnotationEditor.java index 17f91017b7e..447694e53ca 100644 --- a/inception/inception-html-recogito-editor/src/main/java/de/tudarmstadt/ukp/inception/recogitojseditor/RecogitoHtmlAnnotationEditor.java +++ b/inception/inception-html-recogito-editor/src/main/java/de/tudarmstadt/ukp/inception/recogitojseditor/RecogitoHtmlAnnotationEditor.java @@ -27,8 +27,8 @@ import org.apache.wicket.model.Model; import org.apache.wicket.spring.injection.annot.SpringBean; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorFactory; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.editor.view.DocumentViewFactory; diff --git a/inception/inception-html-recogito-editor/src/main/java/de/tudarmstadt/ukp/inception/recogitojseditor/RecogitoHtmlAnnotationEditorFactory.java b/inception/inception-html-recogito-editor/src/main/java/de/tudarmstadt/ukp/inception/recogitojseditor/RecogitoHtmlAnnotationEditorFactory.java index cc1c59242a8..599c06a4073 100644 --- a/inception/inception-html-recogito-editor/src/main/java/de/tudarmstadt/ukp/inception/recogitojseditor/RecogitoHtmlAnnotationEditorFactory.java +++ b/inception/inception-html-recogito-editor/src/main/java/de/tudarmstadt/ukp/inception/recogitojseditor/RecogitoHtmlAnnotationEditorFactory.java @@ -19,8 +19,8 @@ import org.apache.wicket.model.IModel; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.paging.NoPagingStrategy; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorBase; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorFactoryImplBase; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; diff --git a/inception/inception-image/pom.xml b/inception/inception-image/pom.xml index c7fa8813783..c18de615d0a 100644 --- a/inception/inception-image/pom.xml +++ b/inception/inception-image/pom.xml @@ -25,6 +25,10 @@ inception-image INCEpTION - Image Support + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api + de.tudarmstadt.ukp.inception.app inception-api-annotation @@ -47,12 +51,16 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-documents-api de.tudarmstadt.ukp.inception.app inception-model + + de.tudarmstadt.ukp.inception.app + inception-model-vdoc + org.apache.uima diff --git a/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/sidebar/ImageSidebar.java b/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/sidebar/ImageSidebar.java index 3b3ccf51fef..cfa692fcc26 100644 --- a/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/sidebar/ImageSidebar.java +++ b/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/sidebar/ImageSidebar.java @@ -49,8 +49,7 @@ import org.slf4j.LoggerFactory; import org.wicketstuff.event.annotation.OnEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -61,6 +60,7 @@ import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.AnnotationPage; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.sidebar.AnnotationSidebar_ImplBase; import de.tudarmstadt.ukp.inception.annotation.layer.relation.RelationAdapter; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.image.feature.ImageFeatureSupport; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; diff --git a/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/sidebar/ImageSidebarFactory.java b/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/sidebar/ImageSidebarFactory.java index 17cebc2143d..5a6553e1166 100644 --- a/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/sidebar/ImageSidebarFactory.java +++ b/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/sidebar/ImageSidebarFactory.java @@ -24,7 +24,7 @@ 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.CasProvider; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.AnnotationPage; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.sidebar.AnnotationSidebarFactory_ImplBase; diff --git a/inception/inception-imls-external/pom.xml b/inception/inception-imls-external/pom.xml index 189304f0b84..576ffbe5464 100644 --- a/inception/inception-imls-external/pom.xml +++ b/inception/inception-imls-external/pom.xml @@ -37,7 +37,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-annotation-storage-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-imls-lapps/pom.xml b/inception/inception-imls-lapps/pom.xml index 0133441269a..f9f8b456e59 100644 --- a/inception/inception-imls-lapps/pom.xml +++ b/inception/inception-imls-lapps/pom.xml @@ -142,6 +142,11 @@ inception-annotation-storage test + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api + test + org.dkpro.core dkpro-core-io-conll-asl @@ -157,10 +162,5 @@ inception-testing test - - de.tudarmstadt.ukp.inception.app - inception-api - test - \ No newline at end of file diff --git a/inception/inception-imls-opennlp/pom.xml b/inception/inception-imls-opennlp/pom.xml index a1be63d6750..642ebcea6e2 100644 --- a/inception/inception-imls-opennlp/pom.xml +++ b/inception/inception-imls-opennlp/pom.xml @@ -117,12 +117,12 @@ de.tudarmstadt.ukp.inception.app - inception-annotation-storage + inception-annotation-storage-api test de.tudarmstadt.ukp.inception.app - inception-api + inception-annotation-storage test diff --git a/inception/inception-imls-stringmatch/pom.xml b/inception/inception-imls-stringmatch/pom.xml index 7671238954b..8a928ba8bc9 100644 --- a/inception/inception-imls-stringmatch/pom.xml +++ b/inception/inception-imls-stringmatch/pom.xml @@ -25,6 +25,10 @@ inception-imls-stringmatch INCEpTION - ML - String Matching + + de.tudarmstadt.ukp.inception.app + inception-documents-api + de.tudarmstadt.ukp.inception.app inception-recommendation-api @@ -54,6 +58,10 @@ de.tudarmstadt.ukp.inception.app inception-model-export + + de.tudarmstadt.ukp.inception.app + inception-export-api + de.tudarmstadt.ukp.inception.app inception-api-annotation @@ -148,6 +156,11 @@ + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api + test + de.tudarmstadt.ukp.inception.app inception-annotation-storage diff --git a/inception/inception-imls-stringmatch/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/stringmatch/config/StringMatchingRecommenderAutoConfiguration.java b/inception/inception-imls-stringmatch/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/stringmatch/config/StringMatchingRecommenderAutoConfiguration.java index 813fdaebd33..f9e33f298e3 100644 --- a/inception/inception-imls-stringmatch/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/stringmatch/config/StringMatchingRecommenderAutoConfiguration.java +++ b/inception/inception-imls-stringmatch/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/stringmatch/config/StringMatchingRecommenderAutoConfiguration.java @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.config.RecommenderServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.recommendation.imls.stringmatch.relation.StringMatchingRelationRecommenderFactory; 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 6f6161aba8d..da2090c068d 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 @@ -44,7 +44,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender; import de.tudarmstadt.ukp.inception.recommendation.imls.stringmatch.config.StringMatchingRecommenderAutoConfiguration; import de.tudarmstadt.ukp.inception.recommendation.imls.stringmatch.span.gazeteer.model.Gazeteer; diff --git a/inception/inception-imls-stringmatch/src/test/java/de/tudarmstadt/ukp/inception/recommendation/imls/stringmatch/span/gazeteer/GazeteerServiceImplTest.java b/inception/inception-imls-stringmatch/src/test/java/de/tudarmstadt/ukp/inception/recommendation/imls/stringmatch/span/gazeteer/GazeteerServiceImplTest.java index 51ca6b6f34d..f0f7cb83f71 100644 --- a/inception/inception-imls-stringmatch/src/test/java/de/tudarmstadt/ukp/inception/recommendation/imls/stringmatch/span/gazeteer/GazeteerServiceImplTest.java +++ b/inception/inception-imls-stringmatch/src/test/java/de/tudarmstadt/ukp/inception/recommendation/imls/stringmatch/span/gazeteer/GazeteerServiceImplTest.java @@ -54,16 +54,20 @@ import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; 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.support.logging.Logging; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender; import de.tudarmstadt.ukp.inception.recommendation.imls.stringmatch.span.gazeteer.model.Gazeteer; import de.tudarmstadt.ukp.inception.recommendation.imls.stringmatch.span.gazeteer.model.GazeteerEntry; -@DataJpaTest(excludeAutoConfiguration = LiquibaseAutoConfiguration.class) +@DataJpaTest( // + showSql = false, // + properties = { // + "spring.main.banner-mode=off" }, // + excludeAutoConfiguration = LiquibaseAutoConfiguration.class) @Transactional @EntityScan(basePackages = { "de.tudarmstadt.ukp.inception", "de.tudarmstadt.ukp.clarin.webanno" }) public class GazeteerServiceImplTest diff --git a/inception/inception-imls-weblicht/pom.xml b/inception/inception-imls-weblicht/pom.xml index 5961f0785d5..92f558ad2f0 100644 --- a/inception/inception-imls-weblicht/pom.xml +++ b/inception/inception-imls-weblicht/pom.xml @@ -43,7 +43,10 @@ de.tudarmstadt.ukp.inception.app inception-api-render - + + de.tudarmstadt.ukp.inception.app + inception-documents-api + de.tudarmstadt.ukp.inception.app inception-model @@ -52,6 +55,10 @@ de.tudarmstadt.ukp.inception.app inception-model-export + + de.tudarmstadt.ukp.inception.app + inception-export-api + de.tudarmstadt.ukp.inception.app inception-api 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 abacd57a649..622de73f1dd 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 @@ -40,7 +40,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender; import de.tudarmstadt.ukp.inception.recommendation.imls.weblicht.config.WeblichtRecommenderAutoConfiguration; import de.tudarmstadt.ukp.inception.recommendation.imls.weblicht.model.WeblichtChain; diff --git a/inception/inception-imls-weblicht/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/weblicht/config/WeblichtRecommenderAutoConfiguration.java b/inception/inception-imls-weblicht/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/weblicht/config/WeblichtRecommenderAutoConfiguration.java index 8217ef44c76..93fff9f649e 100644 --- a/inception/inception-imls-weblicht/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/weblicht/config/WeblichtRecommenderAutoConfiguration.java +++ b/inception/inception-imls-weblicht/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/weblicht/config/WeblichtRecommenderAutoConfiguration.java @@ -24,7 +24,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.imls.weblicht.WeblichtRecommenderFactory; import de.tudarmstadt.ukp.inception.recommendation.imls.weblicht.WeblichtRecommenderFactoryImpl; diff --git a/inception/inception-kb-fact-linking/pom.xml b/inception/inception-kb-fact-linking/pom.xml index ea74e669455..b57abd83ae7 100644 --- a/inception/inception-kb-fact-linking/pom.xml +++ b/inception/inception-kb-fact-linking/pom.xml @@ -23,7 +23,7 @@ 30.0-SNAPSHOT inception-kb-fact-linking - INCEpTION - Knowledge Base - Fact Linking + INCEpTION - Knowledge Base - Fact Linking (deprecated) @@ -35,6 +35,10 @@ de.tudarmstadt.ukp.inception.app inception-model + + de.tudarmstadt.ukp.inception.app + inception-model-vdoc + de.tudarmstadt.ukp.inception.app inception-api diff --git a/inception/inception-kb/pom.xml b/inception/inception-kb/pom.xml index 614501cc4ac..dfe85a34818 100644 --- a/inception/inception-kb/pom.xml +++ b/inception/inception-kb/pom.xml @@ -26,6 +26,10 @@ INCEpTION - Knowledge Base - Core + + de.tudarmstadt.ukp.inception.app + inception-documents-api + de.tudarmstadt.ukp.inception.app inception-api @@ -46,6 +50,10 @@ de.tudarmstadt.ukp.inception.app inception-model-export + + de.tudarmstadt.ukp.inception.app + inception-export-api + de.tudarmstadt.ukp.inception.app inception-api-annotation 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 2621cfc44c9..cc55d7620f6 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 @@ -115,13 +115,13 @@ import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; 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; import de.tudarmstadt.ukp.clarin.webanno.support.StopWatch; import de.tudarmstadt.ukp.clarin.webanno.support.logging.BaseLoggers; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBaseProperties; import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBaseServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.kb.event.KnowledgeBaseConfigurationChangedEvent; diff --git a/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/config/KnowledgeBaseServiceAutoConfiguration.java b/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/config/KnowledgeBaseServiceAutoConfiguration.java index dd080887de1..323c51b75a5 100644 --- a/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/config/KnowledgeBaseServiceAutoConfiguration.java +++ b/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/config/KnowledgeBaseServiceAutoConfiguration.java @@ -25,7 +25,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.kb.KnowledgeBaseService; import de.tudarmstadt.ukp.inception.kb.KnowledgeBaseServiceImpl; import de.tudarmstadt.ukp.inception.kb.exporter.KnowledgeBaseExporter; diff --git a/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/FullTextIndexUpgradeTest.java b/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/FullTextIndexUpgradeTest.java index bab71b28851..06a4f93931a 100644 --- a/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/FullTextIndexUpgradeTest.java +++ b/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/FullTextIndexUpgradeTest.java @@ -45,8 +45,8 @@ import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; import de.tudarmstadt.ukp.clarin.webanno.model.Project; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBaseProperties; import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBasePropertiesImpl; import de.tudarmstadt.ukp.inception.kb.graph.KBHandle; @@ -54,7 +54,11 @@ import de.tudarmstadt.ukp.inception.kb.querybuilder.SPARQLQueryBuilder; @Transactional -@DataJpaTest(excludeAutoConfiguration = LiquibaseAutoConfiguration.class) +@DataJpaTest( // + showSql = false, // + properties = { // + "spring.main.banner-mode=off" }, // + excludeAutoConfiguration = LiquibaseAutoConfiguration.class) @EnableAutoConfiguration @EntityScan(basePackages = { // "de.tudarmstadt.ukp.inception.kb.model", // diff --git a/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseServiceImplImportExportIntegrationTest.java b/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseServiceImplImportExportIntegrationTest.java index 37cb5478110..c072336e8d0 100644 --- a/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseServiceImplImportExportIntegrationTest.java +++ b/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseServiceImplImportExportIntegrationTest.java @@ -45,8 +45,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.config.RepositoryProperties; import de.tudarmstadt.ukp.clarin.webanno.model.Project; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBaseProperties; import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBasePropertiesImpl; import de.tudarmstadt.ukp.inception.kb.graph.KBConcept; @@ -59,7 +59,11 @@ import de.tudarmstadt.ukp.inception.kb.util.TestFixtures; import de.tudarmstadt.ukp.inception.kb.yaml.KnowledgeBaseProfile; -@DataJpaTest(excludeAutoConfiguration = LiquibaseAutoConfiguration.class, showSql = false) +@DataJpaTest( // + showSql = false, // + properties = { // + "spring.main.banner-mode=off" }, // + excludeAutoConfiguration = LiquibaseAutoConfiguration.class) @EnableAutoConfiguration @EntityScan({ // "de.tudarmstadt.ukp.inception.kb.model", // diff --git a/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseServiceImplIntegrationTest.java b/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseServiceImplIntegrationTest.java index 698a68a8277..e1853fe4089 100644 --- a/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseServiceImplIntegrationTest.java +++ b/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseServiceImplIntegrationTest.java @@ -62,8 +62,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.config.RepositoryProperties; import de.tudarmstadt.ukp.clarin.webanno.model.Project; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBaseProperties; import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBasePropertiesImpl; import de.tudarmstadt.ukp.inception.kb.graph.KBConcept; @@ -77,7 +77,11 @@ import de.tudarmstadt.ukp.inception.kb.util.TestFixtures; import de.tudarmstadt.ukp.inception.kb.yaml.KnowledgeBaseProfile; -@DataJpaTest(excludeAutoConfiguration = LiquibaseAutoConfiguration.class, showSql = false) +@DataJpaTest( // + showSql = false, // + properties = { // + "spring.main.banner-mode=off" }, // + excludeAutoConfiguration = LiquibaseAutoConfiguration.class) @EnableAutoConfiguration @EntityScan({ // "de.tudarmstadt.ukp.inception.kb.model", // diff --git a/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseServiceImplQualifierIntegrationTest.java b/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseServiceImplQualifierIntegrationTest.java index ce3e0aae8e6..09b30a2eae8 100644 --- a/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseServiceImplQualifierIntegrationTest.java +++ b/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseServiceImplQualifierIntegrationTest.java @@ -42,8 +42,8 @@ import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; import de.tudarmstadt.ukp.clarin.webanno.model.Project; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBaseProperties; import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBasePropertiesImpl; import de.tudarmstadt.ukp.inception.kb.graph.KBConcept; @@ -56,7 +56,11 @@ import de.tudarmstadt.ukp.inception.kb.util.TestFixtures; @Transactional -@DataJpaTest(excludeAutoConfiguration = LiquibaseAutoConfiguration.class) +@DataJpaTest( // + showSql = false, // + properties = { // + "spring.main.banner-mode=off" }, // + excludeAutoConfiguration = LiquibaseAutoConfiguration.class) public class KnowledgeBaseServiceImplQualifierIntegrationTest { static { diff --git a/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseServiceImplWikiDataIntegrationTest.java b/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseServiceImplWikiDataIntegrationTest.java index 6770cb15474..09afcd8b680 100644 --- a/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseServiceImplWikiDataIntegrationTest.java +++ b/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseServiceImplWikiDataIntegrationTest.java @@ -47,8 +47,8 @@ import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; import de.tudarmstadt.ukp.clarin.webanno.model.Project; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBaseProperties; import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBasePropertiesImpl; import de.tudarmstadt.ukp.inception.kb.graph.KBConcept; @@ -64,7 +64,11 @@ @Tag("slow") @Transactional -@DataJpaTest(excludeAutoConfiguration = LiquibaseAutoConfiguration.class) +@DataJpaTest( // + showSql = false, // + properties = { // + "spring.main.banner-mode=off" }, // + excludeAutoConfiguration = LiquibaseAutoConfiguration.class) public class KnowledgeBaseServiceImplWikiDataIntegrationTest { static { diff --git a/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseServiceRemoteTest.java b/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseServiceRemoteTest.java index a0c233730ff..f7c8b5dcae0 100644 --- a/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseServiceRemoteTest.java +++ b/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseServiceRemoteTest.java @@ -55,8 +55,8 @@ import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; import de.tudarmstadt.ukp.clarin.webanno.model.Project; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBaseProperties; import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBasePropertiesImpl; import de.tudarmstadt.ukp.inception.kb.graph.KBHandle; @@ -67,7 +67,11 @@ @Tag("slow") @Transactional -@DataJpaTest(excludeAutoConfiguration = LiquibaseAutoConfiguration.class) +@DataJpaTest( // + showSql = false, // + properties = { // + "spring.main.banner-mode=off" }, // + excludeAutoConfiguration = LiquibaseAutoConfiguration.class) public class KnowledgeBaseServiceRemoteTest { diff --git a/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseSubPropertyLabelTest.java b/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseSubPropertyLabelTest.java index 3a6e39daab0..6f41c68d77f 100644 --- a/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseSubPropertyLabelTest.java +++ b/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseSubPropertyLabelTest.java @@ -47,8 +47,8 @@ import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; import de.tudarmstadt.ukp.clarin.webanno.model.Project; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBaseProperties; import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBasePropertiesImpl; import de.tudarmstadt.ukp.inception.kb.graph.KBHandle; @@ -61,7 +61,11 @@ import de.tudarmstadt.ukp.inception.kb.yaml.KnowledgeBaseProfile; @Transactional -@DataJpaTest(excludeAutoConfiguration = LiquibaseAutoConfiguration.class) +@DataJpaTest( // + showSql = false, // + properties = { // + "spring.main.banner-mode=off" }, // + excludeAutoConfiguration = LiquibaseAutoConfiguration.class) public class KnowledgeBaseSubPropertyLabelTest { private static final String PROJECT_NAME = "Test project"; diff --git a/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/querybuilder/SPARQLQueryBuilderTest.java b/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/querybuilder/SPARQLQueryBuilderTest.java index 992c77d08ff..2339a2f50b3 100644 --- a/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/querybuilder/SPARQLQueryBuilderTest.java +++ b/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/querybuilder/SPARQLQueryBuilderTest.java @@ -1496,6 +1496,7 @@ public void testWithLabelMatchingExactlyAnyOf_Fuseki_noFTS_STW() throws Exceptio .allMatch(label -> "Labour".equals(label)); } + @Tag("slow") @Test public void testWithLabelMatchingExactlyAnyOf_Fuseki_FTS_GND() throws Exception { diff --git a/inception/inception-layer-docmetadata/pom.xml b/inception/inception-layer-docmetadata/pom.xml index 88dee8d82cb..721865fccae 100644 --- a/inception/inception-layer-docmetadata/pom.xml +++ b/inception/inception-layer-docmetadata/pom.xml @@ -25,6 +25,14 @@ inception-layer-docmetadata INCEpTION - Document Metadata Support + + de.tudarmstadt.ukp.inception.app + inception-documents-api + + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api + de.tudarmstadt.ukp.inception.app inception-api-annotation @@ -51,11 +59,11 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-model de.tudarmstadt.ukp.inception.app - inception-model + inception-model-vdoc de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/config/DocumentMetadataLayerSupportAutoConfiguration.java b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/config/DocumentMetadataLayerSupportAutoConfiguration.java index bdcc02707a2..b6e40a423dd 100644 --- a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/config/DocumentMetadataLayerSupportAutoConfiguration.java +++ b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/config/DocumentMetadataLayerSupportAutoConfiguration.java @@ -23,7 +23,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; 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-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/layer/DocumentMetadataLayerSingletonCreatingWatcher.java b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/layer/DocumentMetadataLayerSingletonCreatingWatcher.java index 5acf06ab5ac..6bdad68f182 100644 --- a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/layer/DocumentMetadataLayerSingletonCreatingWatcher.java +++ b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/layer/DocumentMetadataLayerSingletonCreatingWatcher.java @@ -25,10 +25,10 @@ import org.springframework.context.event.EventListener; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.inception.annotation.events.BeforeDocumentOpenedEvent; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; diff --git a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/sidebar/DocumentMetadataAnnotationDetailPanel.java b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/sidebar/DocumentMetadataAnnotationDetailPanel.java index cae6fc16917..f6d10ba2cfc 100644 --- a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/sidebar/DocumentMetadataAnnotationDetailPanel.java +++ b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/sidebar/DocumentMetadataAnnotationDetailPanel.java @@ -43,8 +43,8 @@ import org.slf4j.LoggerFactory; import org.wicketstuff.event.annotation.OnEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; diff --git a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/sidebar/DocumentMetadataAnnotationSelectionPanel.java b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/sidebar/DocumentMetadataAnnotationSelectionPanel.java index 55498a1f150..cdbf75d6e2d 100644 --- a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/sidebar/DocumentMetadataAnnotationSelectionPanel.java +++ b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/sidebar/DocumentMetadataAnnotationSelectionPanel.java @@ -53,8 +53,8 @@ import org.slf4j.LoggerFactory; import org.wicketstuff.event.annotation.OnEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -71,7 +71,7 @@ import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeUtil; +import de.tudarmstadt.ukp.inception.schema.feature.TypeUtil; import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; import de.tudarmstadt.ukp.inception.ui.core.docanno.event.DocumentMetadataEvent; diff --git a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/sidebar/DocumentMetadataSidebar.java b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/sidebar/DocumentMetadataSidebar.java index e00e9410ed7..fca2d26c1f3 100644 --- a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/sidebar/DocumentMetadataSidebar.java +++ b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/sidebar/DocumentMetadataSidebar.java @@ -20,7 +20,7 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; +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; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.AnnotationPage; diff --git a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/sidebar/DocumentMetadataSidebarFactory.java b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/sidebar/DocumentMetadataSidebarFactory.java index e8211c0d14e..d5f2e0a7a53 100644 --- a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/sidebar/DocumentMetadataSidebarFactory.java +++ b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/sidebar/DocumentMetadataSidebarFactory.java @@ -22,7 +22,7 @@ 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.CasProvider; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.AnnotationPage; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.sidebar.AnnotationSidebarFactory_ImplBase; diff --git a/inception/inception-log/pom.xml b/inception/inception-log/pom.xml index 7de2b895e16..cbdbe468c83 100644 --- a/inception/inception-log/pom.xml +++ b/inception/inception-log/pom.xml @@ -29,6 +29,10 @@ de.tudarmstadt.ukp.inception.app inception-api + + de.tudarmstadt.ukp.inception.app + inception-documents-api + de.tudarmstadt.ukp.inception.app inception-documents @@ -41,6 +45,10 @@ de.tudarmstadt.ukp.inception.app inception-model-export + + de.tudarmstadt.ukp.inception.app + inception-export-api + de.tudarmstadt.ukp.inception.app inception-api-annotation diff --git a/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/config/EventLoggingAutoConfiguration.java b/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/config/EventLoggingAutoConfiguration.java index 87581755118..e8b741fcab7 100644 --- a/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/config/EventLoggingAutoConfiguration.java +++ b/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/config/EventLoggingAutoConfiguration.java @@ -29,7 +29,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.log.EventLoggingListener; import de.tudarmstadt.ukp.inception.log.EventRepository; import de.tudarmstadt.ukp.inception.log.EventRepositoryImpl; diff --git a/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/exporter/LoggedEventExporter.java b/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/exporter/LoggedEventExporter.java index cfd322402f5..14d5a56dfcb 100644 --- a/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/exporter/LoggedEventExporter.java +++ b/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/exporter/LoggedEventExporter.java @@ -45,7 +45,6 @@ import com.fasterxml.jackson.core.util.MinimalPrettyPrinter; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; 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; @@ -53,6 +52,7 @@ import de.tudarmstadt.ukp.clarin.webanno.export.model.ExportedProject; 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.documents.exporters.SourceDocumentExporter; import de.tudarmstadt.ukp.inception.log.EventRepository; import de.tudarmstadt.ukp.inception.log.config.EventLoggingAutoConfiguration; diff --git a/inception/inception-log/src/test/java/de/tudarmstadt/ukp/inception/log/EventRepositoryImplIntegrationTest.java b/inception/inception-log/src/test/java/de/tudarmstadt/ukp/inception/log/EventRepositoryImplIntegrationTest.java index 03b8c0cb8a2..3dcf52bbe65 100644 --- a/inception/inception-log/src/test/java/de/tudarmstadt/ukp/inception/log/EventRepositoryImplIntegrationTest.java +++ b/inception/inception-log/src/test/java/de/tudarmstadt/ukp/inception/log/EventRepositoryImplIntegrationTest.java @@ -46,12 +46,13 @@ import org.springframework.context.annotation.Import; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryAutoConfiguration; +import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.config.ProjectServiceAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.security.config.SecurityAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.inception.annotation.storage.config.CasStorageServiceAutoConfiguration; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryAutoConfiguration; import de.tudarmstadt.ukp.inception.documents.config.DocumentServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.log.model.LoggedEvent; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; @@ -70,6 +71,7 @@ CasStorageServiceAutoConfiguration.class, // RepositoryAutoConfiguration.class, // AnnotationSchemaServiceAutoConfiguration.class, // + AnnotationSchemaAutoConfiguration.class, // SecurityAutoConfiguration.class }) public class EventRepositoryImplIntegrationTest { diff --git a/inception/inception-log/src/test/java/de/tudarmstadt/ukp/inception/log/exporter/LoggedEventExporterTest.java b/inception/inception-log/src/test/java/de/tudarmstadt/ukp/inception/log/exporter/LoggedEventExporterTest.java index 17018282e35..582328a207a 100644 --- a/inception/inception-log/src/test/java/de/tudarmstadt/ukp/inception/log/exporter/LoggedEventExporterTest.java +++ b/inception/inception-log/src/test/java/de/tudarmstadt/ukp/inception/log/exporter/LoggedEventExporterTest.java @@ -46,13 +46,13 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.stubbing.Answer; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; 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; import de.tudarmstadt.ukp.clarin.webanno.export.model.ExportedProject; 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.log.EventRepository; import de.tudarmstadt.ukp.inception.log.model.LoggedEvent; diff --git a/inception/inception-model-vdoc/LICENSE.txt b/inception/inception-model-vdoc/LICENSE.txt new file mode 100644 index 00000000000..d6456956733 --- /dev/null +++ b/inception/inception-model-vdoc/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-model-vdoc/pom.xml b/inception/inception-model-vdoc/pom.xml new file mode 100644 index 00000000000..2e2f1336145 --- /dev/null +++ b/inception/inception-model-vdoc/pom.xml @@ -0,0 +1,62 @@ + + + 4.0.0 + + de.tudarmstadt.ukp.inception.app + inception-app + 30.0-SNAPSHOT + + inception-model-vdoc + INCEpTION - Core - VDoc Model + + + de.tudarmstadt.ukp.inception.app + inception-model + + + de.tudarmstadt.ukp.inception.app + inception-support + + + + org.apache.commons + commons-lang3 + + + org.apache.commons + commons-collections4 + + + + org.slf4j + slf4j-api + + + + org.apache.uima + uimaj-core + + + + + com.fasterxml.jackson.core + jackson-databind + + + diff --git a/inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VAnnotationMarker.java b/inception/inception-model-vdoc/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VAnnotationMarker.java similarity index 100% rename from inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VAnnotationMarker.java rename to inception/inception-model-vdoc/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VAnnotationMarker.java diff --git a/inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VArc.java b/inception/inception-model-vdoc/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VArc.java similarity index 100% rename from inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VArc.java rename to inception/inception-model-vdoc/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VArc.java diff --git a/inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VComment.java b/inception/inception-model-vdoc/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VComment.java similarity index 100% rename from inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VComment.java rename to inception/inception-model-vdoc/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VComment.java diff --git a/inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VCommentType.java b/inception/inception-model-vdoc/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VCommentType.java similarity index 100% rename from inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VCommentType.java rename to inception/inception-model-vdoc/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VCommentType.java diff --git a/inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VDocument.java b/inception/inception-model-vdoc/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VDocument.java similarity index 100% rename from inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VDocument.java rename to inception/inception-model-vdoc/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VDocument.java diff --git a/inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VID.java b/inception/inception-model-vdoc/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VID.java similarity index 100% rename from inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VID.java rename to inception/inception-model-vdoc/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VID.java diff --git a/inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VLazyDetail.java b/inception/inception-model-vdoc/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VLazyDetail.java similarity index 100% rename from inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VLazyDetail.java rename to inception/inception-model-vdoc/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VLazyDetail.java diff --git a/inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VLazyDetailGroup.java b/inception/inception-model-vdoc/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VLazyDetailGroup.java similarity index 100% rename from inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VLazyDetailGroup.java rename to inception/inception-model-vdoc/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VLazyDetailGroup.java diff --git a/inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VMarker.java b/inception/inception-model-vdoc/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VMarker.java similarity index 100% rename from inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VMarker.java rename to inception/inception-model-vdoc/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VMarker.java diff --git a/inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VObject.java b/inception/inception-model-vdoc/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VObject.java similarity index 100% rename from inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VObject.java rename to inception/inception-model-vdoc/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VObject.java diff --git a/inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VRange.java b/inception/inception-model-vdoc/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VRange.java similarity index 100% rename from inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VRange.java rename to inception/inception-model-vdoc/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VRange.java diff --git a/inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VSentenceMarker.java b/inception/inception-model-vdoc/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VSentenceMarker.java similarity index 100% rename from inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VSentenceMarker.java rename to inception/inception-model-vdoc/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VSentenceMarker.java diff --git a/inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VSpan.java b/inception/inception-model-vdoc/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VSpan.java similarity index 100% rename from inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VSpan.java rename to inception/inception-model-vdoc/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VSpan.java diff --git a/inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VTextMarker.java b/inception/inception-model-vdoc/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VTextMarker.java similarity index 100% rename from inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VTextMarker.java rename to inception/inception-model-vdoc/src/main/java/de/tudarmstadt/ukp/inception/rendering/vmodel/VTextMarker.java diff --git a/inception/inception-pdf-editor/pom.xml b/inception/inception-pdf-editor/pom.xml index 4657ea21972..a61f5723f90 100644 --- a/inception/inception-pdf-editor/pom.xml +++ b/inception/inception-pdf-editor/pom.xml @@ -22,12 +22,16 @@ inception-app 30.0-SNAPSHOT - INCEpTION - Editor - PDF (pdfbox ${pdfbox.version}) + INCEpTION - Editor - PDF (pdfbox ${pdfbox.version}) (deprecated) inception-pdf-editor de.tudarmstadt.ukp.inception.app - inception-api + inception-documents-api + + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api de.tudarmstadt.ukp.inception.app @@ -53,6 +57,10 @@ de.tudarmstadt.ukp.inception.app inception-model + + de.tudarmstadt.ukp.inception.app + inception-model-vdoc + de.tudarmstadt.ukp.inception.app inception-support diff --git a/inception/inception-pdf-editor/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor/PdfAnnotationEditor.java b/inception/inception-pdf-editor/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor/PdfAnnotationEditor.java index 24cc8e0624c..d202da88819 100644 --- a/inception/inception-pdf-editor/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor/PdfAnnotationEditor.java +++ b/inception/inception-pdf-editor/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor/PdfAnnotationEditor.java @@ -47,8 +47,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; +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.editor.view.DocumentViewFactory; diff --git a/inception/inception-pdf-editor/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor/PdfAnnotationEditorFactory.java b/inception/inception-pdf-editor/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor/PdfAnnotationEditorFactory.java index 29211ca8565..6a4f14edb44 100644 --- a/inception/inception-pdf-editor/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor/PdfAnnotationEditorFactory.java +++ b/inception/inception-pdf-editor/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor/PdfAnnotationEditorFactory.java @@ -23,8 +23,8 @@ import org.apache.wicket.model.IModel; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.paging.NoPagingStrategy; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorBase; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorFactoryImplBase; diff --git a/inception/inception-pdf-editor/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor/pdfanno/PdfDocumentIFrameView.java b/inception/inception-pdf-editor/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor/pdfanno/PdfDocumentIFrameView.java index c904cd1256f..9d6aeb40b61 100644 --- a/inception/inception-pdf-editor/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor/pdfanno/PdfDocumentIFrameView.java +++ b/inception/inception-pdf-editor/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor/pdfanno/PdfDocumentIFrameView.java @@ -45,8 +45,8 @@ import org.slf4j.LoggerFactory; import org.xml.sax.SAXException; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.pdfeditor.PdfAnnotationEditor; import de.tudarmstadt.ukp.inception.pdfeditor.pdfanno.model.PdfExtractFile; import de.tudarmstadt.ukp.inception.pdfeditor.pdfextract.PDFExtractor; diff --git a/inception/inception-pdf-editor2/pom.xml b/inception/inception-pdf-editor2/pom.xml index 5038716b0a6..baba71fad51 100644 --- a/inception/inception-pdf-editor2/pom.xml +++ b/inception/inception-pdf-editor2/pom.xml @@ -25,13 +25,17 @@ INCEpTION - Editor - PDF (pdfbox ${pdfbox.version}; pdfjs ${pdfjs.version}) inception-pdf-editor2 + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api + de.tudarmstadt.ukp.inception.app inception-support de.tudarmstadt.ukp.inception.app - inception-api + inception-documents-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-pdf-editor2/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor2/PdfAnnotationEditor.java b/inception/inception-pdf-editor2/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor2/PdfAnnotationEditor.java index b6a074d41a4..2a5205cc252 100644 --- a/inception/inception-pdf-editor2/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor2/PdfAnnotationEditor.java +++ b/inception/inception-pdf-editor2/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor2/PdfAnnotationEditor.java @@ -27,8 +27,8 @@ import org.apache.wicket.model.Model; import org.apache.wicket.spring.injection.annot.SpringBean; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; +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.editor.view.DocumentViewFactory; diff --git a/inception/inception-pdf-editor2/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor2/PdfAnnotationEditorFactory.java b/inception/inception-pdf-editor2/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor2/PdfAnnotationEditorFactory.java index 77c96b4500d..f1160677e8e 100644 --- a/inception/inception-pdf-editor2/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor2/PdfAnnotationEditorFactory.java +++ b/inception/inception-pdf-editor2/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor2/PdfAnnotationEditorFactory.java @@ -23,8 +23,8 @@ import org.apache.wicket.model.IModel; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.paging.NoPagingStrategy; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorBase; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorFactoryImplBase; diff --git a/inception/inception-pdf-editor2/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor2/view/PdfDocumentIFrameView.java b/inception/inception-pdf-editor2/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor2/view/PdfDocumentIFrameView.java index d64b8e7f6b2..1b9cc30b710 100644 --- a/inception/inception-pdf-editor2/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor2/view/PdfDocumentIFrameView.java +++ b/inception/inception-pdf-editor2/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor2/view/PdfDocumentIFrameView.java @@ -44,9 +44,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.clarin.webanno.support.JSONUtil; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.pdfeditor2.PdfAnnotationEditor; import de.tudarmstadt.ukp.inception.pdfeditor2.format.VisualPdfReader; import de.tudarmstadt.ukp.inception.pdfeditor2.view.pdfjs.PdfJsViewerPage; diff --git a/inception/inception-preferences/pom.xml b/inception/inception-preferences/pom.xml index 4dd9da472e5..bddf56dba1e 100644 --- a/inception/inception-preferences/pom.xml +++ b/inception/inception-preferences/pom.xml @@ -39,15 +39,15 @@ de.tudarmstadt.ukp.inception.app - inception-support + inception-export-api de.tudarmstadt.ukp.inception.app - inception-security + inception-support de.tudarmstadt.ukp.inception.app - inception-api + inception-security @@ -97,6 +97,16 @@ + + de.tudarmstadt.ukp.inception.app + inception-api + test + + + de.tudarmstadt.ukp.inception.app + inception-documents-api + test + org.hsqldb hsqldb 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 2216d748cc2..be68da79fb8 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 @@ -38,14 +38,16 @@ import org.springframework.util.FileSystemUtils; import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryAutoConfiguration; 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; -@DataJpaTest(excludeAutoConfiguration = LiquibaseAutoConfiguration.class, showSql = false, // +@DataJpaTest( // + showSql = false, // + excludeAutoConfiguration = LiquibaseAutoConfiguration.class, // properties = { // "spring.main.banner-mode=off", // "repository.path=" + PreferencesServiceImplIntegrationTest.TEST_OUTPUT_FOLDER }) diff --git a/inception/inception-project-export/pom.xml b/inception/inception-project-export/pom.xml index 5be04ff323c..6ab953b0e6c 100644 --- a/inception/inception-project-export/pom.xml +++ b/inception/inception-project-export/pom.xml @@ -50,10 +50,18 @@ de.tudarmstadt.ukp.inception.app inception-api + + de.tudarmstadt.ukp.inception.app + inception-documents-api + de.tudarmstadt.ukp.inception.app inception-annotation-storage + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api + de.tudarmstadt.ukp.inception.app inception-api-schema @@ -62,6 +70,10 @@ de.tudarmstadt.ukp.inception.app inception-model-export + + de.tudarmstadt.ukp.inception.app + inception-export-api + de.tudarmstadt.ukp.inception.app inception-support @@ -271,6 +283,7 @@ + de.tudarmstadt.ukp.inception.app:inception-annotation-storage-api org.springframework:spring-websocket 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 caa820fcc67..efcafb8e096 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.DocumentService; 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.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/legacy/LegacyProjectExportPanel.java b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/legacy/LegacyProjectExportPanel.java index 16f3d2e039a..c699a2c2c98 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.DocumentService; 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; @@ -54,6 +53,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxLink; 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.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/main/java/de/tudarmstadt/ukp/inception/project/export/task/ProjectExportTask_ImplBase.java b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/task/ProjectExportTask_ImplBase.java index 1127436eaf4..a103f80ca36 100644 --- a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/task/ProjectExportTask_ImplBase.java +++ b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/task/ProjectExportTask_ImplBase.java @@ -41,13 +41,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.messaging.simp.SimpMessagingTemplate; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportException; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportRequest_ImplBase; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportTaskHandle; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportTaskMonitor; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.project.export.model.ProjectExportTask; public abstract class ProjectExportTask_ImplBase diff --git a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/task/curated/CuratedDocumentsProjectExportExtension.java b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/task/curated/CuratedDocumentsProjectExportExtension.java index 54019474685..04e04393c71 100644 --- a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/task/curated/CuratedDocumentsProjectExportExtension.java +++ b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/task/curated/CuratedDocumentsProjectExportExtension.java @@ -21,8 +21,8 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.project.export.ProjectExportExtension; import de.tudarmstadt.ukp.inception.project.export.config.ProjectExportServiceAutoConfiguration; diff --git a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/task/curated/CuratedDocumentsProjectExportTask.java b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/task/curated/CuratedDocumentsProjectExportTask.java index 71805cd3a1c..cfa200d3d3b 100644 --- a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/task/curated/CuratedDocumentsProjectExportTask.java +++ b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/task/curated/CuratedDocumentsProjectExportTask.java @@ -33,7 +33,6 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportException; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportTaskMonitor; import de.tudarmstadt.ukp.clarin.webanno.api.format.FormatSupport; @@ -45,6 +44,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.ZipUtils; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; import de.tudarmstadt.ukp.inception.annotation.storage.CasStorageSession; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.project.export.task.ProjectExportTask_ImplBase; public class CuratedDocumentsProjectExportTask diff --git a/inception/inception-project-export/src/test/java/de/tudarmstadt/ukp/inception/project/export/AnnotationDocumentsExporterTest.java b/inception/inception-project-export/src/test/java/de/tudarmstadt/ukp/inception/project/export/AnnotationDocumentsExporterTest.java index 5d8e08c450e..34bd8c9238b 100644 --- a/inception/inception-project-export/src/test/java/de/tudarmstadt/ukp/inception/project/export/AnnotationDocumentsExporterTest.java +++ b/inception/inception-project-export/src/test/java/de/tudarmstadt/ukp/inception/project/export/AnnotationDocumentsExporterTest.java @@ -38,8 +38,6 @@ import org.mockito.junit.jupiter.MockitoExtension; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectImportRequest; import de.tudarmstadt.ukp.clarin.webanno.diag.ChecksRegistry; import de.tudarmstadt.ukp.clarin.webanno.diag.RepairsRegistry; @@ -52,6 +50,8 @@ import de.tudarmstadt.ukp.inception.annotation.storage.config.CasStorageCachePropertiesImpl; import de.tudarmstadt.ukp.inception.annotation.storage.config.CasStoragePropertiesImpl; 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.export.DocumentImportExportServiceImpl; import de.tudarmstadt.ukp.inception.export.config.DocumentImportExportServiceProperties; import de.tudarmstadt.ukp.inception.export.config.DocumentImportExportServicePropertiesImpl; 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 b05eb9b65d7..74b07bd833b 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 @@ -70,8 +70,6 @@ import org.springframework.web.socket.messaging.WebSocketStompClient; import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryAutoConfiguration; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; 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; @@ -83,6 +81,8 @@ import de.tudarmstadt.ukp.clarin.webanno.support.ApplicationContextProvider; import de.tudarmstadt.ukp.clarin.webanno.support.logging.Logging; import de.tudarmstadt.ukp.inception.annotation.storage.config.CasStorageServiceAutoConfiguration; +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.export.config.ProjectExportServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; diff --git a/inception/inception-project/pom.xml b/inception/inception-project/pom.xml index efa3aee1fb7..c7769c88511 100644 --- a/inception/inception-project/pom.xml +++ b/inception/inception-project/pom.xml @@ -38,6 +38,10 @@ commons-collections4 + + de.tudarmstadt.ukp.inception.app + inception-documents-api + de.tudarmstadt.ukp.inception.app inception-model @@ -46,6 +50,10 @@ de.tudarmstadt.ukp.inception.app inception-model-export + + de.tudarmstadt.ukp.inception.app + inception-export-api + de.tudarmstadt.ukp.inception.app inception-api 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 5c1a9d3e2ef..7497d2e820e 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 @@ -83,7 +83,6 @@ import org.springframework.transaction.annotation.Transactional; import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; 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; @@ -102,6 +101,7 @@ import de.tudarmstadt.ukp.clarin.webanno.security.model.User; 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; /** *

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 c2c60d61529..077fcf9bb22 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 @@ -29,7 +29,6 @@ import org.springframework.context.annotation.Lazy; import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; 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; @@ -37,6 +36,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.ProjectServiceImpl; 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; @Configuration public class ProjectServiceAutoConfiguration 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 3a61194e46a..a7d33c5a356 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 @@ -50,8 +50,6 @@ import org.springframework.context.annotation.Import; import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryAutoConfiguration; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; 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 +57,8 @@ import de.tudarmstadt.ukp.clarin.webanno.security.model.Role; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; 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; @DataJpaTest( // excludeAutoConfiguration = LiquibaseAutoConfiguration.class, // diff --git a/inception/inception-recommendation-api/pom.xml b/inception/inception-recommendation-api/pom.xml index 7c933bd4982..cbd50a80271 100644 --- a/inception/inception-recommendation-api/pom.xml +++ b/inception/inception-recommendation-api/pom.xml @@ -28,7 +28,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-documents-api de.tudarmstadt.ukp.inception.app @@ -46,6 +46,10 @@ de.tudarmstadt.ukp.inception.app inception-model + + de.tudarmstadt.ukp.inception.app + inception-model-vdoc + de.tudarmstadt.ukp.inception.app inception-scheduling diff --git a/inception/inception-recommendation-api/src/main/java/de/tudarmstadt/ukp/inception/recommendation/api/model/Predictions.java b/inception/inception-recommendation-api/src/main/java/de/tudarmstadt/ukp/inception/recommendation/api/model/Predictions.java index d62fa1ff715..6238b87885c 100644 --- a/inception/inception-recommendation-api/src/main/java/de/tudarmstadt/ukp/inception/recommendation/api/model/Predictions.java +++ b/inception/inception-recommendation-api/src/main/java/de/tudarmstadt/ukp/inception/recommendation/api/model/Predictions.java @@ -35,13 +35,13 @@ import org.apache.commons.lang3.Validate; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; 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.clarin.webanno.support.logging.LogMessage; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; /** diff --git a/inception/inception-recommendation/pom.xml b/inception/inception-recommendation/pom.xml index da12ea38f00..6fb7d9b6840 100644 --- a/inception/inception-recommendation/pom.xml +++ b/inception/inception-recommendation/pom.xml @@ -25,10 +25,18 @@ inception-recommendation INCEpTION - Recommendation - Core + + de.tudarmstadt.ukp.inception.app + inception-documents-api + de.tudarmstadt.ukp.inception.app inception-ui-dashboard + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api + de.tudarmstadt.ukp.inception.app inception-api-annotation @@ -73,6 +81,10 @@ de.tudarmstadt.ukp.inception.app inception-model + + de.tudarmstadt.ukp.inception.app + inception-model-vdoc + de.tudarmstadt.ukp.inception.app inception-ui-core @@ -93,6 +105,10 @@ de.tudarmstadt.ukp.inception.app inception-model-export + + de.tudarmstadt.ukp.inception.app + inception-export-api + de.tudarmstadt.ukp.inception.app inception-recommendation-api 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 97e370a68c3..1e961574bf9 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,9 +32,9 @@ import org.springframework.context.annotation.Lazy; import org.springframework.security.core.session.SessionRegistry; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; 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.recommendation.RecommendationEditorExtension; import de.tudarmstadt.ukp.inception.recommendation.actionbar.RecommenderActionBarExtension; diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/exporter/LearningRecordExporter.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/exporter/LearningRecordExporter.java index b8a288e6f1e..9949d7db7b4 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/exporter/LearningRecordExporter.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/exporter/LearningRecordExporter.java @@ -29,7 +29,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; 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; @@ -39,6 +38,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; 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.recommendation.api.LearningRecordService; import de.tudarmstadt.ukp.inception.recommendation.api.model.LearningRecord; import de.tudarmstadt.ukp.inception.recommendation.config.RecommenderServiceAutoConfiguration; 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 af56befc003..f189f5af57f 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 @@ -17,9 +17,9 @@ */ package de.tudarmstadt.ukp.inception.recommendation.service; -import static de.tudarmstadt.ukp.clarin.webanno.api.CasUpgradeMode.AUTO_CAS_UPGRADE; 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.CasUpgradeMode.AUTO_CAS_UPGRADE; import static de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst.FEAT_REL_SOURCE; import static de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst.FEAT_REL_TARGET; import static de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst.RELATION_TYPE; @@ -115,7 +115,6 @@ import org.springframework.security.core.session.SessionRegistry; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; 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; @@ -149,6 +148,7 @@ import de.tudarmstadt.ukp.inception.annotation.layer.relation.RelationAdapter; import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanAdapter; 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.recommendation.api.LearningRecordService; import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/RecommendationSidebar.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/RecommendationSidebar.java index 6b12499da50..31398acf55d 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/RecommendationSidebar.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/RecommendationSidebar.java @@ -40,7 +40,7 @@ import com.googlecode.wicket.jquery.core.Options; import com.googlecode.wicket.kendo.ui.widget.tooltip.TooltipBehavior; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; +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; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/RecommendationSidebarFactory.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/RecommendationSidebarFactory.java index efc67d741fb..11e8b29c2f9 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/RecommendationSidebarFactory.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/RecommendationSidebarFactory.java @@ -23,7 +23,7 @@ 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.CasProvider; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.AnnotationPage; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.sidebar.AnnotationSidebarFactory_ImplBase; diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/RecommenderInfoPanel.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/RecommenderInfoPanel.java index 3202793a85c..66dcccfe239 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/RecommenderInfoPanel.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/RecommenderInfoPanel.java @@ -46,7 +46,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.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; @@ -56,6 +55,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.wicket.TempFileResource; import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanAdapter; import de.tudarmstadt.ukp.inception.annotation.storage.CasMetadataUtils; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.api.evaluation.EvaluationResult; import de.tudarmstadt.ukp.inception.recommendation.api.model.EvaluatedRecommender; diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/tasks/PredictionTask.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/tasks/PredictionTask.java index 4366e2b12e5..7f675d630c7 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/tasks/PredictionTask.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/tasks/PredictionTask.java @@ -28,13 +28,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEventPublisher; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; 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.clarin.webanno.support.WebAnnoConst; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; import de.tudarmstadt.ukp.inception.annotation.storage.CasStorageSession; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.api.model.Predictions; import de.tudarmstadt.ukp.inception.recommendation.event.RecommenderTaskNotificationEvent; diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/tasks/SelectionTask.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/tasks/SelectionTask.java index 5506258ff2d..e8f00da9400 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/tasks/SelectionTask.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/tasks/SelectionTask.java @@ -17,8 +17,8 @@ */ package de.tudarmstadt.ukp.inception.recommendation.tasks; -import static de.tudarmstadt.ukp.clarin.webanno.api.CasUpgradeMode.AUTO_CAS_UPGRADE; import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasAccessMode.SHARED_READ_ONLY_ACCESS; +import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasUpgradeMode.AUTO_CAS_UPGRADE; import static java.lang.System.currentTimeMillis; import static java.text.MessageFormat.format; @@ -37,7 +37,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEventPublisher; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; @@ -45,6 +44,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; import de.tudarmstadt.ukp.inception.annotation.storage.CasStorageSession; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.api.evaluation.EvaluationResult; import de.tudarmstadt.ukp.inception.recommendation.api.evaluation.PercentageBasedSplitter; diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/tasks/TrainingTask.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/tasks/TrainingTask.java index c31c4ec74f4..3abd0390f9d 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/tasks/TrainingTask.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/tasks/TrainingTask.java @@ -17,8 +17,8 @@ */ package de.tudarmstadt.ukp.inception.recommendation.tasks; -import static de.tudarmstadt.ukp.clarin.webanno.api.CasUpgradeMode.AUTO_CAS_UPGRADE; import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasAccessMode.SHARED_READ_ONLY_ACCESS; +import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasUpgradeMode.AUTO_CAS_UPGRADE; import static de.tudarmstadt.ukp.inception.recommendation.api.recommender.TrainingCapability.TRAINING_NOT_SUPPORTED; import static de.tudarmstadt.ukp.inception.recommendation.api.recommender.TrainingCapability.TRAINING_REQUIRED; import static java.lang.System.currentTimeMillis; @@ -42,7 +42,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEventPublisher; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -51,6 +50,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; import de.tudarmstadt.ukp.inception.annotation.storage.CasStorageSession; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.api.model.EvaluatedRecommender; import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender; diff --git a/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/exporter/LearningRecordExporterTest.java b/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/exporter/LearningRecordExporterTest.java index bd35a24617d..6bf8c51e20b 100644 --- a/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/exporter/LearningRecordExporterTest.java +++ b/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/exporter/LearningRecordExporterTest.java @@ -35,7 +35,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; 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; @@ -44,6 +43,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; 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.recommendation.api.LearningRecordService; import de.tudarmstadt.ukp.inception.recommendation.api.model.LearningRecord; import de.tudarmstadt.ukp.inception.recommendation.api.model.LearningRecordChangeLocation; 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 41a23058632..c5b1526d2b3 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 @@ -63,8 +63,6 @@ import org.springframework.web.socket.messaging.WebSocketStompClient; import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryAutoConfiguration; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; 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; @@ -78,6 +76,8 @@ import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; import de.tudarmstadt.ukp.clarin.webanno.support.logging.Logging; import de.tudarmstadt.ukp.inception.annotation.storage.config.CasStorageServiceAutoConfiguration; +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.export.config.DocumentImportExportServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.recommendation.event.RecommenderTaskNotificationEvent; diff --git a/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/service/RecommendationServiceImplIntegrationTest.java b/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/service/RecommendationServiceImplIntegrationTest.java index 1b2bc655bca..e66d8c82a01 100644 --- a/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/service/RecommendationServiceImplIntegrationTest.java +++ b/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/service/RecommendationServiceImplIntegrationTest.java @@ -90,7 +90,11 @@ @ExtendWith(MockitoExtension.class) @ContextConfiguration(classes = SpringConfig.class) @Transactional -@DataJpaTest(excludeAutoConfiguration = LiquibaseAutoConfiguration.class) +@DataJpaTest( // + showSql = false, // + properties = { // + "spring.main.banner-mode=off" }, // + excludeAutoConfiguration = LiquibaseAutoConfiguration.class) public class RecommendationServiceImplIntegrationTest { private static final String PROJECT_NAME = "Test project"; diff --git a/inception/inception-remote/pom.xml b/inception/inception-remote/pom.xml index 1711e8e5fe3..a00c985e466 100644 --- a/inception/inception-remote/pom.xml +++ b/inception/inception-remote/pom.xml @@ -73,6 +73,10 @@ de.tudarmstadt.ukp.inception.app inception-export + + de.tudarmstadt.ukp.inception.app + inception-export-api + de.tudarmstadt.ukp.inception.app inception-project-export @@ -101,6 +105,10 @@ de.tudarmstadt.ukp.inception.app inception-security + + de.tudarmstadt.ukp.inception.app + inception-documents-api + javax.persistence 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 86da546e5ee..c763e2cfc97 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.DocumentService; 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; @@ -75,6 +74,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst; 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 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 a972f7c9a2c..e0c0b37ebbe 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.DocumentService; 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; @@ -125,6 +124,7 @@ import de.tudarmstadt.ukp.clarin.webanno.webapp.remoteapi.aero.model.RResponse; 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.export.ProjectExportService; import de.tudarmstadt.ukp.inception.project.export.ProjectImportExportUtils; import io.swagger.v3.oas.annotations.Operation; diff --git a/inception/inception-remote/src/test/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/aero/MockAeroClient.java b/inception/inception-remote/src/test/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/aero/MockAeroClient.java index 63c392975d0..d97c3f943c2 100644 --- a/inception/inception-remote/src/test/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/aero/MockAeroClient.java +++ b/inception/inception-remote/src/test/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/aero/MockAeroClient.java @@ -35,9 +35,9 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LoggingFilter; import de.tudarmstadt.ukp.inception.annotation.storage.OpenCasStorageSessionForRequestFilter; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; class MockAeroClient { diff --git a/inception/inception-review-editor/pom.xml b/inception/inception-review-editor/pom.xml index 188846c97c7..882cde9fdb6 100644 --- a/inception/inception-review-editor/pom.xml +++ b/inception/inception-review-editor/pom.xml @@ -22,17 +22,16 @@ inception-app 30.0-SNAPSHOT - INCEpTION - Editor - Review + INCEpTION - Editor - Review (deprecated) inception-review-editor de.tudarmstadt.ukp.inception.app inception-layer-docmetadata - de.tudarmstadt.ukp.inception.app - inception-api + inception-annotation-storage-api de.tudarmstadt.ukp.inception.app @@ -54,6 +53,10 @@ de.tudarmstadt.ukp.inception.app inception-model + + de.tudarmstadt.ukp.inception.app + inception-model-vdoc + de.tudarmstadt.ukp.inception.app inception-support diff --git a/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/AnnotationPanel.java b/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/AnnotationPanel.java index 75af6f90828..1a0bbd7ee87 100644 --- a/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/AnnotationPanel.java +++ b/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/AnnotationPanel.java @@ -36,7 +36,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.LinkMode; @@ -48,8 +48,8 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeUtil; import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.feature.TypeUtil; import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; import de.tudarmstadt.ukp.inception.ui.core.docanno.layer.DocumentMetadataLayerSupport; diff --git a/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/DocumentAnnotationPanel.java b/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/DocumentAnnotationPanel.java index 61252869a7f..1976ac215d3 100644 --- a/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/DocumentAnnotationPanel.java +++ b/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/DocumentAnnotationPanel.java @@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory; import org.wicketstuff.event.annotation.OnEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.LinkMode; diff --git a/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/ReviewEditor.java b/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/ReviewEditor.java index a0a48051cfc..1e5fb02d4cf 100644 --- a/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/ReviewEditor.java +++ b/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/ReviewEditor.java @@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory; import org.wicketstuff.event.annotation.OnEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorBase; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; diff --git a/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/ReviewEditorFactory.java b/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/ReviewEditorFactory.java index dd1f20da820..483285de32f 100644 --- a/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/ReviewEditorFactory.java +++ b/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/ReviewEditorFactory.java @@ -21,8 +21,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.paging.NoPagingStrategy; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorBase; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorFactoryImplBase; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; diff --git a/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/StructuredReviewDraftPanel.java b/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/StructuredReviewDraftPanel.java index b884820cce3..6cfdd59c793 100644 --- a/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/StructuredReviewDraftPanel.java +++ b/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/StructuredReviewDraftPanel.java @@ -27,7 +27,7 @@ import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.Model; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; diff --git a/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/UnlinkedAnnotationPanel.java b/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/UnlinkedAnnotationPanel.java index c627d8c9f8a..0ff6e6b017e 100644 --- a/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/UnlinkedAnnotationPanel.java +++ b/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/UnlinkedAnnotationPanel.java @@ -26,7 +26,7 @@ import org.apache.wicket.model.Model; import org.wicketstuff.event.annotation.OnEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.revieweditor.event.RefreshEvent; diff --git a/inception/inception-scheduling/pom.xml b/inception/inception-scheduling/pom.xml index c1cc173124e..18246590471 100644 --- a/inception/inception-scheduling/pom.xml +++ b/inception/inception-scheduling/pom.xml @@ -34,6 +34,10 @@ de.tudarmstadt.ukp.inception.app inception-api + + de.tudarmstadt.ukp.inception.app + inception-documents-api + de.tudarmstadt.ukp.inception.app inception-security diff --git a/inception/inception-scheduling/src/main/java/de/tudarmstadt/ukp/inception/scheduling/Task.java b/inception/inception-scheduling/src/main/java/de/tudarmstadt/ukp/inception/scheduling/Task.java index f97c291a0c8..6ff07c69b81 100644 --- a/inception/inception-scheduling/src/main/java/de/tudarmstadt/ukp/inception/scheduling/Task.java +++ b/inception/inception-scheduling/src/main/java/de/tudarmstadt/ukp/inception/scheduling/Task.java @@ -31,9 +31,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.messaging.simp.SimpMessagingTemplate; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; public abstract class Task implements Runnable, InitializingBean diff --git a/inception/inception-schema/pom.xml b/inception/inception-schema/pom.xml index 5956bf52ff1..89113e4597b 100644 --- a/inception/inception-schema/pom.xml +++ b/inception/inception-schema/pom.xml @@ -29,17 +29,25 @@ de.tudarmstadt.ukp.inception.app inception-api-formats + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api + de.tudarmstadt.ukp.inception.app inception-documents + + de.tudarmstadt.ukp.inception.app + inception-documents-api + de.tudarmstadt.ukp.inception.app inception-model-export de.tudarmstadt.ukp.inception.app - inception-api-render + inception-export-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/config/AnnotationSchemaServiceAutoConfiguration.java b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/config/AnnotationSchemaServiceAutoConfiguration.java index 21849156c89..6d86ed96004 100644 --- a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/config/AnnotationSchemaServiceAutoConfiguration.java +++ b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/config/AnnotationSchemaServiceAutoConfiguration.java @@ -30,8 +30,7 @@ import org.springframework.context.annotation.Lazy; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; +import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.inception.annotation.feature.bool.BooleanFeatureSupport; import de.tudarmstadt.ukp.inception.annotation.feature.link.LinkFeatureSupport; @@ -54,7 +53,8 @@ import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanCrossSentenceBehavior; import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanLayerSupport; import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanOverlapBehavior; -import de.tudarmstadt.ukp.inception.rendering.config.AnnotationEditorProperties; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.exporters.AnnotationDocumentExporter; import de.tudarmstadt.ukp.inception.schema.exporters.LayerExporter; @@ -70,8 +70,7 @@ @Configuration @EnableConfigurationProperties({ // StringFeatureSupportPropertiesImpl.class, // - LinkFeatureSupportPropertiesImpl.class, // - AnnotationEditorPropertiesImpl.class }) + LinkFeatureSupportPropertiesImpl.class }) public class AnnotationSchemaServiceAutoConfiguration { private @PersistenceContext EntityManager entityManager; @@ -80,7 +79,7 @@ public class AnnotationSchemaServiceAutoConfiguration public AnnotationSchemaService annotationSchemaService( LayerSupportRegistry aLayerSupportRegistry, FeatureSupportRegistry aFeatureSupportRegistry, - AnnotationEditorProperties aAnnotationEditorProperties, + AnnotationSchemaProperties aAnnotationEditorProperties, ApplicationEventPublisher aApplicationEventPublisher) { return new AnnotationSchemaServiceImpl(aLayerSupportRegistry, aFeatureSupportRegistry, 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 ccf5ba71f13..a02a95178d5 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 @@ -69,8 +69,6 @@ import com.github.benmanes.caffeine.cache.LoadingCache; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; import de.tudarmstadt.ukp.clarin.webanno.api.export.FullProjectExportRequest; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportException; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportTaskMonitor; @@ -87,6 +85,8 @@ import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; import de.tudarmstadt.ukp.inception.annotation.storage.CasStorageSession; +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.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 7fa1714877f..e899bcd679b 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 @@ -80,9 +80,10 @@ import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; -import de.tudarmstadt.ukp.clarin.webanno.api.CasUpgradeMode; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.util.TypeSystemAnalysis; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.util.TypeSystemAnalysis.RelationDetails; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasUpgradeMode; +import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.api.event.TagCreatedEvent; import de.tudarmstadt.ukp.clarin.webanno.api.event.TagDeletedEvent; import de.tudarmstadt.ukp.clarin.webanno.api.event.TagUpdatedEvent; @@ -107,7 +108,6 @@ import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanAdapter; import de.tudarmstadt.ukp.inception.annotation.storage.CasMetadataUtils; import de.tudarmstadt.ukp.inception.annotation.storage.CasStorageSession; -import de.tudarmstadt.ukp.inception.rendering.config.AnnotationEditorProperties; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.AttachedAnnotation; import de.tudarmstadt.ukp.inception.schema.adapter.IllegalFeatureValueException; @@ -135,7 +135,7 @@ public class AnnotationSchemaServiceImpl private final FeatureSupportRegistry featureSupportRegistry; private final LoadingCache> immutableTagsCache; private final TypeSystemDescription builtInTypes; - private final AnnotationEditorProperties annotationEditorProperties; + private final AnnotationSchemaProperties annotationEditorProperties; public AnnotationSchemaServiceImpl() { @@ -146,7 +146,7 @@ public AnnotationSchemaServiceImpl() public AnnotationSchemaServiceImpl(LayerSupportRegistry aLayerSupportRegistry, FeatureSupportRegistry aFeatureSupportRegistry, ApplicationEventPublisher aApplicationEventPublisher, - AnnotationEditorProperties aAnnotationEditorProperties, EntityManager aEntityManager) + AnnotationSchemaProperties aAnnotationEditorProperties, EntityManager aEntityManager) { layerSupportRegistry = aLayerSupportRegistry; featureSupportRegistry = aFeatureSupportRegistry; 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 3e06a3e4efb..7d23491aec5 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,9 +44,8 @@ import org.springframework.util.FileSystemUtils; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryAutoConfiguration; +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; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -59,6 +58,8 @@ import de.tudarmstadt.ukp.clarin.webanno.text.config.TextFormatsAutoConfiguration; import de.tudarmstadt.ukp.inception.annotation.storage.CasStorageSession; import de.tudarmstadt.ukp.inception.annotation.storage.config.CasStorageServiceAutoConfiguration; +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.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; @@ -78,6 +79,7 @@ CasStorageServiceAutoConfiguration.class, // RepositoryAutoConfiguration.class, // AnnotationSchemaServiceAutoConfiguration.class, // + AnnotationSchemaAutoConfiguration.class, // SecurityAutoConfiguration.class }) public class DocumentServiceImplDatabaseTest { 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 d1ded636912..951166047b9 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,9 +45,8 @@ import org.springframework.util.FileSystemUtils; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryAutoConfiguration; +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; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; @@ -55,6 +54,8 @@ 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.DocumentService; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryAutoConfiguration; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.adapter.IllegalFeatureValueException; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; @@ -73,6 +74,7 @@ ProjectServiceAutoConfiguration.class, // RepositoryAutoConfiguration.class, // AnnotationSchemaServiceAutoConfiguration.class, // + AnnotationSchemaAutoConfiguration.class, // SecurityAutoConfiguration.class }) class AnnotationSchemaServiceImplTest { diff --git a/inception/inception-search-core/pom.xml b/inception/inception-search-core/pom.xml index 4a9dacb2a81..0728d744f77 100644 --- a/inception/inception-search-core/pom.xml +++ b/inception/inception-search-core/pom.xml @@ -41,6 +41,14 @@ de.tudarmstadt.ukp.inception.app inception-api + + de.tudarmstadt.ukp.inception.app + inception-documents-api + + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api + de.tudarmstadt.ukp.inception.app inception-annotation-storage 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 24c472fc29d..2b2e4fb3c59 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 @@ -17,10 +17,10 @@ */ package de.tudarmstadt.ukp.inception.search; -import static de.tudarmstadt.ukp.clarin.webanno.api.CasUpgradeMode.NO_CAS_UPGRADE; import static de.tudarmstadt.ukp.clarin.webanno.api.annotation.util.WebAnnoCasUtil.casToByteArray; import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasAccessMode.UNMANAGED_ACCESS; import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasAccessMode.UNMANAGED_NON_INITIALIZING_ACCESS; +import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasUpgradeMode.NO_CAS_UPGRADE; import static de.tudarmstadt.ukp.inception.search.model.AnnotationSearchState.KEY_SEARCH_STATE; import static java.lang.System.currentTimeMillis; import static java.util.concurrent.TimeUnit.SECONDS; @@ -54,7 +54,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.event.TransactionalEventListener; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; 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; @@ -69,6 +68,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; 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.scheduling.SchedulingService; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; 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 05cbf133417..ad16435efbc 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,8 +26,8 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; 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.scheduling.SchedulingService; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; diff --git a/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/scheduling/tasks/IndexAnnotationDocumentTask.java b/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/scheduling/tasks/IndexAnnotationDocumentTask.java index 837754f75e3..71a37c30039 100644 --- a/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/scheduling/tasks/IndexAnnotationDocumentTask.java +++ b/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/scheduling/tasks/IndexAnnotationDocumentTask.java @@ -21,8 +21,8 @@ */ package de.tudarmstadt.ukp.inception.search.scheduling.tasks; -import static de.tudarmstadt.ukp.clarin.webanno.api.CasUpgradeMode.AUTO_CAS_UPGRADE; import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasAccessMode.SHARED_READ_ONLY_ACCESS; +import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasUpgradeMode.AUTO_CAS_UPGRADE; import static de.tudarmstadt.ukp.inception.scheduling.MatchResult.DISCARD_OR_QUEUE_THIS; import static de.tudarmstadt.ukp.inception.scheduling.MatchResult.NO_MATCH; import static de.tudarmstadt.ukp.inception.scheduling.MatchResult.UNQUEUE_EXISTING_AND_QUEUE_THIS; @@ -34,10 +34,10 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.util.WebAnnoCasUtil; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.inception.annotation.storage.CasStorageSession; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.scheduling.MatchResult; import de.tudarmstadt.ukp.inception.scheduling.Task; import de.tudarmstadt.ukp.inception.search.SearchService; diff --git a/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/scheduling/tasks/IndexSourceDocumentTask.java b/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/scheduling/tasks/IndexSourceDocumentTask.java index 0ce37166656..f343e107a65 100644 --- a/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/scheduling/tasks/IndexSourceDocumentTask.java +++ b/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/scheduling/tasks/IndexSourceDocumentTask.java @@ -21,8 +21,8 @@ */ package de.tudarmstadt.ukp.inception.search.scheduling.tasks; -import static de.tudarmstadt.ukp.clarin.webanno.api.CasUpgradeMode.AUTO_CAS_UPGRADE; import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasAccessMode.SHARED_READ_ONLY_ACCESS; +import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasUpgradeMode.AUTO_CAS_UPGRADE; import static de.tudarmstadt.ukp.inception.scheduling.MatchResult.DISCARD_OR_QUEUE_THIS; import static de.tudarmstadt.ukp.inception.scheduling.MatchResult.NO_MATCH; import static de.tudarmstadt.ukp.inception.scheduling.MatchResult.UNQUEUE_EXISTING_AND_QUEUE_THIS; @@ -34,10 +34,10 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.util.WebAnnoCasUtil; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.inception.annotation.storage.CasStorageSession; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.scheduling.MatchResult; import de.tudarmstadt.ukp.inception.scheduling.Task; import de.tudarmstadt.ukp.inception.search.SearchService; diff --git a/inception/inception-search-mtas/pom.xml b/inception/inception-search-mtas/pom.xml index 32464e96a50..4fe00770d6d 100644 --- a/inception/inception-search-mtas/pom.xml +++ b/inception/inception-search-mtas/pom.xml @@ -29,6 +29,10 @@ de.tudarmstadt.ukp.inception.app inception-api + + de.tudarmstadt.ukp.inception.app + inception-documents-api + de.tudarmstadt.ukp.inception.app inception-api-annotation 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 a9e96072b89..5715b1df034 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 @@ -99,13 +99,13 @@ import com.github.openjson.JSONObject; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; 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.SourceDocument; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.search.ExecutionException; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupport; diff --git a/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasDocumentIndexFactory.java b/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasDocumentIndexFactory.java index 1b45a24f57e..235d2733e8f 100644 --- a/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasDocumentIndexFactory.java +++ b/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasDocumentIndexFactory.java @@ -23,9 +23,9 @@ import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; import de.tudarmstadt.ukp.clarin.webanno.model.Project; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupportRegistry; import de.tudarmstadt.ukp.inception.search.index.PhysicalIndex; diff --git a/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/config/MtasDocumentIndexAutoConfiguration.java b/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/config/MtasDocumentIndexAutoConfiguration.java index f1d3844f8b9..e4140c31141 100644 --- a/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/config/MtasDocumentIndexAutoConfiguration.java +++ b/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/config/MtasDocumentIndexAutoConfiguration.java @@ -21,8 +21,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.context.annotation.Bean; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupportRegistry; import de.tudarmstadt.ukp.inception.search.config.SearchServiceAutoConfiguration; 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 5e19eab2a90..24d7a3dd3a1 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,9 +57,8 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryAutoConfiguration; +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; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; @@ -80,6 +79,8 @@ import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.inception.annotation.storage.CasStorageSession; import de.tudarmstadt.ukp.inception.annotation.storage.config.CasStorageServiceAutoConfiguration; +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.export.config.DocumentImportExportServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.io.xmi.XmiFormatSupport; @@ -116,6 +117,7 @@ @Transactional(propagation = Propagation.NEVER) @Import({ // AnnotationSchemaServiceAutoConfiguration.class, // + AnnotationSchemaAutoConfiguration.class, // TextFormatsAutoConfiguration.class, // ConllFormatsAutoConfiguration.class, // DocumentImportExportServiceAutoConfiguration.class, // diff --git a/inception/inception-search-mtas/src/test/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasUimaParserTest.java b/inception/inception-search-mtas/src/test/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasUimaParserTest.java index a305d39a378..862bf3fb171 100644 --- a/inception/inception-search-mtas/src/test/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasUimaParserTest.java +++ b/inception/inception-search-mtas/src/test/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasUimaParserTest.java @@ -234,7 +234,7 @@ public void testSentencesAndTokens() throws Exception featureIndexingSupportRegistry, prefs); MtasTokenCollection tc = sut.createTokenCollection(jcas.getCas()); - MtasUtils.print(tc); + // MtasUtils.print(tc); List tokens = toList(tc); @@ -273,7 +273,7 @@ public void testNamedEnity() throws Exception annotationSchemaService, featureIndexingSupportRegistry, prefs); MtasTokenCollection tc = sut.createTokenCollection(jcas.getCas()); - MtasUtils.print(tc); + // MtasUtils.print(tc); List tokens = new ArrayList<>(); tc.iterator().forEachRemaining(tokens::add); @@ -300,7 +300,7 @@ void testMultiValueStringFeature() throws Exception annotationSchemaService, featureIndexingSupportRegistry, prefs); MtasTokenCollection result = sut.createTokenCollection(jcas.getCas()); - MtasUtils.print(result); + // MtasUtils.print(result); List tokens = toList(result); @@ -331,7 +331,7 @@ void testBooleanFeature() throws Exception annotationSchemaService, featureIndexingSupportRegistry, prefs); MtasTokenCollection result = sut.createTokenCollection(jcas.getCas()); - MtasUtils.print(result); + // MtasUtils.print(result); List tokens = toList(result); @@ -360,7 +360,7 @@ public void testZeroWidthSpanNotIndexed() throws Exception annotationSchemaService, featureIndexingSupportRegistry, prefs); MtasTokenCollection result = sut.createTokenCollection(jcas.getCas()); - MtasUtils.print(result); + // MtasUtils.print(result); List tokens = new ArrayList<>(); result.iterator().forEachRemaining(tokens::add); @@ -408,7 +408,7 @@ public void testDependencyRelation() throws Exception annotationSchemaService, featureIndexingSupportRegistry, prefs); MtasTokenCollection tc = sut.createTokenCollection(jcas.getCas()); - MtasUtils.print(tc); + // MtasUtils.print(tc); List tokens = new ArrayList<>(); tc.iterator().forEachRemaining(tokens::add); 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 4f194890802..ff7507fb5ca 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,9 +40,9 @@ import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; +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; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -52,6 +52,8 @@ import de.tudarmstadt.ukp.clarin.webanno.support.ApplicationContextProvider; import de.tudarmstadt.ukp.clarin.webanno.text.TextFormatSupport; import de.tudarmstadt.ukp.inception.annotation.storage.config.CasStorageServiceAutoConfiguration; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +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.io.xmi.XmiFormatSupport; @@ -68,6 +70,7 @@ @DataJpaTest( // showSql = false, // properties = { // + "spring.main.banner-mode=off", // "debug.cas-doctor.force-release-behavior=true", // "document-import.run-cas-doctor-on-import=OFF" }) @DirtiesContext(classMode = ClassMode.BEFORE_EACH_TEST_METHOD) @@ -189,6 +192,12 @@ RepositoryProperties repositoryProperties() return props; } + @Bean + AnnotationSchemaProperties annotationSchemaProperties() + { + return new AnnotationSchemaPropertiesImpl(); + } + @Bean public XmiFormatSupport xmiFormatSupport() { diff --git a/inception/inception-sharing/pom.xml b/inception/inception-sharing/pom.xml index 3f2d8347c14..3f0feab1860 100644 --- a/inception/inception-sharing/pom.xml +++ b/inception/inception-sharing/pom.xml @@ -53,6 +53,10 @@ de.tudarmstadt.ukp.inception.app inception-model-export + + de.tudarmstadt.ukp.inception.app + inception-export-api + de.tudarmstadt.ukp.inception.app inception-workload 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 879b673d94f..b3c1ff00a8e 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 @@ -46,7 +46,10 @@ import de.tudarmstadt.ukp.inception.workload.extension.WorkloadManagerExtension; import de.tudarmstadt.ukp.inception.workload.model.WorkloadManagementService; -@DataJpaTest(excludeAutoConfiguration = LiquibaseAutoConfiguration.class) +@DataJpaTest( // + properties = { // + "spring.main.banner-mode=off" }, // + excludeAutoConfiguration = LiquibaseAutoConfiguration.class) public class InviteServiceImplTest { private InviteService sut; diff --git a/inception/inception-ui-agreement/pom.xml b/inception/inception-ui-agreement/pom.xml index 4ed3f4473dd..efbac982191 100644 --- a/inception/inception-ui-agreement/pom.xml +++ b/inception/inception-ui-agreement/pom.xml @@ -43,6 +43,10 @@ de.tudarmstadt.ukp.inception.app inception-agreement + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api + de.tudarmstadt.ukp.inception.app inception-api-annotation @@ -63,6 +67,10 @@ de.tudarmstadt.ukp.inception.app inception-api + + de.tudarmstadt.ukp.inception.app + inception-documents-api + de.tudarmstadt.ukp.inception.app inception-security 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 d30c7501afb..438a390d688 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 @@ -17,8 +17,8 @@ */ package de.tudarmstadt.ukp.inception.ui.agreement.page; -import static de.tudarmstadt.ukp.clarin.webanno.api.CasUpgradeMode.AUTO_CAS_UPGRADE; import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasAccessMode.SHARED_READ_ONLY_ACCESS; +import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasUpgradeMode.AUTO_CAS_UPGRADE; import static de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState.FINISHED; import static de.tudarmstadt.ukp.clarin.webanno.model.PermissionLevel.ANNOTATOR; import static de.tudarmstadt.ukp.clarin.webanno.model.PermissionLevel.CURATOR; @@ -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.DocumentService; 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; @@ -78,6 +77,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaChoiceRenderer; 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.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.support.help.DocLink; diff --git a/inception/inception-ui-annotation/pom.xml b/inception/inception-ui-annotation/pom.xml index a87befaf558..e6ee72c7643 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-annotation-storage-api + de.tudarmstadt.ukp.inception.app inception-api-editor @@ -76,10 +80,18 @@ de.tudarmstadt.ukp.inception.app inception-model + + de.tudarmstadt.ukp.inception.app + inception-model-vdoc + de.tudarmstadt.ukp.inception.app inception-api + + de.tudarmstadt.ukp.inception.app + inception-documents-api + de.tudarmstadt.ukp.inception.app inception-api-annotation 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 ed8594e5721..41cd39fb07d 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 @@ -17,9 +17,9 @@ */ package de.tudarmstadt.ukp.clarin.webanno.ui.annotation; -import static de.tudarmstadt.ukp.clarin.webanno.api.CasUpgradeMode.FORCE_CAS_UPGRADE; import static de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationEditorState.KEY_EDITOR_STATE; import static de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase.PAGE_PARAM_DOCUMENT; +import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasUpgradeMode.FORCE_CAS_UPGRADE; import static de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState.IGNORE; import static de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentStateChangeFlag.EXPLICIT_ANNOTATOR_USER_ACTION; import static de.tudarmstadt.ukp.clarin.webanno.model.PermissionLevel.ANNOTATOR; @@ -59,7 +59,6 @@ import org.wicketstuff.annotation.mount.MountPath; import org.wicketstuff.event.annotation.OnEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; 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; @@ -86,6 +85,7 @@ import de.tudarmstadt.ukp.inception.annotation.events.DocumentOpenedEvent; import de.tudarmstadt.ukp.inception.annotation.events.FeatureValueUpdatedEvent; import de.tudarmstadt.ukp.inception.documents.DocumentAccess; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorBase; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorExtensionRegistry; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorFactory; 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 efda19766c6..10f82334ccc 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.DocumentService; 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; @@ -56,6 +55,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.wicket.DecoratedObject; 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.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/detail/AnnotationDetailEditorPanel.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AnnotationDetailEditorPanel.java index bbb06f8b786..9c9f216487d 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AnnotationDetailEditorPanel.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AnnotationDetailEditorPanel.java @@ -81,6 +81,7 @@ import de.tudarmstadt.ukp.clarin.webanno.api.annotation.exception.IllegalPlacementException; 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.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.constraints.evaluator.PossibleValue; import de.tudarmstadt.ukp.clarin.webanno.constraints.evaluator.RulesIndicator; import de.tudarmstadt.ukp.clarin.webanno.constraints.evaluator.ValuesGenerator; @@ -101,7 +102,6 @@ import de.tudarmstadt.ukp.inception.annotation.layer.relation.RelationAdapter; import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanAdapter; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; -import de.tudarmstadt.ukp.inception.rendering.config.AnnotationEditorProperties; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; import de.tudarmstadt.ukp.inception.rendering.selection.Selection; @@ -126,7 +126,7 @@ public abstract class AnnotationDetailEditorPanel private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); private @SpringBean AnnotationSchemaService annotationService; - private @SpringBean AnnotationEditorProperties annotationEditorProperties; + private @SpringBean AnnotationSchemaProperties annotationEditorProperties; // Top-level containers private final LayerSelectionPanel layerSelectionPanel; diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AttachedAnnotationListPanel.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AttachedAnnotationListPanel.java index c2faf226775..a013022760e 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AttachedAnnotationListPanel.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AttachedAnnotationListPanel.java @@ -64,7 +64,7 @@ import de.tudarmstadt.ukp.inception.schema.AttachedAnnotation; import de.tudarmstadt.ukp.inception.schema.AttachedAnnotation.Direction; import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeUtil; +import de.tudarmstadt.ukp.inception.schema.feature.TypeUtil; import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/LayerSelectionPanel.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/LayerSelectionPanel.java index e4522225cb9..f8b35e2d9d1 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/LayerSelectionPanel.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/LayerSelectionPanel.java @@ -36,12 +36,12 @@ import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.preferences.UserPreferencesService; +import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxFormComponentUpdatingBehavior; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaBehavior; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.event.DefaultLayerChangedEvent; -import de.tudarmstadt.ukp.inception.rendering.config.AnnotationEditorProperties; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; @@ -55,7 +55,7 @@ public class LayerSelectionPanel private @SpringBean AnnotationSchemaService annotationService; private @SpringBean UserPreferencesService userPreferencesService; private @SpringBean UserDao userDao; - private @SpringBean AnnotationEditorProperties annotationEditorProperties; + private @SpringBean AnnotationSchemaProperties annotationEditorProperties; private final Label relationHint; private final DropDownChoice layerSelector; diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/sidebar/AnnotationSidebarFactory.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/sidebar/AnnotationSidebarFactory.java index 7138c2e2940..e0032439074 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/sidebar/AnnotationSidebarFactory.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/sidebar/AnnotationSidebarFactory.java @@ -20,7 +20,7 @@ import org.apache.wicket.Component; import org.apache.wicket.model.IModel; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.AnnotationPage; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/sidebar/AnnotationSidebar_ImplBase.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/sidebar/AnnotationSidebar_ImplBase.java index 779c05df8a1..58e012ef72f 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/sidebar/AnnotationSidebar_ImplBase.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/sidebar/AnnotationSidebar_ImplBase.java @@ -24,10 +24,10 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.spring.injection.annot.SpringBean; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.AnnotationPage; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/sidebar/SidebarPanel.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/sidebar/SidebarPanel.java index 8f8114cc193..c29bf1550c8 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/sidebar/SidebarPanel.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/sidebar/SidebarPanel.java @@ -33,7 +33,7 @@ import org.apache.wicket.spring.injection.annot.SpringBean; import org.springframework.context.ApplicationContext; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.support.ApplicationContextProvider; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.AnnotationPage; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/sidebar/docinfo/DocumentInfoSidebar.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/sidebar/docinfo/DocumentInfoSidebar.java index 5099a32acfd..7bb2b2c0f12 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/sidebar/docinfo/DocumentInfoSidebar.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/sidebar/docinfo/DocumentInfoSidebar.java @@ -21,7 +21,7 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.PropertyModel; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.AnnotationPage; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.sidebar.AnnotationSidebar_ImplBase; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/sidebar/docinfo/DocumentInfoSidebarFactory.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/sidebar/docinfo/DocumentInfoSidebarFactory.java index 31bec443140..b7dedaa58ac 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/sidebar/docinfo/DocumentInfoSidebarFactory.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/sidebar/docinfo/DocumentInfoSidebarFactory.java @@ -22,7 +22,7 @@ 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.CasProvider; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.AnnotationPage; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.sidebar.AnnotationSidebarFactory_ImplBase; diff --git a/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/login/LoginPage.java b/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/login/LoginPage.java index 39e8ede0a5e..4d2db17578c 100644 --- a/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/login/LoginPage.java +++ b/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/login/LoginPage.java @@ -63,7 +63,6 @@ import com.giffing.wicket.spring.boot.context.scan.WicketSignInPage; -import de.tudarmstadt.ukp.clarin.webanno.api.SessionMetaData; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.config.LoginProperties; import de.tudarmstadt.ukp.clarin.webanno.security.config.SecurityProperties; diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/SessionMetaData.java b/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/login/SessionMetaData.java similarity index 96% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/SessionMetaData.java rename to inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/login/SessionMetaData.java index d70a3b54a35..3c9a7cf0f6e 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/SessionMetaData.java +++ b/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/login/SessionMetaData.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.clarin.webanno.api; +package de.tudarmstadt.ukp.clarin.webanno.ui.core.login; import java.util.LinkedHashMap; diff --git a/inception/inception-ui-curation/pom.xml b/inception/inception-ui-curation/pom.xml index bec746617a5..b4e092ab5e5 100644 --- a/inception/inception-ui-curation/pom.xml +++ b/inception/inception-ui-curation/pom.xml @@ -50,6 +50,10 @@ de.tudarmstadt.ukp.inception.app inception-ui-annotation + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api + de.tudarmstadt.ukp.inception.app inception-workload @@ -58,6 +62,10 @@ de.tudarmstadt.ukp.inception.app inception-model + + de.tudarmstadt.ukp.inception.app + inception-model-vdoc + de.tudarmstadt.ukp.inception.app inception-documents @@ -66,6 +74,10 @@ de.tudarmstadt.ukp.inception.app inception-api + + de.tudarmstadt.ukp.inception.app + inception-documents-api + de.tudarmstadt.ukp.inception.app inception-api-editor @@ -90,6 +102,10 @@ de.tudarmstadt.ukp.inception.app inception-diam + + de.tudarmstadt.ukp.inception.app + inception-api-diam + de.tudarmstadt.ukp.inception.app inception-brat-editor diff --git a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/actionbar/CuratorWorkflowActionBarItemGroup.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/actionbar/CuratorWorkflowActionBarItemGroup.java index dfdbd871bae..d0bcef88cd3 100644 --- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/actionbar/CuratorWorkflowActionBarItemGroup.java +++ b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/actionbar/CuratorWorkflowActionBarItemGroup.java @@ -40,7 +40,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.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.exception.ValidationException; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; @@ -54,6 +53,7 @@ import de.tudarmstadt.ukp.inception.curation.model.CurationWorkflow; import de.tudarmstadt.ukp.inception.curation.service.CurationDocumentService; import de.tudarmstadt.ukp.inception.curation.service.CurationService; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; 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/AnnotatorsPanel.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/AnnotatorsPanel.java index 9f11c0eb0dd..1e1acb1be02 100644 --- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/AnnotatorsPanel.java +++ b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/AnnotatorsPanel.java @@ -65,7 +65,7 @@ import com.googlecode.wicket.jquery.ui.widget.menu.IMenuItem; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; +import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.brat.schema.BratSchemaGenerator; import de.tudarmstadt.ukp.clarin.webanno.curation.casdiff.CasDiff.Configuration; import de.tudarmstadt.ukp.clarin.webanno.curation.casdiff.CasDiff.ConfigurationSet; @@ -91,13 +91,13 @@ import de.tudarmstadt.ukp.inception.curation.merge.CasMergeOperationResult; import de.tudarmstadt.ukp.inception.curation.merge.MergeConflictException; import de.tudarmstadt.ukp.inception.curation.service.CurationDocumentService; -import de.tudarmstadt.ukp.inception.rendering.config.AnnotationEditorProperties; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeUtil; +import de.tudarmstadt.ukp.inception.schema.feature.TypeUtil; /** * Panel with the annotator's annotations. @@ -127,7 +127,7 @@ public class AnnotatorsPanel private @SpringBean UserDao userService; private @SpringBean CurationRenderer curationRenderer; private @SpringBean BratSchemaGenerator bratSchemaGenerator; - private @SpringBean AnnotationEditorProperties annotationEditorProperties; + private @SpringBean AnnotationSchemaProperties annotationEditorProperties; public AnnotatorsPanel(String id, IModel> aModel) { 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 5406ab487cc..966732823c1 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,10 +55,9 @@ 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.CasProvider; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; 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; import de.tudarmstadt.ukp.clarin.webanno.brat.message.GetCollectionInformationResponse; import de.tudarmstadt.ukp.clarin.webanno.brat.render.BratSerializer; @@ -81,6 +80,7 @@ import de.tudarmstadt.ukp.inception.diam.editor.lazydetails.LazyDetailsLookupService; 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.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/component/render/CurationRendererImpl.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/render/CurationRendererImpl.java index 42c969a0380..f9f891e596f 100644 --- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/render/CurationRendererImpl.java +++ b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/render/CurationRendererImpl.java @@ -28,13 +28,13 @@ import de.tudarmstadt.ukp.clarin.webanno.api.annotation.rendering.ColorRenderer; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.rendering.LabelRenderer; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.rendering.PreRenderer; +import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; 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.rendering.coloring.ColoringService; import de.tudarmstadt.ukp.inception.rendering.coloring.ColoringStrategy; -import de.tudarmstadt.ukp.inception.rendering.config.AnnotationEditorProperties; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequest; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; @@ -47,12 +47,12 @@ public class CurationRendererImpl private final PreRenderer preRenderer; private final AnnotationSchemaService schemaService; private final ColoringService coloringService; - private final AnnotationEditorProperties annotationEditorProperties; + private final AnnotationSchemaProperties annotationEditorProperties; private final UserDao userService; public CurationRendererImpl(PreRenderer aPreRenderer, AnnotationSchemaService aSchemaService, ColoringService aColoringService, - AnnotationEditorProperties aAnnotationEditorProperties, UserDao aUserService) + AnnotationSchemaProperties aAnnotationEditorProperties, UserDao aUserService) { preRenderer = aPreRenderer; schemaService = aSchemaService; 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 30ed88f924b..1cfed14511a 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 @@ -17,9 +17,9 @@ */ package de.tudarmstadt.ukp.clarin.webanno.ui.curation.page; -import static de.tudarmstadt.ukp.clarin.webanno.api.CasUpgradeMode.FORCE_CAS_UPGRADE; import static de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase.PAGE_PARAM_DOCUMENT; import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasAccessMode.UNMANAGED_ACCESS; +import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasUpgradeMode.FORCE_CAS_UPGRADE; import static de.tudarmstadt.ukp.clarin.webanno.curation.casdiff.CasDiff.doDiffSingle; import static de.tudarmstadt.ukp.clarin.webanno.curation.casdiff.CasDiff.getDiffAdapters; import static de.tudarmstadt.ukp.clarin.webanno.curation.casdiff.LinkCompareBehavior.LINK_ROLE_AS_LABEL; @@ -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.DocumentService; 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; @@ -110,6 +109,7 @@ import de.tudarmstadt.ukp.inception.curation.service.CurationDocumentService; import de.tudarmstadt.ukp.inception.curation.service.CurationMergeService; import de.tudarmstadt.ukp.inception.curation.service.CurationService; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorBase; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorFactory; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorRegistry; 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 9d01e888bbb..198deee2d02 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.DocumentService; 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; @@ -37,6 +36,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxLink; 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.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/CurationEditorExtension.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationEditorExtension.java index 121ebfd8f7b..92d4c1e7c16 100644 --- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationEditorExtension.java +++ b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationEditorExtension.java @@ -29,7 +29,6 @@ import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationEventPublisher; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.exception.NotEditableException; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; @@ -42,6 +41,7 @@ import de.tudarmstadt.ukp.inception.curation.merge.CasMergeOperationResult; import de.tudarmstadt.ukp.inception.diam.editor.actions.ScrollToHandler; import de.tudarmstadt.ukp.inception.diam.editor.actions.SelectAnnotationHandler; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorExtension; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorExtensionImplBase; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; 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 cfbd8e8ab58..fff24b02d7f 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,9 +61,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; 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; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; @@ -82,6 +81,7 @@ import de.tudarmstadt.ukp.inception.curation.model.CurationWorkflow; import de.tudarmstadt.ukp.inception.curation.service.CurationMergeService; import de.tudarmstadt.ukp.inception.curation.service.CurationService; +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.rendering.editorstate.AnnotatorState; 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 a4b6b1832b4..69311f18830 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 @@ -22,8 +22,8 @@ import org.apache.wicket.Component; import org.apache.wicket.model.IModel; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; 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; 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 e2c0d586421..29abf6c5dbc 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,9 +52,8 @@ import org.springframework.security.core.session.SessionRegistry; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.CasStorageService; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; 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; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -65,6 +64,7 @@ import de.tudarmstadt.ukp.inception.curation.config.CurationServiceAutoConfiguration; 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.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 442700741f9..abce1e3bf40 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.CasStorageService; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; 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.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; diff --git a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/render/CurationSidebarRenderer.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/render/CurationSidebarRenderer.java index 744c197424d..01bdb4c13bf 100644 --- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/render/CurationSidebarRenderer.java +++ b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/render/CurationSidebarRenderer.java @@ -41,7 +41,6 @@ import org.slf4j.LoggerFactory; import org.springframework.core.annotation.Order; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.curation.casdiff.CasDiff; import de.tudarmstadt.ukp.clarin.webanno.curation.casdiff.CasDiff.Configuration; import de.tudarmstadt.ukp.clarin.webanno.curation.casdiff.CasDiff.ConfigurationSet; @@ -53,6 +52,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.rendering.Renderer; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.pipeline.RenderStep; diff --git a/inception/inception-ui-dashboard-activity/pom.xml b/inception/inception-ui-dashboard-activity/pom.xml index a05b1b40ee3..fe8e94dc302 100644 --- a/inception/inception-ui-dashboard-activity/pom.xml +++ b/inception/inception-ui-dashboard-activity/pom.xml @@ -26,6 +26,10 @@ INCEpTION - Dashboard - Recent activity jar + + de.tudarmstadt.ukp.inception.app + inception-documents-api + de.tudarmstadt.ukp.inception.app inception-ui-dashboard 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 aea26e6384e..57a4f88e5d4 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 @@ -39,7 +39,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; @@ -57,6 +56,7 @@ import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanCreatedEvent; import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanDeletedEvent; 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.log.model.LoggedEvent; diff --git a/inception/inception-ui-dashboard/pom.xml b/inception/inception-ui-dashboard/pom.xml index 47c7e81d0c5..c63f31a83c9 100644 --- a/inception/inception-ui-dashboard/pom.xml +++ b/inception/inception-ui-dashboard/pom.xml @@ -26,6 +26,10 @@ INCEpTION - UI - Dashboard jar + + de.tudarmstadt.ukp.inception.app + inception-documents-api + de.tudarmstadt.ukp.inception.app inception-support diff --git a/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/dashlet/DocumentHintDashlet.java b/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/dashlet/DocumentHintDashlet.java index 8b87c02e2f2..526fd2bd436 100644 --- a/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/dashlet/DocumentHintDashlet.java +++ b/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/dashlet/DocumentHintDashlet.java @@ -22,9 +22,9 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.spring.injection.annot.SpringBean; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.ProjectAccess; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.ui.core.dashboard.settings.documents.ProjectDocumentsPage; public class DocumentHintDashlet diff --git a/inception/inception-ui-external-search/pom.xml b/inception/inception-ui-external-search/pom.xml index dd4d9bd8b57..6ce7de2c27c 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-annotation-storage-api + de.tudarmstadt.ukp.inception.app inception-external-search-core @@ -45,6 +49,10 @@ de.tudarmstadt.ukp.inception.app inception-api-render + + de.tudarmstadt.ukp.inception.app + inception-documents-api + de.tudarmstadt.ukp.inception.app inception-api-schema @@ -53,6 +61,10 @@ de.tudarmstadt.ukp.inception.app inception-model + + de.tudarmstadt.ukp.inception.app + inception-model-vdoc + de.tudarmstadt.ukp.inception.app inception-api diff --git a/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/ResultRowView.java b/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/ResultRowView.java index bc13a774b48..3f8ee49793b 100644 --- a/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/ResultRowView.java +++ b/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/ResultRowView.java @@ -44,7 +44,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.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxLink; @@ -52,6 +51,7 @@ import de.tudarmstadt.ukp.clarin.webanno.ui.core.page.ProjectPageBase; import de.tudarmstadt.ukp.inception.app.ui.externalsearch.utils.DocumentImporter; import de.tudarmstadt.ukp.inception.app.ui.externalsearch.utils.HighlightLabel; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.externalsearch.ExternalSearchHighlight; import de.tudarmstadt.ukp.inception.externalsearch.ExternalSearchResult; diff --git a/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/config/ExternalSearchUIAutoConfiguration.java b/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/config/ExternalSearchUIAutoConfiguration.java index 8447aebf4d7..43a1633e53f 100644 --- a/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/config/ExternalSearchUIAutoConfiguration.java +++ b/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/config/ExternalSearchUIAutoConfiguration.java @@ -23,13 +23,13 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.inception.app.ui.externalsearch.SearchPageMenuItem; import de.tudarmstadt.ukp.inception.app.ui.externalsearch.project.DocumentRepositoryProjectSettingsPanelFactory; import de.tudarmstadt.ukp.inception.app.ui.externalsearch.project.ProjectDocumentRepositoriesMenuItem; import de.tudarmstadt.ukp.inception.app.ui.externalsearch.sidebar.ExternalSearchAnnotationSidebarFactory; import de.tudarmstadt.ukp.inception.app.ui.externalsearch.utils.DocumentImporter; import de.tudarmstadt.ukp.inception.app.ui.externalsearch.utils.DocumentImporterImpl; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.externalsearch.ExternalSearchService; import de.tudarmstadt.ukp.inception.externalsearch.config.ExternalSearchAutoConfiguration; 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 a22b423f61a..5b3b0b66b23 100644 --- a/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/sidebar/ExternalSearchAnnotationSidebar.java +++ b/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/sidebar/ExternalSearchAnnotationSidebar.java @@ -52,10 +52,9 @@ import org.slf4j.LoggerFactory; import org.wicketstuff.event.annotation.OnEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; 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; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; @@ -69,6 +68,7 @@ import de.tudarmstadt.ukp.inception.app.ui.externalsearch.ExternalResultDataProvider; import de.tudarmstadt.ukp.inception.app.ui.externalsearch.utils.DocumentImporter; import de.tudarmstadt.ukp.inception.app.ui.externalsearch.utils.HighlightLabel; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.externalsearch.ExternalSearchHighlight; import de.tudarmstadt.ukp.inception.externalsearch.ExternalSearchResult; diff --git a/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/sidebar/ExternalSearchAnnotationSidebarFactory.java b/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/sidebar/ExternalSearchAnnotationSidebarFactory.java index 42dd1662b77..3219d91babe 100644 --- a/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/sidebar/ExternalSearchAnnotationSidebarFactory.java +++ b/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/sidebar/ExternalSearchAnnotationSidebarFactory.java @@ -22,7 +22,7 @@ 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.CasProvider; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.AnnotationPage; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.sidebar.AnnotationSidebarFactory_ImplBase; diff --git a/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/utils/DocumentImporterImpl.java b/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/utils/DocumentImporterImpl.java index f78d81c1ab1..2a1415c48d7 100644 --- a/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/utils/DocumentImporterImpl.java +++ b/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/utils/DocumentImporterImpl.java @@ -23,11 +23,11 @@ import org.apache.uima.UIMAException; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; 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.app.ui.externalsearch.config.ExternalSearchUIAutoConfiguration; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.externalsearch.ExternalSearchService; import de.tudarmstadt.ukp.inception.externalsearch.model.DocumentRepository; diff --git a/inception/inception-ui-kb/pom.xml b/inception/inception-ui-kb/pom.xml index 5c4aee7ee08..49f832e67be 100644 --- a/inception/inception-ui-kb/pom.xml +++ b/inception/inception-ui-kb/pom.xml @@ -33,7 +33,10 @@ org.apache.uima uimafit-core - + + de.tudarmstadt.ukp.inception.app + inception-documents-api + de.tudarmstadt.ukp.inception.app inception-ui-core @@ -46,6 +49,10 @@ de.tudarmstadt.ukp.inception.app inception-model + + de.tudarmstadt.ukp.inception.app + inception-model-vdoc + de.tudarmstadt.ukp.inception.app inception-api diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/AnnotatedListIdentifiers.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/AnnotatedListIdentifiers.java index 611445ca3a0..b538f6f067d 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/AnnotatedListIdentifiers.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/AnnotatedListIdentifiers.java @@ -39,10 +39,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; 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.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.kb.KnowledgeBaseService; import de.tudarmstadt.ukp.inception.kb.graph.KBObject; import de.tudarmstadt.ukp.inception.kb.model.KnowledgeBase; diff --git a/inception/inception-ui-project/pom.xml b/inception/inception-ui-project/pom.xml index d2ebe24184c..c0252211407 100644 --- a/inception/inception-ui-project/pom.xml +++ b/inception/inception-ui-project/pom.xml @@ -61,16 +61,20 @@ de.tudarmstadt.ukp.inception.app - inception-api-formats + inception-documents-api de.tudarmstadt.ukp.inception.app - inception-api-render + inception-api-formats de.tudarmstadt.ukp.inception.app inception-api-schema + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api + de.tudarmstadt.ukp.inception.app inception-model @@ -99,6 +103,10 @@ de.tudarmstadt.ukp.inception.app inception-export + + de.tudarmstadt.ukp.inception.app + inception-export-api + de.tudarmstadt.ukp.inception.app inception-api-annotation diff --git a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/casdoctor/ProjectCasDoctorPanel.java b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/casdoctor/ProjectCasDoctorPanel.java index d9e24bc0435..656e7ecc3b3 100644 --- a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/casdoctor/ProjectCasDoctorPanel.java +++ b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/casdoctor/ProjectCasDoctorPanel.java @@ -47,9 +47,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.tudarmstadt.ukp.clarin.webanno.api.CasStorageService; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; import de.tudarmstadt.ukp.clarin.webanno.diag.CasDoctor; import de.tudarmstadt.ukp.clarin.webanno.diag.ChecksRegistry; import de.tudarmstadt.ukp.clarin.webanno.diag.RepairsRegistry; @@ -60,6 +59,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxButton; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; import de.tudarmstadt.ukp.clarin.webanno.ui.core.settings.ProjectSettingsPanelBase; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; public class ProjectCasDoctorPanel extends ProjectSettingsPanelBase diff --git a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/ImportDocumentsPanel.java b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/ImportDocumentsPanel.java index de21efef6aa..1ef395365b6 100644 --- a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/ImportDocumentsPanel.java +++ b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/ImportDocumentsPanel.java @@ -45,7 +45,6 @@ import org.slf4j.LoggerFactory; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.format.FormatSupport; import de.tudarmstadt.ukp.clarin.webanno.diag.CasDoctorException; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -55,6 +54,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogLevel; import de.tudarmstadt.ukp.clarin.webanno.text.TextFormatSupport; import de.tudarmstadt.ukp.clarin.webanno.ui.core.settings.ProjectSettingsPanelBase; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; public class ImportDocumentsPanel diff --git a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/ProjectDocumentsPanel.java b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/ProjectDocumentsPanel.java index fbb5893d4b3..1c6b30a0005 100644 --- a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/ProjectDocumentsPanel.java +++ b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/ProjectDocumentsPanel.java @@ -21,9 +21,9 @@ import org.apache.wicket.spring.injection.annot.SpringBean; import org.wicketstuff.event.annotation.OnEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.ui.core.settings.ProjectSettingsPanelBase; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; /** * A Panel used to add Documents to the selected {@link Project} diff --git a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/SourceDocumentTable.java b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/SourceDocumentTable.java index 241abdcfe67..78809381fd1 100644 --- a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/SourceDocumentTable.java +++ b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/SourceDocumentTable.java @@ -60,7 +60,6 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.CssClassNameAppender; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.format.FormatSupport; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.clarin.webanno.support.bootstrap.BootstrapModalDialog; @@ -73,6 +72,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.wicket.WicketUtil; import de.tudarmstadt.ukp.inception.annotation.filters.SourceDocumentFilterStateChanged; import de.tudarmstadt.ukp.inception.annotation.filters.SourceDocumentStateFilterPanel; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; public class SourceDocumentTable extends Panel diff --git a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/FeatureDetailForm.java b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/FeatureDetailForm.java index b5478f7ab13..bbb473c0d9b 100644 --- a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/FeatureDetailForm.java +++ b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/FeatureDetailForm.java @@ -54,8 +54,7 @@ import org.apache.wicket.model.ResourceModel; import org.apache.wicket.spring.injection.annot.SpringBean; -import de.tudarmstadt.ukp.clarin.webanno.api.CasStorageService; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; import de.tudarmstadt.ukp.clarin.webanno.api.event.LayerConfigurationChangedEvent; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; @@ -66,6 +65,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaButton; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaModelAdapter; import de.tudarmstadt.ukp.clarin.webanno.support.spring.ApplicationEventPublisherHolder; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; diff --git a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/LayerDetailForm.java b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/LayerDetailForm.java index 5018d3d509c..2720b68c009 100644 --- a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/LayerDetailForm.java +++ b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/LayerDetailForm.java @@ -55,8 +55,7 @@ import org.apache.wicket.spring.injection.annot.SpringBean; import org.apache.wicket.util.resource.IResourceStream; -import de.tudarmstadt.ukp.clarin.webanno.api.CasStorageService; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; import de.tudarmstadt.ukp.clarin.webanno.api.event.LayerConfigurationChangedEvent; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -71,6 +70,7 @@ import de.tudarmstadt.ukp.clarin.webanno.ui.project.layers.ProjectLayersPanel.FeatureSelectionForm; 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.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.export.LayerImportExportUtils; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; 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 5329373b81b..532021fca4d 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 @@ -74,6 +74,7 @@ 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; @@ -94,7 +95,6 @@ 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.rendering.config.AnnotationEditorProperties; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; @@ -118,7 +118,7 @@ public class ProjectLayersPanel private @SpringBean FeatureSupportRegistry featureSupportRegistry; private @SpringBean LayerSupportRegistry layerSupportRegistry; private @SpringBean ApplicationEventPublisherHolder applicationEventPublisherHolder; - private @SpringBean AnnotationEditorProperties annotationEditorProperties; + private @SpringBean AnnotationSchemaProperties annotationEditorProperties; private LayerSelectionPane layerSelectionPane; private FeatureSelectionForm featureSelectionForm; diff --git a/inception/inception-ui-search/pom.xml b/inception/inception-ui-search/pom.xml index 1dcf5073392..eeff7b0257f 100644 --- a/inception/inception-ui-search/pom.xml +++ b/inception/inception-ui-search/pom.xml @@ -25,6 +25,10 @@ inception-ui-search INCEpTION - Search - UI + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api + de.tudarmstadt.ukp.inception.app inception-api-annotation @@ -47,7 +51,11 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-model-vdoc + + + de.tudarmstadt.ukp.inception.app + inception-documents-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-ui-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/search/sidebar/SearchAnnotationSidebar.java b/inception/inception-ui-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/search/sidebar/SearchAnnotationSidebar.java index a0366529770..f7b05fb806b 100644 --- a/inception/inception-ui-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/search/sidebar/SearchAnnotationSidebar.java +++ b/inception/inception-ui-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/search/sidebar/SearchAnnotationSidebar.java @@ -17,7 +17,7 @@ */ package de.tudarmstadt.ukp.inception.app.ui.search.sidebar; -import static de.tudarmstadt.ukp.clarin.webanno.api.CasUpgradeMode.AUTO_CAS_UPGRADE; +import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasUpgradeMode.AUTO_CAS_UPGRADE; import static de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaBehavior.enabledWhen; import static de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaBehavior.visibleWhen; import static de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaBehavior.visibleWhenNot; @@ -79,8 +79,7 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator.Size; import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator; import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5IconType; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; @@ -104,6 +103,7 @@ import de.tudarmstadt.ukp.inception.app.ui.search.sidebar.options.CreateAnnotationsOptions; import de.tudarmstadt.ukp.inception.app.ui.search.sidebar.options.DeleteAnnotationsOptions; import de.tudarmstadt.ukp.inception.app.ui.search.sidebar.options.SearchOptions; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; diff --git a/inception/inception-ui-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/search/sidebar/SearchAnnotationSidebarFactory.java b/inception/inception-ui-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/search/sidebar/SearchAnnotationSidebarFactory.java index e05d3eaf88e..6076ef1cdd6 100644 --- a/inception/inception-ui-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/search/sidebar/SearchAnnotationSidebarFactory.java +++ b/inception/inception-ui-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/search/sidebar/SearchAnnotationSidebarFactory.java @@ -22,7 +22,7 @@ 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.CasProvider; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; 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; diff --git a/inception/inception-ui-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/search/sidebar/StatisticsAnnotationSidebar.java b/inception/inception-ui-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/search/sidebar/StatisticsAnnotationSidebar.java index 6fa95fce225..24287a40ff8 100644 --- a/inception/inception-ui-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/search/sidebar/StatisticsAnnotationSidebar.java +++ b/inception/inception-ui-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/search/sidebar/StatisticsAnnotationSidebar.java @@ -48,9 +48,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.preferences.UserPreferencesService; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; @@ -63,6 +62,7 @@ import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.sidebar.AnnotationSidebar_ImplBase; import de.tudarmstadt.ukp.inception.app.ui.search.Formats; import de.tudarmstadt.ukp.inception.app.ui.search.sidebar.options.StatisticsOptions; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; diff --git a/inception/inception-ui-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/search/sidebar/StatisticsAnnotationSidebarFactory.java b/inception/inception-ui-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/search/sidebar/StatisticsAnnotationSidebarFactory.java index c70f1ac31f8..a0be99f7f42 100644 --- a/inception/inception-ui-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/search/sidebar/StatisticsAnnotationSidebarFactory.java +++ b/inception/inception-ui-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/search/sidebar/StatisticsAnnotationSidebarFactory.java @@ -22,7 +22,7 @@ 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.CasProvider; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; 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; diff --git a/inception/inception-versioning/pom.xml b/inception/inception-versioning/pom.xml index 86575ed4021..fdba80fc3f9 100644 --- a/inception/inception-versioning/pom.xml +++ b/inception/inception-versioning/pom.xml @@ -25,6 +25,14 @@ inception-versioning INCEpTION - Versioning + + de.tudarmstadt.ukp.inception.app + inception-documents-api + + + de.tudarmstadt.ukp.inception.app + inception-annotation-storage-api + de.tudarmstadt.ukp.inception.app inception-model 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 0110f8a9175..63888d834a4 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 @@ -46,10 +46,8 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.CasStorageService; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.util.WebAnnoCasUtil; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; +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; @@ -62,6 +60,8 @@ import de.tudarmstadt.ukp.clarin.webanno.support.JSONUtil; import de.tudarmstadt.ukp.inception.annotation.storage.CasStorageSession; import de.tudarmstadt.ukp.inception.curation.service.CurationDocumentService; +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.schema.AnnotationSchemaService; diff --git a/inception/inception-versioning/src/main/java/de/tudarmstadt/ukp/inception/versioning/config/VersioningServiceAutoConfiguration.java b/inception/inception-versioning/src/main/java/de/tudarmstadt/ukp/inception/versioning/config/VersioningServiceAutoConfiguration.java index 837be014904..6dde9884a55 100644 --- a/inception/inception-versioning/src/main/java/de/tudarmstadt/ukp/inception/versioning/config/VersioningServiceAutoConfiguration.java +++ b/inception/inception-versioning/src/main/java/de/tudarmstadt/ukp/inception/versioning/config/VersioningServiceAutoConfiguration.java @@ -24,11 +24,11 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import de.tudarmstadt.ukp.clarin.webanno.api.CasStorageService; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; +import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.inception.curation.service.CurationDocumentService; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.versioning.VersioningService; import de.tudarmstadt.ukp.inception.versioning.VersioningServiceImpl; 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 6f61be8eedb..0780bd96e80 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,9 +50,8 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryAutoConfiguration; +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; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; @@ -64,6 +63,8 @@ import de.tudarmstadt.ukp.inception.annotation.storage.CasStorageSession; import de.tudarmstadt.ukp.inception.annotation.storage.config.CasStorageServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.curation.config.CurationDocumentServiceAutoConfiguration; +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.export.config.DocumentImportExportServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.io.xmi.config.UimaFormatsAutoConfiguration; @@ -71,7 +72,8 @@ import de.tudarmstadt.ukp.inception.versioning.config.VersioningServiceAutoConfiguration; @DataJpaTest( // - excludeAutoConfiguration = LiquibaseAutoConfiguration.class, showSql = false, // + showSql = false, // + excludeAutoConfiguration = LiquibaseAutoConfiguration.class, // properties = { // "spring.main.banner-mode=off", // "repository.path=" + VersioningServiceImplTest.TEST_OUTPUT_FOLDER, // @@ -83,6 +85,7 @@ "de.tudarmstadt.ukp.clarin.webanno.model", "de.tudarmstadt.ukp.clarin.webanno.security.model" }) @Import({ // + AnnotationSchemaAutoConfiguration.class, // AnnotationSchemaServiceAutoConfiguration.class, // ProjectServiceAutoConfiguration.class, // CasStorageServiceAutoConfiguration.class, // diff --git a/inception/inception-websocket/pom.xml b/inception/inception-websocket/pom.xml index ec5e5a125e8..0b85ecec621 100644 --- a/inception/inception-websocket/pom.xml +++ b/inception/inception-websocket/pom.xml @@ -25,6 +25,10 @@ inception-websocket INCEpTION - Websocket + + de.tudarmstadt.ukp.inception.app + inception-documents-api + de.tudarmstadt.ukp.inception.app inception-api 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 6cb0bed7944..4308600669b 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,8 +36,8 @@ import org.springframework.messaging.simp.annotation.SubscribeMapping; import org.springframework.stereotype.Controller; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; 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.websocket.model.LoggedEventMessage; 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 8756d88b731..2b507a21675 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.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -46,6 +45,7 @@ import de.tudarmstadt.ukp.clarin.webanno.security.model.Role; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanCreatedEvent; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.log.EventRepository; import de.tudarmstadt.ukp.inception.log.adapter.EventLoggingAdapterRegistryImpl; import de.tudarmstadt.ukp.inception.log.adapter.SpanEventAdapter; 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 29720f131e8..b311a7dc70b 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,10 +71,7 @@ import org.springframework.web.socket.client.standard.StandardWebSocketClient; import org.springframework.web.socket.messaging.WebSocketStompClient; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryAutoConfiguration; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryProperties; 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; @@ -87,6 +84,9 @@ import de.tudarmstadt.ukp.clarin.webanno.support.ApplicationContextProvider; import de.tudarmstadt.ukp.clarin.webanno.support.logging.Logging; import de.tudarmstadt.ukp.inception.annotation.storage.config.CasStorageServiceAutoConfiguration; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +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.export.config.DocumentImportExportServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.log.adapter.DocumentStateChangedEventAdapter; diff --git a/inception/inception-workload-dynamic/pom.xml b/inception/inception-workload-dynamic/pom.xml index 8fe7405be3a..f6b1190eb6c 100644 --- a/inception/inception-workload-dynamic/pom.xml +++ b/inception/inception-workload-dynamic/pom.xml @@ -25,6 +25,10 @@ inception-workload-dynamic INCEpTION - Workload Management - Dynamic + + de.tudarmstadt.ukp.inception.app + inception-documents-api + de.tudarmstadt.ukp.inception.app inception-ui-core 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 c9bb2625a85..740c462bef8 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,9 +45,7 @@ import org.springframework.security.core.session.SessionRegistry; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; -import de.tudarmstadt.ukp.clarin.webanno.api.SourceDocumentStateStats; 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 +56,8 @@ import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.clarin.webanno.support.JSONUtil; 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.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 00732968651..4b85c951071 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 @@ -42,7 +42,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.DocumentService; 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; @@ -55,6 +54,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.bootstrap.BootstrapModalDialog; 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.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/DynamicWorkflowDocumentNavigationActionBarExtension.java b/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/annotation/DynamicWorkflowDocumentNavigationActionBarExtension.java index 6341daae137..4b4c6e8ae8e 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.DocumentService; 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.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 8d3a1d8f154..dcfb0e86e1f 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.DocumentService; 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.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 9d6571f7f1a..0800ce11bc2 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.DocumentService; 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.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 5f137a43408..22f6a60570c 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 @@ -87,7 +87,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.DocumentService; 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; @@ -111,6 +110,7 @@ import de.tudarmstadt.ukp.clarin.webanno.ui.core.page.ProjectPageBase; 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.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/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 82c3ddd62a6..b180ecf4da1 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,9 +45,8 @@ import org.springframework.util.FileSystemUtils; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryAutoConfiguration; +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; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -60,6 +59,8 @@ import de.tudarmstadt.ukp.clarin.webanno.text.TextFormatSupport; import de.tudarmstadt.ukp.clarin.webanno.text.config.TextFormatsAutoConfiguration; import de.tudarmstadt.ukp.inception.annotation.storage.config.CasStorageServiceAutoConfiguration; +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.scheduling.config.SchedulingServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; @@ -86,6 +87,7 @@ CasStorageServiceAutoConfiguration.class, // RepositoryAutoConfiguration.class, // AnnotationSchemaServiceAutoConfiguration.class, // + AnnotationSchemaAutoConfiguration.class, // SecurityAutoConfiguration.class, // SchedulingServiceAutoConfiguration.class, // WorkloadManagementAutoConfiguration.class, // 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 45ee01f201b..3ee653d4d19 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,9 +48,8 @@ import org.springframework.util.FileSystemUtils; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryAutoConfiguration; +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; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -62,6 +61,8 @@ import de.tudarmstadt.ukp.clarin.webanno.text.TextFormatSupport; import de.tudarmstadt.ukp.clarin.webanno.text.config.TextFormatsAutoConfiguration; import de.tudarmstadt.ukp.inception.annotation.storage.config.CasStorageServiceAutoConfiguration; +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.scheduling.config.SchedulingServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; @@ -88,6 +89,7 @@ ProjectServiceAutoConfiguration.class, // CasStorageServiceAutoConfiguration.class, // RepositoryAutoConfiguration.class, // + AnnotationSchemaAutoConfiguration.class, // AnnotationSchemaServiceAutoConfiguration.class, // SecurityAutoConfiguration.class, // SchedulingServiceAutoConfiguration.class, // diff --git a/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/Fixtures.java b/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/Fixtures.java index bdfc035a428..0aff73b9098 100644 --- a/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/Fixtures.java +++ b/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/Fixtures.java @@ -23,10 +23,10 @@ import org.apache.uima.cas.CAS; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.dkpro.core.api.ner.type.NamedEntity; import de.tudarmstadt.ukp.inception.annotation.storage.CasStorageSession; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; public class Fixtures { diff --git a/inception/inception-workload-matrix/pom.xml b/inception/inception-workload-matrix/pom.xml index 323d3671704..79b7e23fc25 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-documents-api + de.tudarmstadt.ukp.inception.app inception-api-annotation 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 2fbbb4c8756..b09247740be 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,9 +33,7 @@ import org.springframework.core.annotation.Order; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; -import de.tudarmstadt.ukp.clarin.webanno.api.SourceDocumentStateStats; 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 +41,8 @@ import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocumentState; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; 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.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 7ec8867e596..c92df6c61c4 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.DocumentService; 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; @@ -63,6 +62,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.dialog.ChallengeResponseDialog; 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.preferences.PreferencesService; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; 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 0044e3df862..35132619006 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.DocumentService; 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.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 7ba5310cf72..02f9c306e7a 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.DocumentService; 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.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/MatrixWorkloadUpdateDocumentStateTask.java b/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/event/MatrixWorkloadUpdateDocumentStateTask.java index f88bf685a0f..a4c4c8e4bca 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.DocumentService; 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.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 0b1c77ebdbf..27cbe50a658 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.DocumentService; 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; @@ -93,6 +92,7 @@ import de.tudarmstadt.ukp.clarin.webanno.ui.core.menu.ProjectMenuItem; 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.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/test/java/de/tudarmstadt/ukp/inception/workload/matrix/Fixtures.java b/inception/inception-workload-matrix/src/test/java/de/tudarmstadt/ukp/inception/workload/matrix/Fixtures.java index d2718248663..b3c5e5f2ec8 100644 --- a/inception/inception-workload-matrix/src/test/java/de/tudarmstadt/ukp/inception/workload/matrix/Fixtures.java +++ b/inception/inception-workload-matrix/src/test/java/de/tudarmstadt/ukp/inception/workload/matrix/Fixtures.java @@ -23,10 +23,10 @@ import org.apache.uima.cas.CAS; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.dkpro.core.api.ner.type.NamedEntity; import de.tudarmstadt.ukp.inception.annotation.storage.CasStorageSession; +import de.tudarmstadt.ukp.inception.documents.api.DocumentService; public class Fixtures { 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 f92d97fd2f9..22f4c530cf8 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,9 +41,8 @@ import org.springframework.util.FileSystemUtils; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; -import de.tudarmstadt.ukp.clarin.webanno.api.config.RepositoryAutoConfiguration; +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; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; @@ -55,6 +54,8 @@ import de.tudarmstadt.ukp.clarin.webanno.text.TextFormatSupport; import de.tudarmstadt.ukp.clarin.webanno.text.config.TextFormatsAutoConfiguration; import de.tudarmstadt.ukp.inception.annotation.storage.config.CasStorageServiceAutoConfiguration; +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.scheduling.config.SchedulingServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; @@ -80,6 +81,7 @@ CasStorageServiceAutoConfiguration.class, // RepositoryAutoConfiguration.class, // AnnotationSchemaServiceAutoConfiguration.class, // + AnnotationSchemaAutoConfiguration.class, // SecurityAutoConfiguration.class, // SchedulingServiceAutoConfiguration.class, // WorkloadManagementAutoConfiguration.class, // diff --git a/inception/inception-workload/pom.xml b/inception/inception-workload/pom.xml index ebb2e4c315e..bc392090bb6 100644 --- a/inception/inception-workload/pom.xml +++ b/inception/inception-workload/pom.xml @@ -51,6 +51,10 @@ de.tudarmstadt.ukp.inception.app inception-model-export + + de.tudarmstadt.ukp.inception.app + inception-export-api + org.apache.wicket diff --git a/inception/pom.xml b/inception/pom.xml index ccaeb52bf61..232c9d80402 100644 --- a/inception/pom.xml +++ b/inception/pom.xml @@ -154,6 +154,7 @@ inception-support inception-support-standalone inception-model + inception-model-vdoc inception-model-export inception-project inception-project-initializers @@ -172,13 +173,16 @@ inception-api inception-js-api inception-annotation-storage + inception-annotation-storage-api inception-api-annotation inception-api-formats + inception-documents-api inception-documents inception-api-editor inception-api-render inception-api-schema inception-export + inception-export-api inception-diag inception-tutorial inception-testing @@ -234,7 +238,9 @@ inception-concept-linking inception-brat-editor + inception-diam-api inception-diam + inception-diam-compactv2 inception-diam-editor inception-external-editor inception-html-editor