From 28e277573cad6b08e0a90af341105d08b4b80af9 Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Tue, 7 Nov 2023 20:19:55 +0100 Subject: [PATCH 01/53] #4285 - Upgrade dependencies - uima 3.4.1 -> 3.5.0 - jaxb 2.3.8 -> 2.3.9 - stax2-api 4.2.1 -> 4.2.2 - jsonld-java 0.13.4 -> 0.13.6 - junit 5.10.0 -> 5.10.1 - jkunit-platform 1.10.0 -> 1.10.1 - spring-boot 2.7.16 -> 2.7.17 - spring-data 2.7.16 -> 2.7.17 - spring-security 5.8.7 -> 5.8.8 - tomcat 9.0.80 -> 9.0.82 - elasticsearch 7.17.13 -> 7.17.14 - rdf4j 4.3.7 -> 4.3.8 - jackson 2.15.2 -> 2.15.3 --- inception/inception-dependencies/pom.xml | 118 +++++++++-------------- pom.xml | 20 ++-- 2 files changed, 58 insertions(+), 80 deletions(-) diff --git a/inception/inception-dependencies/pom.xml b/inception/inception-dependencies/pom.xml index a8b7b257ca9..cdfda382cb1 100644 --- a/inception/inception-dependencies/pom.xml +++ b/inception/inception-dependencies/pom.xml @@ -32,28 +32,10 @@ org.apache.uima - uimaj-core - ${uima.version} - - - org.apache.uima - uimaj-cpe - ${uima.version} - - - org.apache.uima - uimaj-tools - ${uima.version} - - - org.apache.uima - uimaj-json - ${uima.version} - - - org.apache.uima - uimaj-document-annotation + uimaj-bom ${uima.version} + pom + import org.apache.uima @@ -76,6 +58,49 @@ ${json.version} + + + org.glassfish.jaxb + jaxb-bom + 2.3.9 + pom + import + + + javax.xml.bind + jaxb-api + 2.3.1 + + + com.sun.xml.bind + jaxb-core + 2.3.0.1 + + + javax.activation + javax.activation-api + 1.2.0 + + + jaxen + jaxen + 1.2.0 + + + dom4j + dom4j + + + xom + xom + + + jdom + jdom + + + + org.junit @@ -587,7 +612,7 @@ org.codehaus.woodstox stax2-api - 4.2.1 + 4.2.2 @@ -974,53 +999,6 @@ 1.1.10.5 - - - javax.xml.bind - jaxb-api - 2.3.1 - - - com.sun.xml.bind - jaxb-core - 2.3.0.1 - - - com.sun.xml.bind - jaxb-impl - 2.3.8 - - - org.glassfish.jaxb - jaxb-runtime - 2.3.8 - - - javax.activation - javax.activation-api - 1.2.0 - - - - jaxen - jaxen - 1.2.0 - - - dom4j - dom4j - - - xom - xom - - - jdom - jdom - - - - org.dkpro.core dkpro-core-testing-asl @@ -1081,7 +1059,7 @@ com.github.jsonld-java jsonld-java - 0.13.4 + 0.13.6 org.apache.httpcomponents diff --git a/pom.xml b/pom.xml index 4622fc81d7a..ee1ee78bd75 100644 --- a/pom.xml +++ b/pom.xml @@ -67,8 +67,8 @@ - 5.10.0 - 1.10.0 + 5.10.1 + 1.10.1 5.5.0 3.24.2 2.9.1 @@ -76,16 +76,16 @@ 4.2.0 2.4.0 - 3.4.1 + 3.5.0 3.4.0 0.5.0 2.0.29 5.3.30 - 2.7.16 - 2.7.16 - 5.8.7 + 2.7.17 + 2.7.17 + 5.8.8 1.7.0 2.2.16 0.11.5 @@ -95,7 +95,7 @@ 3.5.3.Final 6.30.0 - 9.0.80 + 9.0.82 4.0.1 2.7.10 @@ -121,7 +121,7 @@ - 7.17.13 + 7.17.14 @@ -130,7 +130,7 @@ - 4.3.7 + 4.3.8 4.6.1 @@ -143,7 +143,7 @@ 20230227 2.6.0 - 2.15.2 + 2.15.3 1.33 4.11.0 3.5.0 From 10d6be2258e7846e73429a7bb5329b906661451f Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Tue, 7 Nov 2023 20:33:38 +0100 Subject: [PATCH 02/53] #4285 - Upgrade dependencies - Remove workaround for https://github.com/apache/uima-uimaj/issues/345 --- .../annotation/layer/span/SpanRenderer.java | 38 ++--------------- .../casdiff/span/SpanDiffAdapter.java | 41 ++----------------- ...ationsStartAndEndWithinSentencesCheck.java | 18 ++------ .../inception/io/bioc/model/CasToBioC.java | 18 ++------ .../io/bioc/xml/Cas2BioCSaxEvents.java | 7 +--- .../pdfeditor2/format/VisualPdfReader.java | 8 +--- .../service/RecommendationServiceImpl.java | 40 ++++++------------ .../detail/AnnotationDetailEditorPanel.java | 11 +---- 8 files changed, 32 insertions(+), 149 deletions(-) diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanRenderer.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanRenderer.java index 0aa9c4dba39..050b2d41c57 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanRenderer.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanRenderer.java @@ -30,7 +30,6 @@ import java.util.Optional; import org.apache.uima.cas.CAS; -import org.apache.uima.cas.FSIterator; import org.apache.uima.cas.FeatureStructure; import org.apache.uima.cas.Type; import org.apache.uima.cas.TypeSystem; @@ -93,40 +92,9 @@ protected boolean typeSystemInit(TypeSystem aTypeSystem) @Override public List selectAnnotationsInWindow(CAS aCas, int aWindowBegin, int aWindowEnd) { - // https://github.com/apache/uima-uimaj/issues/345 - // return aCas.select(type).coveredBy(0, aWindowEnd).includeAnnotationsWithEndBeyondBounds() - // .map(fs -> (AnnotationFS) fs) - // .filter(ann -> AnnotationPredicates.overlapping(ann, aWindowBegin, aWindowEnd)) - // .collect(toList()); - - List list = new ArrayList(); - - // withSnapshotIterators() not needed here since we copy the FSes to a list anyway - FSIterator it = aCas.getAnnotationIndex(type).iterator(); - - // Skip annotations whose start is before the start parameter. - while (it.isValid() && (it.get()).getBegin() < 0) { - it.moveToNext(); - } - - boolean strict = false; - while (it.isValid()) { - AnnotationFS a = it.get(); - // If the start of the current annotation is past the end parameter, we're done. - if (a.getBegin() > aWindowEnd) { - break; - } - it.moveToNext(); - if (strict && a.getEnd() > aWindowEnd) { - continue; - } - - list.add(a); - } - - return list.stream() // - .map(fs -> (AnnotationFS) fs) // - .filter(ann -> AnnotationPredicates.overlapping(ann, aWindowBegin, aWindowEnd)) // + return aCas.select(type).coveredBy(0, aWindowEnd).includeAnnotationsWithEndBeyondBounds() + .map(fs -> (AnnotationFS) fs) + .filter(ann -> AnnotationPredicates.overlapping(ann, aWindowBegin, aWindowEnd)) .collect(toList()); } diff --git a/inception/inception-curation-legacy/src/main/java/de/tudarmstadt/ukp/clarin/webanno/curation/casdiff/span/SpanDiffAdapter.java b/inception/inception-curation-legacy/src/main/java/de/tudarmstadt/ukp/clarin/webanno/curation/casdiff/span/SpanDiffAdapter.java index e17a522228e..4ad640c22bc 100644 --- a/inception/inception-curation-legacy/src/main/java/de/tudarmstadt/ukp/clarin/webanno/curation/casdiff/span/SpanDiffAdapter.java +++ b/inception/inception-curation-legacy/src/main/java/de/tudarmstadt/ukp/clarin/webanno/curation/casdiff/span/SpanDiffAdapter.java @@ -20,17 +20,14 @@ import static java.util.Arrays.asList; import static java.util.stream.Collectors.toList; -import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; import org.apache.uima.cas.CAS; -import org.apache.uima.cas.FSIterator; import org.apache.uima.cas.FeatureStructure; import org.apache.uima.cas.text.AnnotationFS; import org.apache.uima.cas.text.AnnotationPredicates; -import org.apache.uima.fit.util.CasUtil; import org.apache.uima.fit.util.FSUtil; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.util.WebAnnoCasUtil; @@ -74,41 +71,9 @@ public SpanDiffAdapter(String aType, Set aLabelFeatures) @Override public List selectAnnotationsInWindow(CAS aCas, int aWindowBegin, int aWindowEnd) { - // https://github.com/apache/uima-uimaj/issues/345 - // return aCas.select(type).coveredBy(0, aWindowEnd).includeAnnotationsWithEndBeyondBounds() - // .map(fs -> (AnnotationFS) fs) - // .filter(ann -> AnnotationPredicates.overlapping(ann, aWindowBegin, aWindowEnd)) - // .collect(toList()); - - List list = new ArrayList(); - - // withSnapshotIterators() not needed here since we copy the FSes to a list anyway - FSIterator it = aCas.getAnnotationIndex(CasUtil.getType(aCas, getType())) - .iterator(); - - // Skip annotations whose start is before the start parameter. - while (it.isValid() && (it.get()).getBegin() < aWindowBegin) { - it.moveToNext(); - } - - boolean strict = false; - while (it.isValid()) { - AnnotationFS a = it.get(); - // If the start of the current annotation is past the end parameter, we're done. - if (a.getBegin() > aWindowEnd) { - break; - } - it.moveToNext(); - if (strict && a.getEnd() > aWindowEnd) { - continue; - } - - list.add(a); - } - - return list.stream() // - .map(fs -> (AnnotationFS) fs) // - .filter(ann -> AnnotationPredicates.overlapping(ann, aWindowBegin, aWindowEnd)) // + return aCas.select(getType()).coveredBy(0, aWindowEnd) + .includeAnnotationsWithEndBeyondBounds().map(fs -> (AnnotationFS) fs) + .filter(ann -> AnnotationPredicates.overlapping(ann, aWindowBegin, aWindowEnd)) .collect(toList()); } diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/AllAnnotationsStartAndEndWithinSentencesCheck.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/AllAnnotationsStartAndEndWithinSentencesCheck.java index d68d344e0cf..f17ba3e1434 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/AllAnnotationsStartAndEndWithinSentencesCheck.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/AllAnnotationsStartAndEndWithinSentencesCheck.java @@ -27,7 +27,6 @@ import org.apache.uima.cas.CAS; import org.apache.uima.cas.Type; import org.apache.uima.cas.text.AnnotationFS; -import org.apache.uima.fit.util.CasUtil; import org.springframework.util.CollectionUtils; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; @@ -77,19 +76,10 @@ public boolean check(Project aProject, CAS aCas, List aMessages) } for (AnnotationFS ann : select(aCas, type)) { - // https://github.com/apache/uima-uimaj/issues/345 - // var startsOutside = aCas.select(Sentence._TypeName) - // .covering(ann.getBegin(), ann.getBegin()).isEmpty(); - var startsOutside = CasUtil - .selectCovering(ann.getCAS(), CasUtil.getType(ann.getCAS(), Sentence.class), - ann.getBegin(), ann.getBegin()) - .isEmpty(); - // https://github.com/apache/uima-uimaj/issues/345 - // var endsOutside = aCas.select(Sentence._TypeName) - // .covering(ann.getEnd(), ann.getEnd()).isEmpty(); - var endsOutside = CasUtil.selectCovering(ann.getCAS(), - CasUtil.getType(ann.getCAS(), Sentence.class), ann.getEnd(), ann.getEnd()) - .isEmpty(); + var startsOutside = aCas.select(Sentence._TypeName) + .covering(ann.getBegin(), ann.getBegin()).isEmpty(); + var endsOutside = aCas.select(Sentence._TypeName) + .covering(ann.getEnd(), ann.getEnd()).isEmpty(); if (!startsOutside && !endsOutside) { continue; diff --git a/inception/inception-io-bioc/src/main/java/de/tudarmstadt/ukp/inception/io/bioc/model/CasToBioC.java b/inception/inception-io-bioc/src/main/java/de/tudarmstadt/ukp/inception/io/bioc/model/CasToBioC.java index 8e389b28220..d61aa34634c 100644 --- a/inception/inception-io-bioc/src/main/java/de/tudarmstadt/ukp/inception/io/bioc/model/CasToBioC.java +++ b/inception/inception-io-bioc/src/main/java/de/tudarmstadt/ukp/inception/io/bioc/model/CasToBioC.java @@ -40,7 +40,6 @@ import org.apache.uima.cas.text.AnnotationFS; import org.apache.uima.fit.util.FSUtil; -import org.apache.uima.fit.util.JCasUtil; import org.apache.uima.jcas.JCas; import org.apache.uima.jcas.tcas.Annotation; import org.dkpro.core.api.xml.type.XmlElement; @@ -82,12 +81,8 @@ public void convert(JCas aJCas, BioCCollection aCollection) bioCPassage.addInfon(I_TYPE, div.getDivType()); } - // https://github.com/apache/uima-uimaj/issues/345 - // var sentences = aJCas.select(Sentence.class).coveredBy(div).asList(); - var sentences = JCasUtil.selectCovered(Sentence.class, div); - // https://github.com/apache/uima-uimaj/issues/345 - // var annotations = aJCas.select(Annotation.class).coveredBy(div); - var annotations = JCasUtil.selectCovered(Annotation.class, div); + var sentences = aJCas.select(Sentence.class).coveredBy(div).asList(); + var annotations = aJCas.select(Annotation.class).coveredBy(div); if (sentences.isEmpty()) { bioCPassage.setText(div.getCoveredText()); processAnnotations(bioCPassage, bioCPassage.getOffset(), annotations); @@ -96,10 +91,7 @@ public void convert(JCas aJCas, BioCCollection aCollection) var bioCSentences = processSentences(div.getBegin(), sentences); bioCPassage.setSentences(bioCSentences); processAnnotations(bioCPassage, bioCPassage.getOffset(), - annotations.stream().filter(a -> - // https://github.com/apache/uima-uimaj/issues/345 - // aJCas.select(Sentence.class).covering(a).isEmpty() - JCasUtil.selectCovering(Sentence.class, a).isEmpty()) + annotations.filter(a -> aJCas.select(Sentence.class).covering(a).isEmpty()) .collect(Collectors.toList())); } } @@ -136,9 +128,7 @@ private List processSentences(int aPassageOffset, List s bioCSentence.setText(sentence.getCoveredText()); processAnnotations(bioCSentence, sentence.getBegin(), - // https://github.com/apache/uima-uimaj/issues/345 - // sentence.getCAS().select(Annotation.class).coveredBy(sentence) - JCasUtil.selectCovered(Annotation.class, sentence)); + sentence.getCAS().select(Annotation.class).coveredBy(sentence)); bioCSentences.add(bioCSentence); } diff --git a/inception/inception-io-bioc/src/main/java/de/tudarmstadt/ukp/inception/io/bioc/xml/Cas2BioCSaxEvents.java b/inception/inception-io-bioc/src/main/java/de/tudarmstadt/ukp/inception/io/bioc/xml/Cas2BioCSaxEvents.java index d2a7351539c..31854625b8d 100644 --- a/inception/inception-io-bioc/src/main/java/de/tudarmstadt/ukp/inception/io/bioc/xml/Cas2BioCSaxEvents.java +++ b/inception/inception-io-bioc/src/main/java/de/tudarmstadt/ukp/inception/io/bioc/xml/Cas2BioCSaxEvents.java @@ -58,7 +58,6 @@ import org.apache.uima.cas.CAS; import org.apache.uima.cas.text.AnnotationFS; import org.apache.uima.fit.util.FSUtil; -import org.apache.uima.fit.util.JCasUtil; import org.apache.uima.jcas.JCas; import org.apache.uima.jcas.tcas.Annotation; import org.dkpro.core.api.xml.type.XmlElement; @@ -140,10 +139,8 @@ private void processSentenceElement(XmlElement aSentenceElement) throws SAXExcep return; } - // https://github.com/apache/uima-uimaj/issues/345 - // var annotations = aSentenceElement.getCAS().select(Annotation.class) - // .coveredBy(aSentenceElement); - var annotations = JCasUtil.selectCovered(Annotation.class, aSentenceElement); + var annotations = aSentenceElement.getCAS().select(Annotation.class) + .coveredBy(aSentenceElement); for (var annotation : annotations) { serializeAnnotation(sentenceTextElement.get().getBegin(), annotation); } diff --git a/inception/inception-pdf-editor2/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor2/format/VisualPdfReader.java b/inception/inception-pdf-editor2/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor2/format/VisualPdfReader.java index 318683c6fa1..b661be7b457 100644 --- a/inception/inception-pdf-editor2/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor2/format/VisualPdfReader.java +++ b/inception/inception-pdf-editor2/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor2/format/VisualPdfReader.java @@ -27,7 +27,6 @@ import org.apache.uima.cas.CAS; import org.apache.uima.collection.CollectionException; import org.apache.uima.fit.descriptor.ConfigurationParameter; -import org.apache.uima.fit.util.CasUtil; import org.apache.uima.jcas.JCas; import org.apache.uima.jcas.cas.FloatArray; import org.apache.uima.jcas.cas.IntegerArray; @@ -117,11 +116,8 @@ public static VModel visualModelFromCas(CAS cas, List pdfPages) VModel vModel; List vPages = new ArrayList<>(); for (PdfPage pdfPage : pdfPages) { - List vChunks = new ArrayList<>(); - // https://github.com/apache/uima-uimaj/issues/345 - // SelectFSs coveredBy = cas.select(PdfChunk.class).coveredBy(pdfPage); - List coveredBy = (List) CasUtil - .selectCovered(CasUtil.getType(cas, PdfChunk.class), pdfPage); + var vChunks = new ArrayList(); + var coveredBy = cas.select(PdfChunk.class).coveredBy(pdfPage); for (var pdfChunk : coveredBy) { float d = pdfChunk.getD(); List vGlyphs = new ArrayList<>(); 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 7d6ba5421c2..fa7e72568d6 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 @@ -1081,12 +1081,9 @@ private AnnotationFS acceptOrCorrectSuggestion(String aSessionOwner, SourceDocum var aEnd = aSuggestion.getEnd(); var aValue = aSuggestion.getLabel(); - // https://github.com/apache/uima-uimaj/issues/345 - // var candidates = aCas. select(aAdapter.getAnnotationTypeName()) // - // .at(aBegin, aEnd) // - // .asList(); - var candidates = CasUtil.selectAt(aCas, - CasUtil.getType(aCas, aAdapter.getAnnotationTypeName()), aBegin, aEnd); + var candidates = aCas. select(aAdapter.getAnnotationTypeName()) // + .at(aBegin, aEnd) // + .asList(); var candidateWithEmptyLabel = candidates.stream() // .filter(c -> aAdapter.getFeatureValue(aFeature, c) == null) // @@ -2087,15 +2084,9 @@ private static Optional getOffsetsAnchoredOnSingleTokens(CAS aOriginalCa Annotation aPredictedAnnotation) { Type tokenType = getType(aOriginalCas, Token.class); - // https://github.com/apache/uima-uimaj/issues/345 - // var tokens = aOriginalCas. select(tokenType) // - // .coveredBy(aPredictedAnnotation) // - // .limit(2).asList(); - var tokens = CasUtil - .selectCovered(aOriginalCas, tokenType, aPredictedAnnotation.getBegin(), - aPredictedAnnotation.getEnd()) - .stream() // - .limit(2).collect(toList()); + var tokens = aOriginalCas. select(tokenType) // + .coveredBy(aPredictedAnnotation) // + .limit(2).asList(); if (tokens.isEmpty()) { // This can happen if a recommender uses different token boundaries (e.g. if a @@ -2122,13 +2113,9 @@ private static Optional getOffsetsAnchoredOnSingleTokens(CAS aOriginalCa private static Optional getOffsetsAnchoredOnSentences(CAS aOriginalCas, Annotation aPredictedAnnotation) { - // https://github.com/apache/uima-uimaj/issues/345 - // var sentences = aOriginalCas.select(Sentence.class) // - // .coveredBy(aPredictedAnnotation) // - // .asList(); - var sentences = CasUtil.selectCovered(aOriginalCas, - CasUtil.getType(aOriginalCas, Sentence.class), aPredictedAnnotation.getBegin(), - aPredictedAnnotation.getEnd()); + var sentences = aOriginalCas.select(Sentence.class) // + .coveredBy(aPredictedAnnotation) // + .asList(); if (sentences.isEmpty()) { // This can happen if a recommender uses different token boundaries (e.g. if a @@ -2147,12 +2134,9 @@ private static Optional getOffsetsAnchoredOnSentences(CAS aOriginalCas, static Optional getOffsetsAnchoredOnTokens(CAS aOriginalCas, Annotation aPredictedAnnotation) { - // https://github.com/apache/uima-uimaj/issues/345 - // var tokens = aOriginalCas.select(Token.class) // - // .coveredBy(aPredictedAnnotation) // - // .asList(); - var tokens = CasUtil.selectCovered(aOriginalCas, CasUtil.getType(aOriginalCas, Token.class), - aPredictedAnnotation.getBegin(), aPredictedAnnotation.getEnd()); + var tokens = aOriginalCas.select(Token.class) // + .coveredBy(aPredictedAnnotation) // + .asList(); if (tokens.isEmpty()) { if (aPredictedAnnotation.getBegin() == aPredictedAnnotation.getEnd()) { 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 5c6344ed73b..be0a6215088 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 @@ -1235,15 +1235,8 @@ public void onBulkAnnotationEvent(BulkAnnotationEvent aEvent) try { var selection = getModelObject().getSelection(); int id = selection.getAnnotation().getId(); - // https://github.com/apache/uima-uimaj/issues/345 - // boolean annotationStillExists = getEditorCas().select(Annotation.class) // - // .at(selection.getBegin(), selection.getEnd()) // - // .anyMatch(ann -> ann._id() == id); - var cas = getEditorCas(); - boolean annotationStillExists = CasUtil - .selectAt(cas, CasUtil.getType(cas, Annotation.class), selection.getBegin(), - selection.getEnd()) - .stream() // + boolean annotationStillExists = getEditorCas().select(Annotation.class) // + .at(selection.getBegin(), selection.getEnd()) // .anyMatch(ann -> ann._id() == id); if (!annotationStillExists) { From 6499b811dc01f74fda6b803b905a6e99f4f9ca9a Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Tue, 7 Nov 2023 19:45:15 +0100 Subject: [PATCH 03/53] #4229 - Better project template selection - Added more project initializer thumbnails --- .../project/initializers/basic/thumbnail.svg | 676 +++++++-- .../pom.xml | 5 + ...sicDocumentLabelingProjectInitializer.java | 13 + .../initializers/doclabeling/thumbnail.svg | 1282 +++++++++++++++++ .../pom.xml | 5 + .../SentenceLabelingProjectInitializer.java | 12 + .../sentencelabeling/thumbnail.svg | 803 +++++++++++ 7 files changed, 2696 insertions(+), 100 deletions(-) create mode 100644 inception/inception-project-initializers-doclabeling/src/main/resources/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/thumbnail.svg create mode 100644 inception/inception-project-initializers-sentencelabeling/src/main/resources/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/thumbnail.svg diff --git a/inception/inception-project-initializers-basic/src/main/resources/de/tudarmstadt/ukp/inception/project/initializers/basic/thumbnail.svg b/inception/inception-project-initializers-basic/src/main/resources/de/tudarmstadt/ukp/inception/project/initializers/basic/thumbnail.svg index 94d46694cee..8c41ffaa4eb 100644 --- a/inception/inception-project-initializers-basic/src/main/resources/de/tudarmstadt/ukp/inception/project/initializers/basic/thumbnail.svg +++ b/inception/inception-project-initializers-basic/src/main/resources/de/tudarmstadt/ukp/inception/project/initializers/basic/thumbnail.svg @@ -15,7 +15,9 @@ 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. ---> +--> + + - - - - - - - - - - - - I - like - IActor - ActorTarget - TargetINCEpTIONINCEpTION - - - - - + d="m 40.5355,68.296303 c 0,0 3.341511,6.290511 0,0 z" + id="path6" />like diff --git a/inception/inception-project-initializers-doclabeling/pom.xml b/inception/inception-project-initializers-doclabeling/pom.xml index 4cb84ec04fa..cca1fb9e586 100644 --- a/inception/inception-project-initializers-doclabeling/pom.xml +++ b/inception/inception-project-initializers-doclabeling/pom.xml @@ -76,6 +76,11 @@ spring-boot-autoconfigure + + org.apache.wicket + wicket-core + + org.apache.uima diff --git a/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelingProjectInitializer.java b/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelingProjectInitializer.java index 7bb54619f53..8d91f09dfef 100644 --- a/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelingProjectInitializer.java +++ b/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelingProjectInitializer.java @@ -21,9 +21,13 @@ import static java.util.Arrays.asList; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.util.List; import java.util.Optional; +import org.apache.wicket.request.resource.PackageResourceReference; +import org.apache.wicket.request.resource.ResourceReference; + import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.QuickProjectInitializer; @@ -46,6 +50,9 @@ public class BasicDocumentLabelingProjectInitializer implements QuickProjectInitializer { + private static final PackageResourceReference THUMBNAIL = new PackageResourceReference( + MethodHandles.lookup().lookupClass(), "thumbnail.svg"); + private final PreferencesService prefService; private final DocumentMetadataSidebarFactory docMetaSidebar; private final WorkloadManagementService workloadManagementService; @@ -68,6 +75,12 @@ public String getName() return "Document classification"; } + @Override + public Optional getThumbnail() + { + return Optional.of(THUMBNAIL); + } + @Override public boolean alreadyApplied(Project aProject) { diff --git a/inception/inception-project-initializers-doclabeling/src/main/resources/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/thumbnail.svg b/inception/inception-project-initializers-doclabeling/src/main/resources/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/thumbnail.svg new file mode 100644 index 00000000000..72f5a9d1cb6 --- /dev/null +++ b/inception/inception-project-initializers-doclabeling/src/main/resources/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/thumbnail.svg @@ -0,0 +1,1282 @@ + + + + + + diff --git a/inception/inception-project-initializers-sentencelabeling/pom.xml b/inception/inception-project-initializers-sentencelabeling/pom.xml index 3e8b60caf56..86f607c972d 100644 --- a/inception/inception-project-initializers-sentencelabeling/pom.xml +++ b/inception/inception-project-initializers-sentencelabeling/pom.xml @@ -71,6 +71,11 @@ org.springframework.boot spring-boot-autoconfigure + + + org.apache.wicket + wicket-core + diff --git a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelingProjectInitializer.java b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelingProjectInitializer.java index f74e58b0721..b83d5f2d78e 100644 --- a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelingProjectInitializer.java +++ b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelingProjectInitializer.java @@ -21,11 +21,14 @@ import static java.util.Arrays.asList; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.net.URL; import java.util.List; import java.util.Optional; import org.apache.commons.io.IOUtils; +import org.apache.wicket.request.resource.PackageResourceReference; +import org.apache.wicket.request.resource.ResourceReference; import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -42,12 +45,21 @@ public class SentenceLabelingProjectInitializer implements QuickProjectInitializer { + private static final PackageResourceReference THUMBNAIL = new PackageResourceReference( + MethodHandles.lookup().lookupClass(), "thumbnail.svg"); + @Override public String getName() { return "Sentence classification"; } + @Override + public Optional getThumbnail() + { + return Optional.of(THUMBNAIL); + } + @Override public boolean alreadyApplied(Project aProject) { diff --git a/inception/inception-project-initializers-sentencelabeling/src/main/resources/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/thumbnail.svg b/inception/inception-project-initializers-sentencelabeling/src/main/resources/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/thumbnail.svg new file mode 100644 index 00000000000..4524ceb2958 --- /dev/null +++ b/inception/inception-project-initializers-sentencelabeling/src/main/resources/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/thumbnail.svg @@ -0,0 +1,803 @@ + + + + + + From 9d74fa4fe018134df0a511c0d11cd4b43a2f8a16 Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Tue, 7 Nov 2023 20:48:46 +0100 Subject: [PATCH 04/53] Revert "#4285 - Upgrade dependencies" This reverts commit 10d6be2258e7846e73429a7bb5329b906661451f. --- .../annotation/layer/span/SpanRenderer.java | 38 +++++++++++++++-- .../casdiff/span/SpanDiffAdapter.java | 41 +++++++++++++++++-- ...ationsStartAndEndWithinSentencesCheck.java | 18 ++++++-- .../inception/io/bioc/model/CasToBioC.java | 18 ++++++-- .../io/bioc/xml/Cas2BioCSaxEvents.java | 7 +++- .../pdfeditor2/format/VisualPdfReader.java | 8 +++- .../service/RecommendationServiceImpl.java | 40 ++++++++++++------ .../detail/AnnotationDetailEditorPanel.java | 11 ++++- 8 files changed, 149 insertions(+), 32 deletions(-) diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanRenderer.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanRenderer.java index 050b2d41c57..0aa9c4dba39 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanRenderer.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanRenderer.java @@ -30,6 +30,7 @@ import java.util.Optional; import org.apache.uima.cas.CAS; +import org.apache.uima.cas.FSIterator; import org.apache.uima.cas.FeatureStructure; import org.apache.uima.cas.Type; import org.apache.uima.cas.TypeSystem; @@ -92,9 +93,40 @@ protected boolean typeSystemInit(TypeSystem aTypeSystem) @Override public List selectAnnotationsInWindow(CAS aCas, int aWindowBegin, int aWindowEnd) { - return aCas.select(type).coveredBy(0, aWindowEnd).includeAnnotationsWithEndBeyondBounds() - .map(fs -> (AnnotationFS) fs) - .filter(ann -> AnnotationPredicates.overlapping(ann, aWindowBegin, aWindowEnd)) + // https://github.com/apache/uima-uimaj/issues/345 + // return aCas.select(type).coveredBy(0, aWindowEnd).includeAnnotationsWithEndBeyondBounds() + // .map(fs -> (AnnotationFS) fs) + // .filter(ann -> AnnotationPredicates.overlapping(ann, aWindowBegin, aWindowEnd)) + // .collect(toList()); + + List list = new ArrayList(); + + // withSnapshotIterators() not needed here since we copy the FSes to a list anyway + FSIterator it = aCas.getAnnotationIndex(type).iterator(); + + // Skip annotations whose start is before the start parameter. + while (it.isValid() && (it.get()).getBegin() < 0) { + it.moveToNext(); + } + + boolean strict = false; + while (it.isValid()) { + AnnotationFS a = it.get(); + // If the start of the current annotation is past the end parameter, we're done. + if (a.getBegin() > aWindowEnd) { + break; + } + it.moveToNext(); + if (strict && a.getEnd() > aWindowEnd) { + continue; + } + + list.add(a); + } + + return list.stream() // + .map(fs -> (AnnotationFS) fs) // + .filter(ann -> AnnotationPredicates.overlapping(ann, aWindowBegin, aWindowEnd)) // .collect(toList()); } diff --git a/inception/inception-curation-legacy/src/main/java/de/tudarmstadt/ukp/clarin/webanno/curation/casdiff/span/SpanDiffAdapter.java b/inception/inception-curation-legacy/src/main/java/de/tudarmstadt/ukp/clarin/webanno/curation/casdiff/span/SpanDiffAdapter.java index 4ad640c22bc..e17a522228e 100644 --- a/inception/inception-curation-legacy/src/main/java/de/tudarmstadt/ukp/clarin/webanno/curation/casdiff/span/SpanDiffAdapter.java +++ b/inception/inception-curation-legacy/src/main/java/de/tudarmstadt/ukp/clarin/webanno/curation/casdiff/span/SpanDiffAdapter.java @@ -20,14 +20,17 @@ import static java.util.Arrays.asList; import static java.util.stream.Collectors.toList; +import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; import org.apache.uima.cas.CAS; +import org.apache.uima.cas.FSIterator; import org.apache.uima.cas.FeatureStructure; import org.apache.uima.cas.text.AnnotationFS; import org.apache.uima.cas.text.AnnotationPredicates; +import org.apache.uima.fit.util.CasUtil; import org.apache.uima.fit.util.FSUtil; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.util.WebAnnoCasUtil; @@ -71,9 +74,41 @@ public SpanDiffAdapter(String aType, Set aLabelFeatures) @Override public List selectAnnotationsInWindow(CAS aCas, int aWindowBegin, int aWindowEnd) { - return aCas.select(getType()).coveredBy(0, aWindowEnd) - .includeAnnotationsWithEndBeyondBounds().map(fs -> (AnnotationFS) fs) - .filter(ann -> AnnotationPredicates.overlapping(ann, aWindowBegin, aWindowEnd)) + // https://github.com/apache/uima-uimaj/issues/345 + // return aCas.select(type).coveredBy(0, aWindowEnd).includeAnnotationsWithEndBeyondBounds() + // .map(fs -> (AnnotationFS) fs) + // .filter(ann -> AnnotationPredicates.overlapping(ann, aWindowBegin, aWindowEnd)) + // .collect(toList()); + + List list = new ArrayList(); + + // withSnapshotIterators() not needed here since we copy the FSes to a list anyway + FSIterator it = aCas.getAnnotationIndex(CasUtil.getType(aCas, getType())) + .iterator(); + + // Skip annotations whose start is before the start parameter. + while (it.isValid() && (it.get()).getBegin() < aWindowBegin) { + it.moveToNext(); + } + + boolean strict = false; + while (it.isValid()) { + AnnotationFS a = it.get(); + // If the start of the current annotation is past the end parameter, we're done. + if (a.getBegin() > aWindowEnd) { + break; + } + it.moveToNext(); + if (strict && a.getEnd() > aWindowEnd) { + continue; + } + + list.add(a); + } + + return list.stream() // + .map(fs -> (AnnotationFS) fs) // + .filter(ann -> AnnotationPredicates.overlapping(ann, aWindowBegin, aWindowEnd)) // .collect(toList()); } diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/AllAnnotationsStartAndEndWithinSentencesCheck.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/AllAnnotationsStartAndEndWithinSentencesCheck.java index f17ba3e1434..d68d344e0cf 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/AllAnnotationsStartAndEndWithinSentencesCheck.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/AllAnnotationsStartAndEndWithinSentencesCheck.java @@ -27,6 +27,7 @@ import org.apache.uima.cas.CAS; import org.apache.uima.cas.Type; import org.apache.uima.cas.text.AnnotationFS; +import org.apache.uima.fit.util.CasUtil; import org.springframework.util.CollectionUtils; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; @@ -76,10 +77,19 @@ public boolean check(Project aProject, CAS aCas, List aMessages) } for (AnnotationFS ann : select(aCas, type)) { - var startsOutside = aCas.select(Sentence._TypeName) - .covering(ann.getBegin(), ann.getBegin()).isEmpty(); - var endsOutside = aCas.select(Sentence._TypeName) - .covering(ann.getEnd(), ann.getEnd()).isEmpty(); + // https://github.com/apache/uima-uimaj/issues/345 + // var startsOutside = aCas.select(Sentence._TypeName) + // .covering(ann.getBegin(), ann.getBegin()).isEmpty(); + var startsOutside = CasUtil + .selectCovering(ann.getCAS(), CasUtil.getType(ann.getCAS(), Sentence.class), + ann.getBegin(), ann.getBegin()) + .isEmpty(); + // https://github.com/apache/uima-uimaj/issues/345 + // var endsOutside = aCas.select(Sentence._TypeName) + // .covering(ann.getEnd(), ann.getEnd()).isEmpty(); + var endsOutside = CasUtil.selectCovering(ann.getCAS(), + CasUtil.getType(ann.getCAS(), Sentence.class), ann.getEnd(), ann.getEnd()) + .isEmpty(); if (!startsOutside && !endsOutside) { continue; diff --git a/inception/inception-io-bioc/src/main/java/de/tudarmstadt/ukp/inception/io/bioc/model/CasToBioC.java b/inception/inception-io-bioc/src/main/java/de/tudarmstadt/ukp/inception/io/bioc/model/CasToBioC.java index d61aa34634c..8e389b28220 100644 --- a/inception/inception-io-bioc/src/main/java/de/tudarmstadt/ukp/inception/io/bioc/model/CasToBioC.java +++ b/inception/inception-io-bioc/src/main/java/de/tudarmstadt/ukp/inception/io/bioc/model/CasToBioC.java @@ -40,6 +40,7 @@ import org.apache.uima.cas.text.AnnotationFS; import org.apache.uima.fit.util.FSUtil; +import org.apache.uima.fit.util.JCasUtil; import org.apache.uima.jcas.JCas; import org.apache.uima.jcas.tcas.Annotation; import org.dkpro.core.api.xml.type.XmlElement; @@ -81,8 +82,12 @@ public void convert(JCas aJCas, BioCCollection aCollection) bioCPassage.addInfon(I_TYPE, div.getDivType()); } - var sentences = aJCas.select(Sentence.class).coveredBy(div).asList(); - var annotations = aJCas.select(Annotation.class).coveredBy(div); + // https://github.com/apache/uima-uimaj/issues/345 + // var sentences = aJCas.select(Sentence.class).coveredBy(div).asList(); + var sentences = JCasUtil.selectCovered(Sentence.class, div); + // https://github.com/apache/uima-uimaj/issues/345 + // var annotations = aJCas.select(Annotation.class).coveredBy(div); + var annotations = JCasUtil.selectCovered(Annotation.class, div); if (sentences.isEmpty()) { bioCPassage.setText(div.getCoveredText()); processAnnotations(bioCPassage, bioCPassage.getOffset(), annotations); @@ -91,7 +96,10 @@ public void convert(JCas aJCas, BioCCollection aCollection) var bioCSentences = processSentences(div.getBegin(), sentences); bioCPassage.setSentences(bioCSentences); processAnnotations(bioCPassage, bioCPassage.getOffset(), - annotations.filter(a -> aJCas.select(Sentence.class).covering(a).isEmpty()) + annotations.stream().filter(a -> + // https://github.com/apache/uima-uimaj/issues/345 + // aJCas.select(Sentence.class).covering(a).isEmpty() + JCasUtil.selectCovering(Sentence.class, a).isEmpty()) .collect(Collectors.toList())); } } @@ -128,7 +136,9 @@ private List processSentences(int aPassageOffset, List s bioCSentence.setText(sentence.getCoveredText()); processAnnotations(bioCSentence, sentence.getBegin(), - sentence.getCAS().select(Annotation.class).coveredBy(sentence)); + // https://github.com/apache/uima-uimaj/issues/345 + // sentence.getCAS().select(Annotation.class).coveredBy(sentence) + JCasUtil.selectCovered(Annotation.class, sentence)); bioCSentences.add(bioCSentence); } diff --git a/inception/inception-io-bioc/src/main/java/de/tudarmstadt/ukp/inception/io/bioc/xml/Cas2BioCSaxEvents.java b/inception/inception-io-bioc/src/main/java/de/tudarmstadt/ukp/inception/io/bioc/xml/Cas2BioCSaxEvents.java index 31854625b8d..d2a7351539c 100644 --- a/inception/inception-io-bioc/src/main/java/de/tudarmstadt/ukp/inception/io/bioc/xml/Cas2BioCSaxEvents.java +++ b/inception/inception-io-bioc/src/main/java/de/tudarmstadt/ukp/inception/io/bioc/xml/Cas2BioCSaxEvents.java @@ -58,6 +58,7 @@ import org.apache.uima.cas.CAS; import org.apache.uima.cas.text.AnnotationFS; import org.apache.uima.fit.util.FSUtil; +import org.apache.uima.fit.util.JCasUtil; import org.apache.uima.jcas.JCas; import org.apache.uima.jcas.tcas.Annotation; import org.dkpro.core.api.xml.type.XmlElement; @@ -139,8 +140,10 @@ private void processSentenceElement(XmlElement aSentenceElement) throws SAXExcep return; } - var annotations = aSentenceElement.getCAS().select(Annotation.class) - .coveredBy(aSentenceElement); + // https://github.com/apache/uima-uimaj/issues/345 + // var annotations = aSentenceElement.getCAS().select(Annotation.class) + // .coveredBy(aSentenceElement); + var annotations = JCasUtil.selectCovered(Annotation.class, aSentenceElement); for (var annotation : annotations) { serializeAnnotation(sentenceTextElement.get().getBegin(), annotation); } diff --git a/inception/inception-pdf-editor2/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor2/format/VisualPdfReader.java b/inception/inception-pdf-editor2/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor2/format/VisualPdfReader.java index b661be7b457..318683c6fa1 100644 --- a/inception/inception-pdf-editor2/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor2/format/VisualPdfReader.java +++ b/inception/inception-pdf-editor2/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor2/format/VisualPdfReader.java @@ -27,6 +27,7 @@ import org.apache.uima.cas.CAS; import org.apache.uima.collection.CollectionException; import org.apache.uima.fit.descriptor.ConfigurationParameter; +import org.apache.uima.fit.util.CasUtil; import org.apache.uima.jcas.JCas; import org.apache.uima.jcas.cas.FloatArray; import org.apache.uima.jcas.cas.IntegerArray; @@ -116,8 +117,11 @@ public static VModel visualModelFromCas(CAS cas, List pdfPages) VModel vModel; List vPages = new ArrayList<>(); for (PdfPage pdfPage : pdfPages) { - var vChunks = new ArrayList(); - var coveredBy = cas.select(PdfChunk.class).coveredBy(pdfPage); + List vChunks = new ArrayList<>(); + // https://github.com/apache/uima-uimaj/issues/345 + // SelectFSs coveredBy = cas.select(PdfChunk.class).coveredBy(pdfPage); + List coveredBy = (List) CasUtil + .selectCovered(CasUtil.getType(cas, PdfChunk.class), pdfPage); for (var pdfChunk : coveredBy) { float d = pdfChunk.getD(); List vGlyphs = new ArrayList<>(); 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 fa7e72568d6..7d6ba5421c2 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 @@ -1081,9 +1081,12 @@ private AnnotationFS acceptOrCorrectSuggestion(String aSessionOwner, SourceDocum var aEnd = aSuggestion.getEnd(); var aValue = aSuggestion.getLabel(); - var candidates = aCas. select(aAdapter.getAnnotationTypeName()) // - .at(aBegin, aEnd) // - .asList(); + // https://github.com/apache/uima-uimaj/issues/345 + // var candidates = aCas. select(aAdapter.getAnnotationTypeName()) // + // .at(aBegin, aEnd) // + // .asList(); + var candidates = CasUtil.selectAt(aCas, + CasUtil.getType(aCas, aAdapter.getAnnotationTypeName()), aBegin, aEnd); var candidateWithEmptyLabel = candidates.stream() // .filter(c -> aAdapter.getFeatureValue(aFeature, c) == null) // @@ -2084,9 +2087,15 @@ private static Optional getOffsetsAnchoredOnSingleTokens(CAS aOriginalCa Annotation aPredictedAnnotation) { Type tokenType = getType(aOriginalCas, Token.class); - var tokens = aOriginalCas. select(tokenType) // - .coveredBy(aPredictedAnnotation) // - .limit(2).asList(); + // https://github.com/apache/uima-uimaj/issues/345 + // var tokens = aOriginalCas. select(tokenType) // + // .coveredBy(aPredictedAnnotation) // + // .limit(2).asList(); + var tokens = CasUtil + .selectCovered(aOriginalCas, tokenType, aPredictedAnnotation.getBegin(), + aPredictedAnnotation.getEnd()) + .stream() // + .limit(2).collect(toList()); if (tokens.isEmpty()) { // This can happen if a recommender uses different token boundaries (e.g. if a @@ -2113,9 +2122,13 @@ private static Optional getOffsetsAnchoredOnSingleTokens(CAS aOriginalCa private static Optional getOffsetsAnchoredOnSentences(CAS aOriginalCas, Annotation aPredictedAnnotation) { - var sentences = aOriginalCas.select(Sentence.class) // - .coveredBy(aPredictedAnnotation) // - .asList(); + // https://github.com/apache/uima-uimaj/issues/345 + // var sentences = aOriginalCas.select(Sentence.class) // + // .coveredBy(aPredictedAnnotation) // + // .asList(); + var sentences = CasUtil.selectCovered(aOriginalCas, + CasUtil.getType(aOriginalCas, Sentence.class), aPredictedAnnotation.getBegin(), + aPredictedAnnotation.getEnd()); if (sentences.isEmpty()) { // This can happen if a recommender uses different token boundaries (e.g. if a @@ -2134,9 +2147,12 @@ private static Optional getOffsetsAnchoredOnSentences(CAS aOriginalCas, static Optional getOffsetsAnchoredOnTokens(CAS aOriginalCas, Annotation aPredictedAnnotation) { - var tokens = aOriginalCas.select(Token.class) // - .coveredBy(aPredictedAnnotation) // - .asList(); + // https://github.com/apache/uima-uimaj/issues/345 + // var tokens = aOriginalCas.select(Token.class) // + // .coveredBy(aPredictedAnnotation) // + // .asList(); + var tokens = CasUtil.selectCovered(aOriginalCas, CasUtil.getType(aOriginalCas, Token.class), + aPredictedAnnotation.getBegin(), aPredictedAnnotation.getEnd()); if (tokens.isEmpty()) { if (aPredictedAnnotation.getBegin() == aPredictedAnnotation.getEnd()) { 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 be0a6215088..5c6344ed73b 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 @@ -1235,8 +1235,15 @@ public void onBulkAnnotationEvent(BulkAnnotationEvent aEvent) try { var selection = getModelObject().getSelection(); int id = selection.getAnnotation().getId(); - boolean annotationStillExists = getEditorCas().select(Annotation.class) // - .at(selection.getBegin(), selection.getEnd()) // + // https://github.com/apache/uima-uimaj/issues/345 + // boolean annotationStillExists = getEditorCas().select(Annotation.class) // + // .at(selection.getBegin(), selection.getEnd()) // + // .anyMatch(ann -> ann._id() == id); + var cas = getEditorCas(); + boolean annotationStillExists = CasUtil + .selectAt(cas, CasUtil.getType(cas, Annotation.class), selection.getBegin(), + selection.getEnd()) + .stream() // .anyMatch(ann -> ann._id() == id); if (!annotationStillExists) { From 565fe5f4b1d04770daa6da0b55056cfcaaa49b2a Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Tue, 7 Nov 2023 20:52:51 +0100 Subject: [PATCH 05/53] #4285 - Upgrade dependencies - UIMA Java SDK 3.5.0 -> 3.4.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ee1ee78bd75..e5aefbd69d1 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ 4.2.0 2.4.0 - 3.5.0 + 3.4.1 3.4.0 0.5.0 From 03ef3d49d1197bfe5cd2d2a1a1f4e6397a108e7f Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Tue, 7 Nov 2023 20:59:25 +0100 Subject: [PATCH 06/53] #4285 - Upgrade dependencies - UIMA Java SDK 3.5.0 -> 3.4.1 --- inception/inception-dependencies/pom.xml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/inception/inception-dependencies/pom.xml b/inception/inception-dependencies/pom.xml index cdfda382cb1..41d6607b13e 100644 --- a/inception/inception-dependencies/pom.xml +++ b/inception/inception-dependencies/pom.xml @@ -32,10 +32,28 @@ org.apache.uima - uimaj-bom + uimaj-core + ${uima.version} + + + org.apache.uima + uimaj-cpe + ${uima.version} + + + org.apache.uima + uimaj-tools + ${uima.version} + + + org.apache.uima + uimaj-json + ${uima.version} + + + org.apache.uima + uimaj-document-annotation ${uima.version} - pom - import org.apache.uima From 8eb0af3516f12540821246f6efb418a7586c1d20 Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Tue, 7 Nov 2023 22:11:31 +0100 Subject: [PATCH 07/53] [maven-release-plugin] prepare release inception-30.0-beta-1 --- inception/inception-active-learning/pom.xml | 2 +- inception/inception-agreement/pom.xml | 2 +- .../inception-annotation-storage-api/pom.xml | 2 +- .../inception-annotation-storage/pom.xml | 2 +- inception/inception-api-annotation/pom.xml | 2 +- inception/inception-api-editor/pom.xml | 2 +- inception/inception-api-formats/pom.xml | 2 +- inception/inception-api-render/pom.xml | 2 +- inception/inception-api-schema/pom.xml | 2 +- inception/inception-api/pom.xml | 2 +- inception/inception-app-webapp/pom.xml | 2 +- inception/inception-bom/pom.xml | 234 +++++++++--------- inception/inception-boot-loader/pom.xml | 2 +- inception/inception-bootstrap/pom.xml | 2 +- inception/inception-brat-editor/pom.xml | 2 +- inception/inception-build/pom.xml | 2 +- inception/inception-concept-linking/pom.xml | 2 +- inception/inception-constraints/pom.xml | 2 +- inception/inception-curation-legacy/pom.xml | 2 +- inception/inception-curation/pom.xml | 2 +- inception/inception-dependencies/pom.xml | 2 +- inception/inception-diag/pom.xml | 2 +- inception/inception-diam-api/pom.xml | 2 +- inception/inception-diam-compactv2/pom.xml | 2 +- inception/inception-diam-editor/pom.xml | 2 +- inception/inception-diam/pom.xml | 2 +- inception/inception-doc/pom.xml | 2 +- inception/inception-docker/pom.xml | 2 +- inception/inception-documents-api/pom.xml | 2 +- inception/inception-documents/pom.xml | 2 +- .../pom.xml | 2 +- inception/inception-export-api/pom.xml | 2 +- inception/inception-export/pom.xml | 6 +- inception/inception-external-editor/pom.xml | 2 +- .../inception-external-search-core/pom.xml | 2 +- .../inception-external-search-elastic/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../inception-external-search-pubmed/pom.xml | 2 +- .../inception-external-search-solr/pom.xml | 2 +- inception/inception-feature-lookup/pom.xml | 2 +- inception/inception-guidelines/pom.xml | 2 +- .../pom.xml | 2 +- inception/inception-html-editor/pom.xml | 2 +- .../inception-html-recogito-editor/pom.xml | 2 +- inception/inception-image/pom.xml | 2 +- inception/inception-imls-elg/pom.xml | 2 +- inception/inception-imls-external/pom.xml | 2 +- inception/inception-imls-hf/pom.xml | 2 +- inception/inception-imls-lapps/pom.xml | 2 +- inception/inception-imls-opennlp/pom.xml | 2 +- inception/inception-imls-stringmatch/pom.xml | 2 +- inception/inception-imls-weblicht/pom.xml | 2 +- inception/inception-io-bioc/pom.xml | 2 +- inception/inception-io-conll/pom.xml | 2 +- inception/inception-io-html/pom.xml | 2 +- inception/inception-io-imscwb/pom.xml | 2 +- inception/inception-io-intertext/pom.xml | 2 +- inception/inception-io-json/pom.xml | 2 +- inception/inception-io-lif/pom.xml | 2 +- inception/inception-io-nif/pom.xml | 2 +- inception/inception-io-perseus/pom.xml | 2 +- inception/inception-io-tcf/pom.xml | 2 +- inception/inception-io-tei/pom.xml | 2 +- inception/inception-io-text/pom.xml | 2 +- inception/inception-io-webanno-tsv/pom.xml | 2 +- inception/inception-io-xmi/pom.xml | 2 +- inception/inception-io-xml/pom.xml | 2 +- inception/inception-js-api/pom.xml | 2 +- inception/inception-kb-fact-linking/pom.xml | 2 +- inception/inception-kb/pom.xml | 2 +- inception/inception-layer-docmetadata/pom.xml | 2 +- inception/inception-log/pom.xml | 2 +- inception/inception-model-export/pom.xml | 2 +- inception/inception-model-vdoc/pom.xml | 2 +- inception/inception-model/pom.xml | 2 +- inception/inception-pdf-editor/pom.xml | 2 +- inception/inception-pdf-editor2/pom.xml | 2 +- inception/inception-plugin-api/pom.xml | 2 +- inception/inception-plugin-manager/pom.xml | 2 +- inception/inception-plugin-parent/pom.xml | 2 +- inception/inception-preferences/pom.xml | 2 +- inception/inception-project-export/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../inception-project-initializers-ud/pom.xml | 2 +- .../pom.xml | 2 +- .../inception-project-initializers/pom.xml | 2 +- inception/inception-project/pom.xml | 2 +- .../inception-recommendation-api/pom.xml | 2 +- inception/inception-recommendation/pom.xml | 2 +- inception/inception-remote/pom.xml | 2 +- inception/inception-review-editor/pom.xml | 2 +- inception/inception-scheduling/pom.xml | 2 +- inception/inception-schema/pom.xml | 2 +- inception/inception-search-core/pom.xml | 2 +- inception/inception-search-mtas/pom.xml | 2 +- inception/inception-security/pom.xml | 2 +- inception/inception-sharing/pom.xml | 2 +- .../inception-support-standalone/pom.xml | 2 +- inception/inception-support/pom.xml | 2 +- inception/inception-telemetry/pom.xml | 2 +- inception/inception-test-dependencies/pom.xml | 2 +- inception/inception-testing/pom.xml | 2 +- inception/inception-tutorial/pom.xml | 2 +- inception/inception-ui-agreement/pom.xml | 2 +- inception/inception-ui-annotation/pom.xml | 2 +- inception/inception-ui-core/pom.xml | 2 +- inception/inception-ui-curation/pom.xml | 6 +- .../inception-ui-dashboard-activity/pom.xml | 2 +- inception/inception-ui-dashboard/pom.xml | 2 +- .../inception-ui-external-search/pom.xml | 2 +- inception/inception-ui-kb/pom.xml | 2 +- inception/inception-ui-project/pom.xml | 2 +- inception/inception-ui-scheduling/pom.xml | 2 +- inception/inception-ui-search/pom.xml | 2 +- inception/inception-ui-tagsets/pom.xml | 2 +- inception/inception-versioning/pom.xml | 2 +- inception/inception-websocket/pom.xml | 2 +- inception/inception-workload-dynamic/pom.xml | 2 +- inception/inception-workload-matrix/pom.xml | 2 +- inception/inception-workload-ui/pom.xml | 2 +- inception/inception-workload/pom.xml | 2 +- inception/pom.xml | 6 +- pom.xml | 4 +- 126 files changed, 247 insertions(+), 251 deletions(-) diff --git a/inception/inception-active-learning/pom.xml b/inception/inception-active-learning/pom.xml index 315e1f981b5..df9c7bada1f 100644 --- a/inception/inception-active-learning/pom.xml +++ b/inception/inception-active-learning/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 .. inception-active-learning diff --git a/inception/inception-agreement/pom.xml b/inception/inception-agreement/pom.xml index 3ef054f2a7e..cc66993608b 100644 --- a/inception/inception-agreement/pom.xml +++ b/inception/inception-agreement/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-agreement INCEpTION - Core - Agreement diff --git a/inception/inception-annotation-storage-api/pom.xml b/inception/inception-annotation-storage-api/pom.xml index df22ae9fa90..d7fa44b9caa 100644 --- a/inception/inception-annotation-storage-api/pom.xml +++ b/inception/inception-annotation-storage-api/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-annotation-storage-api INCEpTION - Core - Annotation Storage - API diff --git a/inception/inception-annotation-storage/pom.xml b/inception/inception-annotation-storage/pom.xml index d715f3f16bb..c620920d010 100644 --- a/inception/inception-annotation-storage/pom.xml +++ b/inception/inception-annotation-storage/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-annotation-storage INCEpTION - Core - Annotation Storage diff --git a/inception/inception-api-annotation/pom.xml b/inception/inception-api-annotation/pom.xml index 8e120e7ec79..043270c5b51 100644 --- a/inception/inception-api-annotation/pom.xml +++ b/inception/inception-api-annotation/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-api-annotation INCEpTION - Core - Annotation API diff --git a/inception/inception-api-editor/pom.xml b/inception/inception-api-editor/pom.xml index fc88931bfbd..eafd5051b75 100644 --- a/inception/inception-api-editor/pom.xml +++ b/inception/inception-api-editor/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-api-editor INCEpTION - Core - Annotation editor API diff --git a/inception/inception-api-formats/pom.xml b/inception/inception-api-formats/pom.xml index 7541d249a17..a2934d827cd 100644 --- a/inception/inception-api-formats/pom.xml +++ b/inception/inception-api-formats/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-api-formats INCEpTION - Core - Formats API diff --git a/inception/inception-api-render/pom.xml b/inception/inception-api-render/pom.xml index 2fe2dd6788b..56445eeec76 100644 --- a/inception/inception-api-render/pom.xml +++ b/inception/inception-api-render/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-api-render INCEpTION - Core - Annotation rendering API diff --git a/inception/inception-api-schema/pom.xml b/inception/inception-api-schema/pom.xml index 76428916938..850dc49fd67 100644 --- a/inception/inception-api-schema/pom.xml +++ b/inception/inception-api-schema/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-api-schema INCEpTION - Core - Annotation Schema API diff --git a/inception/inception-api/pom.xml b/inception/inception-api/pom.xml index 35c5f8b7d66..9995ddee096 100644 --- a/inception/inception-api/pom.xml +++ b/inception/inception-api/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-api INCEpTION - Core - API diff --git a/inception/inception-app-webapp/pom.xml b/inception/inception-app-webapp/pom.xml index 4e93d9b8a88..ed7ee6afb89 100644 --- a/inception/inception-app-webapp/pom.xml +++ b/inception/inception-app-webapp/pom.xml @@ -21,7 +21,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 .. diff --git a/inception/inception-bom/pom.xml b/inception/inception-bom/pom.xml index 2b14187ef0b..346777f8a69 100644 --- a/inception/inception-bom/pom.xml +++ b/inception/inception-bom/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception - 30.0-SNAPSHOT + 30.0-beta-1 ../.. @@ -33,222 +33,222 @@ de.tudarmstadt.ukp.inception.app inception-doc - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-agreement - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-ui-agreement - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-ui-annotation - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-ui-project - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-ui-tagsets - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-curation - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-ui-curation - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-ui-search - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-workload - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-workload-dynamic - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-workload-matrix - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-workload-ui - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-external-editor - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-external-search-core - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-external-search-pubannotation - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-external-search-pubmed - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-external-search-elastic - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-external-search-opensearch - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-external-search-solr - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-ui-external-search - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-ui-dashboard - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-ui-dashboard-activity - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-kb - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-kb-fact-linking - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-html-apache-annotator-editor - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-html-editor - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-html-recogito-editor - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-pdf-editor - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-pdf-editor2 - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-recommendation - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-recommendation-api - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-review-editor - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-sharing - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-preferences - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-guidelines - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-schema - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-active-learning - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-ui-core - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-ui-kb - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-concept-linking - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-imls-opennlp - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-imls-elg - 30.0-SNAPSHOT + 30.0-beta-1 de.tudarmstadt.ukp.inception.app inception-imls-hf - 30.0-SNAPSHOT + 30.0-beta-1 - + 4.0.0 de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-export INCEpTION - Core - Export diff --git a/inception/inception-external-editor/pom.xml b/inception/inception-external-editor/pom.xml index 87d24fb4296..910a7618476 100644 --- a/inception/inception-external-editor/pom.xml +++ b/inception/inception-external-editor/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-external-editor INCEpTION - Editor - External editor diff --git a/inception/inception-external-search-core/pom.xml b/inception/inception-external-search-core/pom.xml index 64f0336c607..d68d7ab75e8 100644 --- a/inception/inception-external-search-core/pom.xml +++ b/inception/inception-external-search-core/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-external-search-core INCEpTION - External Search - Core diff --git a/inception/inception-external-search-elastic/pom.xml b/inception/inception-external-search-elastic/pom.xml index 6d9f52e5cf4..9081a12a715 100644 --- a/inception/inception-external-search-elastic/pom.xml +++ b/inception/inception-external-search-elastic/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-external-search-elastic INCEpTION - External Search - Elastic Search diff --git a/inception/inception-external-search-opensearch/pom.xml b/inception/inception-external-search-opensearch/pom.xml index 5ee821ce461..912e912afa4 100644 --- a/inception/inception-external-search-opensearch/pom.xml +++ b/inception/inception-external-search-opensearch/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-external-search-opensearch INCEpTION - External Search - OpenSearch diff --git a/inception/inception-external-search-pubannotation/pom.xml b/inception/inception-external-search-pubannotation/pom.xml index e113a9826ce..0b9f66df795 100644 --- a/inception/inception-external-search-pubannotation/pom.xml +++ b/inception/inception-external-search-pubannotation/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-external-search-pubannotation INCEpTION - External Search - PubAnnotation diff --git a/inception/inception-external-search-pubmed/pom.xml b/inception/inception-external-search-pubmed/pom.xml index 721523a7591..e2ec0161f7b 100644 --- a/inception/inception-external-search-pubmed/pom.xml +++ b/inception/inception-external-search-pubmed/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-external-search-pubmed INCEpTION - External Search - PubMed diff --git a/inception/inception-external-search-solr/pom.xml b/inception/inception-external-search-solr/pom.xml index eb3020cabe7..29fcc476f26 100644 --- a/inception/inception-external-search-solr/pom.xml +++ b/inception/inception-external-search-solr/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-external-search-solr INCEpTION - External Search - Solr diff --git a/inception/inception-feature-lookup/pom.xml b/inception/inception-feature-lookup/pom.xml index 4455506ff25..df59ba36e36 100644 --- a/inception/inception-feature-lookup/pom.xml +++ b/inception/inception-feature-lookup/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-feature-lookup INCEpTION - Lookup Feature Support diff --git a/inception/inception-guidelines/pom.xml b/inception/inception-guidelines/pom.xml index 926fffe0013..a441ebf38b8 100644 --- a/inception/inception-guidelines/pom.xml +++ b/inception/inception-guidelines/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-guidelines INCEpTION - Core - Annotation Guidelines diff --git a/inception/inception-html-apache-annotator-editor/pom.xml b/inception/inception-html-apache-annotator-editor/pom.xml index f68994f4dec..1bb44e01b71 100644 --- a/inception/inception-html-apache-annotator-editor/pom.xml +++ b/inception/inception-html-apache-annotator-editor/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-html-apache-annotator-editor INCEpTION - Editor - HTML + Apache Annotator (v${apache-annotator.version}) diff --git a/inception/inception-html-editor/pom.xml b/inception/inception-html-editor/pom.xml index 4d00dfff1f9..be0eb010770 100644 --- a/inception/inception-html-editor/pom.xml +++ b/inception/inception-html-editor/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-html-editor INCEpTION - Editor - HTML + Annotator JS (deprecated) diff --git a/inception/inception-html-recogito-editor/pom.xml b/inception/inception-html-recogito-editor/pom.xml index 692cb9feddf..50b00efc688 100644 --- a/inception/inception-html-recogito-editor/pom.xml +++ b/inception/inception-html-recogito-editor/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-html-recogito-editor INCEpTION - Editor - HTML + Recogito JS (${recogitojs.version}) diff --git a/inception/inception-image/pom.xml b/inception/inception-image/pom.xml index c18de615d0a..e6d435fd95b 100644 --- a/inception/inception-image/pom.xml +++ b/inception/inception-image/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-image INCEpTION - Image Support diff --git a/inception/inception-imls-elg/pom.xml b/inception/inception-imls-elg/pom.xml index 457b0e48dbf..eb61743fce8 100644 --- a/inception/inception-imls-elg/pom.xml +++ b/inception/inception-imls-elg/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-imls-elg diff --git a/inception/inception-imls-external/pom.xml b/inception/inception-imls-external/pom.xml index 576ffbe5464..65d4f081f94 100644 --- a/inception/inception-imls-external/pom.xml +++ b/inception/inception-imls-external/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-imls-external diff --git a/inception/inception-imls-hf/pom.xml b/inception/inception-imls-hf/pom.xml index df936e293cf..8b14429762c 100644 --- a/inception/inception-imls-hf/pom.xml +++ b/inception/inception-imls-hf/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-imls-hf diff --git a/inception/inception-imls-lapps/pom.xml b/inception/inception-imls-lapps/pom.xml index f9f8b456e59..0e121206356 100644 --- a/inception/inception-imls-lapps/pom.xml +++ b/inception/inception-imls-lapps/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-imls-lapps diff --git a/inception/inception-imls-opennlp/pom.xml b/inception/inception-imls-opennlp/pom.xml index 642ebcea6e2..31e1ff4e36f 100644 --- a/inception/inception-imls-opennlp/pom.xml +++ b/inception/inception-imls-opennlp/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-imls-opennlp INCEpTION - ML - OpenNLP (v ${opennlp.version}) diff --git a/inception/inception-imls-stringmatch/pom.xml b/inception/inception-imls-stringmatch/pom.xml index 8a928ba8bc9..e8f14adb20c 100644 --- a/inception/inception-imls-stringmatch/pom.xml +++ b/inception/inception-imls-stringmatch/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-imls-stringmatch INCEpTION - ML - String Matching diff --git a/inception/inception-imls-weblicht/pom.xml b/inception/inception-imls-weblicht/pom.xml index 92f558ad2f0..e691d7b333e 100644 --- a/inception/inception-imls-weblicht/pom.xml +++ b/inception/inception-imls-weblicht/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-imls-weblicht diff --git a/inception/inception-io-bioc/pom.xml b/inception/inception-io-bioc/pom.xml index e4165e70aed..6c1e8c064cf 100644 --- a/inception/inception-io-bioc/pom.xml +++ b/inception/inception-io-bioc/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-io-bioc INCEpTION - IO - BioC diff --git a/inception/inception-io-conll/pom.xml b/inception/inception-io-conll/pom.xml index 98f3171b05e..57c1573e6be 100644 --- a/inception/inception-io-conll/pom.xml +++ b/inception/inception-io-conll/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-io-conll INCEpTION - IO - CONLL diff --git a/inception/inception-io-html/pom.xml b/inception/inception-io-html/pom.xml index 0ec22e6541a..be95f07f225 100644 --- a/inception/inception-io-html/pom.xml +++ b/inception/inception-io-html/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-io-html INCEpTION - IO - HTML diff --git a/inception/inception-io-imscwb/pom.xml b/inception/inception-io-imscwb/pom.xml index dea6b909d12..4a401f967e5 100644 --- a/inception/inception-io-imscwb/pom.xml +++ b/inception/inception-io-imscwb/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-io-imscwb INCEpTION - IO - IMS CWB diff --git a/inception/inception-io-intertext/pom.xml b/inception/inception-io-intertext/pom.xml index 54504d3a66e..db2e47315ed 100644 --- a/inception/inception-io-intertext/pom.xml +++ b/inception/inception-io-intertext/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-io-intertext INCEpTION - IO - InterText diff --git a/inception/inception-io-json/pom.xml b/inception/inception-io-json/pom.xml index f55da186c95..6579f8ac27e 100644 --- a/inception/inception-io-json/pom.xml +++ b/inception/inception-io-json/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-io-json INCEpTION - IO - JSON diff --git a/inception/inception-io-lif/pom.xml b/inception/inception-io-lif/pom.xml index fa91ae17127..d65452e372f 100644 --- a/inception/inception-io-lif/pom.xml +++ b/inception/inception-io-lif/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-io-lif INCEpTION - IO - LIF (deprecated) diff --git a/inception/inception-io-nif/pom.xml b/inception/inception-io-nif/pom.xml index 89084e1ef76..8304583ccc5 100644 --- a/inception/inception-io-nif/pom.xml +++ b/inception/inception-io-nif/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-io-nif INCEpTION - IO - NIF diff --git a/inception/inception-io-perseus/pom.xml b/inception/inception-io-perseus/pom.xml index 98d1026e877..41f972bfbc8 100644 --- a/inception/inception-io-perseus/pom.xml +++ b/inception/inception-io-perseus/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-io-perseus INCEpTION - IO - Perseus diff --git a/inception/inception-io-tcf/pom.xml b/inception/inception-io-tcf/pom.xml index 4b5ed97a1b3..f916e7687fd 100644 --- a/inception/inception-io-tcf/pom.xml +++ b/inception/inception-io-tcf/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-io-tcf INCEpTION - IO - TCF diff --git a/inception/inception-io-tei/pom.xml b/inception/inception-io-tei/pom.xml index f961f3d4687..0c2a0d9c920 100644 --- a/inception/inception-io-tei/pom.xml +++ b/inception/inception-io-tei/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-io-tei INCEpTION - IO - TEI diff --git a/inception/inception-io-text/pom.xml b/inception/inception-io-text/pom.xml index eb1e90f1bc0..43d3d64a00f 100644 --- a/inception/inception-io-text/pom.xml +++ b/inception/inception-io-text/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-io-text INCEpTION - IO - Text diff --git a/inception/inception-io-webanno-tsv/pom.xml b/inception/inception-io-webanno-tsv/pom.xml index 8002f7cf005..e91ee652695 100644 --- a/inception/inception-io-webanno-tsv/pom.xml +++ b/inception/inception-io-webanno-tsv/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-io-webanno-tsv INCEpTION - IO - TSV diff --git a/inception/inception-io-xmi/pom.xml b/inception/inception-io-xmi/pom.xml index 7bb6b5bf29a..888acc6b00b 100644 --- a/inception/inception-io-xmi/pom.xml +++ b/inception/inception-io-xmi/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-io-xmi INCEpTION - IO - XMI diff --git a/inception/inception-io-xml/pom.xml b/inception/inception-io-xml/pom.xml index afb306a7580..7818ae9047f 100644 --- a/inception/inception-io-xml/pom.xml +++ b/inception/inception-io-xml/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-io-xml INCEpTION - IO - XML diff --git a/inception/inception-js-api/pom.xml b/inception/inception-js-api/pom.xml index 10aac7d37ca..674c289804f 100644 --- a/inception/inception-js-api/pom.xml +++ b/inception/inception-js-api/pom.xml @@ -20,7 +20,7 @@ inception-app de.tudarmstadt.ukp.inception.app - 30.0-SNAPSHOT + 30.0-beta-1 4.0.0 inception-js-api diff --git a/inception/inception-kb-fact-linking/pom.xml b/inception/inception-kb-fact-linking/pom.xml index b57abd83ae7..c31b8df2c18 100644 --- a/inception/inception-kb-fact-linking/pom.xml +++ b/inception/inception-kb-fact-linking/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-kb-fact-linking INCEpTION - Knowledge Base - Fact Linking (deprecated) diff --git a/inception/inception-kb/pom.xml b/inception/inception-kb/pom.xml index dfe85a34818..9c4e2302e44 100644 --- a/inception/inception-kb/pom.xml +++ b/inception/inception-kb/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-kb INCEpTION - Knowledge Base - Core diff --git a/inception/inception-layer-docmetadata/pom.xml b/inception/inception-layer-docmetadata/pom.xml index 721865fccae..01a2e4084fb 100644 --- a/inception/inception-layer-docmetadata/pom.xml +++ b/inception/inception-layer-docmetadata/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-layer-docmetadata INCEpTION - Document Metadata Support diff --git a/inception/inception-log/pom.xml b/inception/inception-log/pom.xml index 360911778b5..f1a4c8c55f3 100644 --- a/inception/inception-log/pom.xml +++ b/inception/inception-log/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-log INCEpTION - Log diff --git a/inception/inception-model-export/pom.xml b/inception/inception-model-export/pom.xml index 001f634385d..c71d1643fe4 100644 --- a/inception/inception-model-export/pom.xml +++ b/inception/inception-model-export/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-model-export INCEpTION - Core - Export Model diff --git a/inception/inception-model-vdoc/pom.xml b/inception/inception-model-vdoc/pom.xml index 2e2f1336145..eab37e32a1f 100644 --- a/inception/inception-model-vdoc/pom.xml +++ b/inception/inception-model-vdoc/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-model-vdoc INCEpTION - Core - VDoc Model diff --git a/inception/inception-model/pom.xml b/inception/inception-model/pom.xml index 47e72ee9288..3a73f6bbd6b 100644 --- a/inception/inception-model/pom.xml +++ b/inception/inception-model/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-model INCEpTION - Core - Model diff --git a/inception/inception-pdf-editor/pom.xml b/inception/inception-pdf-editor/pom.xml index a61f5723f90..ef94ea66954 100644 --- a/inception/inception-pdf-editor/pom.xml +++ b/inception/inception-pdf-editor/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 INCEpTION - Editor - PDF (pdfbox ${pdfbox.version}) (deprecated) inception-pdf-editor diff --git a/inception/inception-pdf-editor2/pom.xml b/inception/inception-pdf-editor2/pom.xml index baba71fad51..734f0a4dd5c 100644 --- a/inception/inception-pdf-editor2/pom.xml +++ b/inception/inception-pdf-editor2/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 INCEpTION - Editor - PDF (pdfbox ${pdfbox.version}; pdfjs ${pdfjs.version}) inception-pdf-editor2 diff --git a/inception/inception-plugin-api/pom.xml b/inception/inception-plugin-api/pom.xml index bf3315f5ef4..1cec3f3056e 100644 --- a/inception/inception-plugin-api/pom.xml +++ b/inception/inception-plugin-api/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-plugin-api INCEpTION - Plugin API diff --git a/inception/inception-plugin-manager/pom.xml b/inception/inception-plugin-manager/pom.xml index 3c280ad895a..cac6ad029cb 100644 --- a/inception/inception-plugin-manager/pom.xml +++ b/inception/inception-plugin-manager/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-plugin-manager INCEpTION - Plugin manager diff --git a/inception/inception-plugin-parent/pom.xml b/inception/inception-plugin-parent/pom.xml index 869b1adb0ec..637e0f9e9d4 100644 --- a/inception/inception-plugin-parent/pom.xml +++ b/inception/inception-plugin-parent/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-plugin-parent INCEpTION - Plugin Parent POM diff --git a/inception/inception-preferences/pom.xml b/inception/inception-preferences/pom.xml index bddf56dba1e..5bcd0db9182 100644 --- a/inception/inception-preferences/pom.xml +++ b/inception/inception-preferences/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-preferences INCEpTION - Preferences diff --git a/inception/inception-project-export/pom.xml b/inception/inception-project-export/pom.xml index 6ab953b0e6c..db25d2ef82b 100644 --- a/inception/inception-project-export/pom.xml +++ b/inception/inception-project-export/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-project-export INCEpTION - Core - Project export diff --git a/inception/inception-project-initializers-basic/pom.xml b/inception/inception-project-initializers-basic/pom.xml index 0e8af8c0039..570f35cb059 100644 --- a/inception/inception-project-initializers-basic/pom.xml +++ b/inception/inception-project-initializers-basic/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-project-initializers-basic INCEpTION - Core - Project initializers - Basic Span / Relation diff --git a/inception/inception-project-initializers-doclabeling/pom.xml b/inception/inception-project-initializers-doclabeling/pom.xml index cca1fb9e586..002b6ef867a 100644 --- a/inception/inception-project-initializers-doclabeling/pom.xml +++ b/inception/inception-project-initializers-doclabeling/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-project-initializers-doclabeling INCEpTION - Core - Project initializers - Document Labeling diff --git a/inception/inception-project-initializers-sentencelabeling/pom.xml b/inception/inception-project-initializers-sentencelabeling/pom.xml index 86f607c972d..54d00bdcaf4 100644 --- a/inception/inception-project-initializers-sentencelabeling/pom.xml +++ b/inception/inception-project-initializers-sentencelabeling/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-project-initializers-sentencelabeling INCEpTION - Core - Project initializers - Sentence Labeling diff --git a/inception/inception-project-initializers-ud/pom.xml b/inception/inception-project-initializers-ud/pom.xml index f3b33a17a91..7af7e90558c 100644 --- a/inception/inception-project-initializers-ud/pom.xml +++ b/inception/inception-project-initializers-ud/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-project-initializers-ud INCEpTION - Core - Project initializers - Universal Dependencies diff --git a/inception/inception-project-initializers-wikidatalinking/pom.xml b/inception/inception-project-initializers-wikidatalinking/pom.xml index 5985c10d609..1c8a4f26a04 100644 --- a/inception/inception-project-initializers-wikidatalinking/pom.xml +++ b/inception/inception-project-initializers-wikidatalinking/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-project-initializers-wikidatalinking INCEpTION - Core - Project initializers - Entity Linking (Wikidata) diff --git a/inception/inception-project-initializers/pom.xml b/inception/inception-project-initializers/pom.xml index 31fde127d25..641b723d50f 100644 --- a/inception/inception-project-initializers/pom.xml +++ b/inception/inception-project-initializers/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-project-initializers INCEpTION - Core - Project initializers diff --git a/inception/inception-project/pom.xml b/inception/inception-project/pom.xml index c7769c88511..f340ec72af7 100644 --- a/inception/inception-project/pom.xml +++ b/inception/inception-project/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-project INCEpTION - Core - Project diff --git a/inception/inception-recommendation-api/pom.xml b/inception/inception-recommendation-api/pom.xml index cbd50a80271..a39fa0960d0 100644 --- a/inception/inception-recommendation-api/pom.xml +++ b/inception/inception-recommendation-api/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-recommendation-api INCEpTION - Recommendation - API diff --git a/inception/inception-recommendation/pom.xml b/inception/inception-recommendation/pom.xml index 6fb7d9b6840..42e7219202d 100644 --- a/inception/inception-recommendation/pom.xml +++ b/inception/inception-recommendation/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-recommendation INCEpTION - Recommendation - Core diff --git a/inception/inception-remote/pom.xml b/inception/inception-remote/pom.xml index a00c985e466..ea022534275 100644 --- a/inception/inception-remote/pom.xml +++ b/inception/inception-remote/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-remote INCEpTION - Core - Remote API diff --git a/inception/inception-review-editor/pom.xml b/inception/inception-review-editor/pom.xml index 882cde9fdb6..15d8ef0121e 100644 --- a/inception/inception-review-editor/pom.xml +++ b/inception/inception-review-editor/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 INCEpTION - Editor - Review (deprecated) inception-review-editor diff --git a/inception/inception-scheduling/pom.xml b/inception/inception-scheduling/pom.xml index 18246590471..5f153ab1f85 100644 --- a/inception/inception-scheduling/pom.xml +++ b/inception/inception-scheduling/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-scheduling INCEpTION - Scheduling diff --git a/inception/inception-schema/pom.xml b/inception/inception-schema/pom.xml index 89113e4597b..2746e3e7bb2 100644 --- a/inception/inception-schema/pom.xml +++ b/inception/inception-schema/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-schema INCEpTION - Core - Annotation Schema diff --git a/inception/inception-search-core/pom.xml b/inception/inception-search-core/pom.xml index 0728d744f77..29b3947dfef 100644 --- a/inception/inception-search-core/pom.xml +++ b/inception/inception-search-core/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-search-core INCEpTION - Search - Core diff --git a/inception/inception-search-mtas/pom.xml b/inception/inception-search-mtas/pom.xml index 4fe00770d6d..3346243836d 100644 --- a/inception/inception-search-mtas/pom.xml +++ b/inception/inception-search-mtas/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-search-mtas INCEpTION - Search - MTAS diff --git a/inception/inception-security/pom.xml b/inception/inception-security/pom.xml index 0a0f30e6160..6b1d41dc624 100644 --- a/inception/inception-security/pom.xml +++ b/inception/inception-security/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-security INCEpTION - Core - Security diff --git a/inception/inception-sharing/pom.xml b/inception/inception-sharing/pom.xml index 3f0feab1860..3aeb6e9a4ae 100644 --- a/inception/inception-sharing/pom.xml +++ b/inception/inception-sharing/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-sharing INCEpTION - Sharing diff --git a/inception/inception-support-standalone/pom.xml b/inception/inception-support-standalone/pom.xml index 4ee95f76f79..a345f5eceb7 100644 --- a/inception/inception-support-standalone/pom.xml +++ b/inception/inception-support-standalone/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-support-standalone INCEpTION - Core - Support for standalone mode diff --git a/inception/inception-support/pom.xml b/inception/inception-support/pom.xml index ad0d2559a54..63799ec7b43 100644 --- a/inception/inception-support/pom.xml +++ b/inception/inception-support/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-support INCEpTION - Support library diff --git a/inception/inception-telemetry/pom.xml b/inception/inception-telemetry/pom.xml index d26fa32c06d..852d4530d26 100644 --- a/inception/inception-telemetry/pom.xml +++ b/inception/inception-telemetry/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-telemetry INCEpTION - Telemetry diff --git a/inception/inception-test-dependencies/pom.xml b/inception/inception-test-dependencies/pom.xml index 300e677aea1..6835d4d679d 100644 --- a/inception/inception-test-dependencies/pom.xml +++ b/inception/inception-test-dependencies/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception - 30.0-SNAPSHOT + 30.0-beta-1 ../.. diff --git a/inception/inception-testing/pom.xml b/inception/inception-testing/pom.xml index acfe9a91f69..f8e6972f7d8 100644 --- a/inception/inception-testing/pom.xml +++ b/inception/inception-testing/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-testing INCEpTION - Test Support library diff --git a/inception/inception-tutorial/pom.xml b/inception/inception-tutorial/pom.xml index 06cf964d9a0..f7a339b278d 100644 --- a/inception/inception-tutorial/pom.xml +++ b/inception/inception-tutorial/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-tutorial INCEpTION - UI - Tutorial diff --git a/inception/inception-ui-agreement/pom.xml b/inception/inception-ui-agreement/pom.xml index efbac982191..961dd5807de 100644 --- a/inception/inception-ui-agreement/pom.xml +++ b/inception/inception-ui-agreement/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-ui-agreement INCEpTION - UI - Agreement diff --git a/inception/inception-ui-annotation/pom.xml b/inception/inception-ui-annotation/pom.xml index e6ee72c7643..c699496c1a4 100644 --- a/inception/inception-ui-annotation/pom.xml +++ b/inception/inception-ui-annotation/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-ui-annotation INCEpTION - UI - Annotation diff --git a/inception/inception-ui-core/pom.xml b/inception/inception-ui-core/pom.xml index 7aee41af7b5..fb09f32d1b6 100644 --- a/inception/inception-ui-core/pom.xml +++ b/inception/inception-ui-core/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-ui-core INCEpTION - UI - Core diff --git a/inception/inception-ui-curation/pom.xml b/inception/inception-ui-curation/pom.xml index 90301cd79c2..bfa16b700ad 100644 --- a/inception/inception-ui-curation/pom.xml +++ b/inception/inception-ui-curation/pom.xml @@ -15,14 +15,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-ui-curation INCEpTION - UI - Curation diff --git a/inception/inception-ui-dashboard-activity/pom.xml b/inception/inception-ui-dashboard-activity/pom.xml index 9bfeeac01e9..e2cbc734689 100644 --- a/inception/inception-ui-dashboard-activity/pom.xml +++ b/inception/inception-ui-dashboard-activity/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-ui-dashboard-activity INCEpTION - Dashboard - Recent activity diff --git a/inception/inception-ui-dashboard/pom.xml b/inception/inception-ui-dashboard/pom.xml index c63f31a83c9..a5f585880c1 100644 --- a/inception/inception-ui-dashboard/pom.xml +++ b/inception/inception-ui-dashboard/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-ui-dashboard INCEpTION - UI - Dashboard diff --git a/inception/inception-ui-external-search/pom.xml b/inception/inception-ui-external-search/pom.xml index 6ce7de2c27c..eda296fb775 100644 --- a/inception/inception-ui-external-search/pom.xml +++ b/inception/inception-ui-external-search/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-ui-external-search INCEpTION - External Search - UI diff --git a/inception/inception-ui-kb/pom.xml b/inception/inception-ui-kb/pom.xml index 49f832e67be..95a312dbc77 100644 --- a/inception/inception-ui-kb/pom.xml +++ b/inception/inception-ui-kb/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-ui-kb INCEpTION - Knowledge Base - UI diff --git a/inception/inception-ui-project/pom.xml b/inception/inception-ui-project/pom.xml index c0252211407..9622e917eeb 100644 --- a/inception/inception-ui-project/pom.xml +++ b/inception/inception-ui-project/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-ui-project INCEpTION - UI - Project diff --git a/inception/inception-ui-scheduling/pom.xml b/inception/inception-ui-scheduling/pom.xml index 7505765f811..4f6b44448f1 100644 --- a/inception/inception-ui-scheduling/pom.xml +++ b/inception/inception-ui-scheduling/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-ui-scheduling INCEpTION - UI - Scheduling diff --git a/inception/inception-ui-search/pom.xml b/inception/inception-ui-search/pom.xml index eeff7b0257f..f8b40c01574 100644 --- a/inception/inception-ui-search/pom.xml +++ b/inception/inception-ui-search/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-ui-search INCEpTION - Search - UI diff --git a/inception/inception-ui-tagsets/pom.xml b/inception/inception-ui-tagsets/pom.xml index 0f57e22defb..846a8f5f8c2 100644 --- a/inception/inception-ui-tagsets/pom.xml +++ b/inception/inception-ui-tagsets/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-ui-tagsets INCEpTION - UI - Tagsets diff --git a/inception/inception-versioning/pom.xml b/inception/inception-versioning/pom.xml index fdba80fc3f9..fefddf84eac 100644 --- a/inception/inception-versioning/pom.xml +++ b/inception/inception-versioning/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-versioning INCEpTION - Versioning diff --git a/inception/inception-websocket/pom.xml b/inception/inception-websocket/pom.xml index 0b85ecec621..bb29c78acff 100644 --- a/inception/inception-websocket/pom.xml +++ b/inception/inception-websocket/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-SNAPSHOT + 30.0-beta-1 inception-websocket INCEpTION - Websocket diff --git a/inception/inception-workload-dynamic/pom.xml b/inception/inception-workload-dynamic/pom.xml index f6b1190eb6c..15d335d8fd2 100644 --- a/inception/inception-workload-dynamic/pom.xml +++ b/inception/inception-workload-dynamic/pom.xml @@ -19,7 +19,7 @@ inception-app de.tudarmstadt.ukp.inception.app - 30.0-SNAPSHOT + 30.0-beta-1 4.0.0 inception-workload-dynamic diff --git a/inception/inception-workload-matrix/pom.xml b/inception/inception-workload-matrix/pom.xml index 79b7e23fc25..ee218b6cb92 100644 --- a/inception/inception-workload-matrix/pom.xml +++ b/inception/inception-workload-matrix/pom.xml @@ -20,7 +20,7 @@ inception-app de.tudarmstadt.ukp.inception.app - 30.0-SNAPSHOT + 30.0-beta-1 4.0.0 inception-workload-matrix diff --git a/inception/inception-workload-ui/pom.xml b/inception/inception-workload-ui/pom.xml index 791b85bc7ce..4bfc16dda76 100644 --- a/inception/inception-workload-ui/pom.xml +++ b/inception/inception-workload-ui/pom.xml @@ -20,7 +20,7 @@ inception-app de.tudarmstadt.ukp.inception.app - 30.0-SNAPSHOT + 30.0-beta-1 4.0.0 inception-workload-ui diff --git a/inception/inception-workload/pom.xml b/inception/inception-workload/pom.xml index 9072aa27d71..d7be86f1f91 100644 --- a/inception/inception-workload/pom.xml +++ b/inception/inception-workload/pom.xml @@ -20,7 +20,7 @@ inception-app de.tudarmstadt.ukp.inception.app - 30.0-SNAPSHOT + 30.0-beta-1 4.0.0 inception-workload diff --git a/inception/pom.xml b/inception/pom.xml index 232c9d80402..c0eed4faf5b 100644 --- a/inception/pom.xml +++ b/inception/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception - 30.0-SNAPSHOT + 30.0-beta-1 inception-app @@ -42,14 +42,14 @@ de.tudarmstadt.ukp.inception.app inception-bom - 30.0-SNAPSHOT + 30.0-beta-1 pom import de.tudarmstadt.ukp.inception.app inception-dependencies - 30.0-SNAPSHOT + 30.0-beta-1 pom import diff --git a/pom.xml b/pom.xml index 9586c9bc58c..4e826ab521f 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ de.tudarmstadt.ukp.inception.app inception - 30.0-SNAPSHOT + 30.0-beta-1 pom INCEpTION @@ -56,7 +56,7 @@ scm:git:https://github.com/inception-project/inception.git scm:git:https://github.com/inception-project/inception.git https://github.com/inception-project/inception - inception-29.0-rc-1 + inception-30.0-beta-1 From 4aa065f2313aef5dcb12ed40190c4e364ac6f8b8 Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Tue, 7 Nov 2023 22:11:34 +0100 Subject: [PATCH 08/53] [maven-release-plugin] prepare for next development iteration --- inception/inception-active-learning/pom.xml | 2 +- inception/inception-agreement/pom.xml | 2 +- .../inception-annotation-storage-api/pom.xml | 2 +- .../inception-annotation-storage/pom.xml | 2 +- inception/inception-api-annotation/pom.xml | 2 +- inception/inception-api-editor/pom.xml | 2 +- inception/inception-api-formats/pom.xml | 2 +- inception/inception-api-render/pom.xml | 2 +- inception/inception-api-schema/pom.xml | 2 +- inception/inception-api/pom.xml | 2 +- inception/inception-app-webapp/pom.xml | 2 +- inception/inception-bom/pom.xml | 234 +++++++++--------- inception/inception-boot-loader/pom.xml | 2 +- inception/inception-bootstrap/pom.xml | 2 +- inception/inception-brat-editor/pom.xml | 2 +- inception/inception-build/pom.xml | 2 +- inception/inception-concept-linking/pom.xml | 2 +- inception/inception-constraints/pom.xml | 2 +- inception/inception-curation-legacy/pom.xml | 2 +- inception/inception-curation/pom.xml | 2 +- inception/inception-dependencies/pom.xml | 2 +- inception/inception-diag/pom.xml | 2 +- inception/inception-diam-api/pom.xml | 2 +- inception/inception-diam-compactv2/pom.xml | 2 +- inception/inception-diam-editor/pom.xml | 2 +- inception/inception-diam/pom.xml | 2 +- inception/inception-doc/pom.xml | 2 +- inception/inception-docker/pom.xml | 2 +- inception/inception-documents-api/pom.xml | 2 +- inception/inception-documents/pom.xml | 2 +- .../pom.xml | 2 +- inception/inception-export-api/pom.xml | 2 +- inception/inception-export/pom.xml | 2 +- inception/inception-external-editor/pom.xml | 2 +- .../inception-external-search-core/pom.xml | 2 +- .../inception-external-search-elastic/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../inception-external-search-pubmed/pom.xml | 2 +- .../inception-external-search-solr/pom.xml | 2 +- inception/inception-feature-lookup/pom.xml | 2 +- inception/inception-guidelines/pom.xml | 2 +- .../pom.xml | 2 +- inception/inception-html-editor/pom.xml | 2 +- .../inception-html-recogito-editor/pom.xml | 2 +- inception/inception-image/pom.xml | 2 +- inception/inception-imls-elg/pom.xml | 2 +- inception/inception-imls-external/pom.xml | 2 +- inception/inception-imls-hf/pom.xml | 2 +- inception/inception-imls-lapps/pom.xml | 2 +- inception/inception-imls-opennlp/pom.xml | 2 +- inception/inception-imls-stringmatch/pom.xml | 2 +- inception/inception-imls-weblicht/pom.xml | 2 +- inception/inception-io-bioc/pom.xml | 2 +- inception/inception-io-conll/pom.xml | 2 +- inception/inception-io-html/pom.xml | 2 +- inception/inception-io-imscwb/pom.xml | 2 +- inception/inception-io-intertext/pom.xml | 2 +- inception/inception-io-json/pom.xml | 2 +- inception/inception-io-lif/pom.xml | 2 +- inception/inception-io-nif/pom.xml | 2 +- inception/inception-io-perseus/pom.xml | 2 +- inception/inception-io-tcf/pom.xml | 2 +- inception/inception-io-tei/pom.xml | 2 +- inception/inception-io-text/pom.xml | 2 +- inception/inception-io-webanno-tsv/pom.xml | 2 +- inception/inception-io-xmi/pom.xml | 2 +- inception/inception-io-xml/pom.xml | 2 +- inception/inception-js-api/pom.xml | 2 +- inception/inception-kb-fact-linking/pom.xml | 2 +- inception/inception-kb/pom.xml | 2 +- inception/inception-layer-docmetadata/pom.xml | 2 +- inception/inception-log/pom.xml | 2 +- inception/inception-model-export/pom.xml | 2 +- inception/inception-model-vdoc/pom.xml | 2 +- inception/inception-model/pom.xml | 2 +- inception/inception-pdf-editor/pom.xml | 2 +- inception/inception-pdf-editor2/pom.xml | 2 +- inception/inception-plugin-api/pom.xml | 2 +- inception/inception-plugin-manager/pom.xml | 2 +- inception/inception-plugin-parent/pom.xml | 2 +- inception/inception-preferences/pom.xml | 2 +- inception/inception-project-export/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../inception-project-initializers-ud/pom.xml | 2 +- .../pom.xml | 2 +- .../inception-project-initializers/pom.xml | 2 +- inception/inception-project/pom.xml | 2 +- .../inception-recommendation-api/pom.xml | 2 +- inception/inception-recommendation/pom.xml | 2 +- inception/inception-remote/pom.xml | 2 +- inception/inception-review-editor/pom.xml | 2 +- inception/inception-scheduling/pom.xml | 2 +- inception/inception-schema/pom.xml | 2 +- inception/inception-search-core/pom.xml | 2 +- inception/inception-search-mtas/pom.xml | 2 +- inception/inception-security/pom.xml | 2 +- inception/inception-sharing/pom.xml | 2 +- .../inception-support-standalone/pom.xml | 2 +- inception/inception-support/pom.xml | 2 +- inception/inception-telemetry/pom.xml | 2 +- inception/inception-test-dependencies/pom.xml | 2 +- inception/inception-testing/pom.xml | 2 +- inception/inception-tutorial/pom.xml | 2 +- inception/inception-ui-agreement/pom.xml | 2 +- inception/inception-ui-annotation/pom.xml | 2 +- inception/inception-ui-core/pom.xml | 2 +- inception/inception-ui-curation/pom.xml | 2 +- .../inception-ui-dashboard-activity/pom.xml | 2 +- inception/inception-ui-dashboard/pom.xml | 2 +- .../inception-ui-external-search/pom.xml | 2 +- inception/inception-ui-kb/pom.xml | 2 +- inception/inception-ui-project/pom.xml | 2 +- inception/inception-ui-scheduling/pom.xml | 2 +- inception/inception-ui-search/pom.xml | 2 +- inception/inception-ui-tagsets/pom.xml | 2 +- inception/inception-versioning/pom.xml | 2 +- inception/inception-websocket/pom.xml | 2 +- inception/inception-workload-dynamic/pom.xml | 2 +- inception/inception-workload-matrix/pom.xml | 2 +- inception/inception-workload-ui/pom.xml | 2 +- inception/inception-workload/pom.xml | 2 +- inception/pom.xml | 6 +- pom.xml | 4 +- 126 files changed, 245 insertions(+), 245 deletions(-) diff --git a/inception/inception-active-learning/pom.xml b/inception/inception-active-learning/pom.xml index df9c7bada1f..315e1f981b5 100644 --- a/inception/inception-active-learning/pom.xml +++ b/inception/inception-active-learning/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-beta-1 + 30.0-SNAPSHOT .. inception-active-learning diff --git a/inception/inception-agreement/pom.xml b/inception/inception-agreement/pom.xml index cc66993608b..3ef054f2a7e 100644 --- a/inception/inception-agreement/pom.xml +++ b/inception/inception-agreement/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-beta-1 + 30.0-SNAPSHOT inception-agreement INCEpTION - Core - Agreement diff --git a/inception/inception-annotation-storage-api/pom.xml b/inception/inception-annotation-storage-api/pom.xml index d7fa44b9caa..df22ae9fa90 100644 --- a/inception/inception-annotation-storage-api/pom.xml +++ b/inception/inception-annotation-storage-api/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-beta-1 + 30.0-SNAPSHOT inception-annotation-storage-api INCEpTION - Core - Annotation Storage - API diff --git a/inception/inception-annotation-storage/pom.xml b/inception/inception-annotation-storage/pom.xml index c620920d010..d715f3f16bb 100644 --- a/inception/inception-annotation-storage/pom.xml +++ b/inception/inception-annotation-storage/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-beta-1 + 30.0-SNAPSHOT inception-annotation-storage INCEpTION - Core - Annotation Storage diff --git a/inception/inception-api-annotation/pom.xml b/inception/inception-api-annotation/pom.xml index 043270c5b51..8e120e7ec79 100644 --- a/inception/inception-api-annotation/pom.xml +++ b/inception/inception-api-annotation/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-beta-1 + 30.0-SNAPSHOT inception-api-annotation INCEpTION - Core - Annotation API diff --git a/inception/inception-api-editor/pom.xml b/inception/inception-api-editor/pom.xml index eafd5051b75..fc88931bfbd 100644 --- a/inception/inception-api-editor/pom.xml +++ b/inception/inception-api-editor/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-beta-1 + 30.0-SNAPSHOT inception-api-editor INCEpTION - Core - Annotation editor API diff --git a/inception/inception-api-formats/pom.xml b/inception/inception-api-formats/pom.xml index a2934d827cd..7541d249a17 100644 --- a/inception/inception-api-formats/pom.xml +++ b/inception/inception-api-formats/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-beta-1 + 30.0-SNAPSHOT inception-api-formats INCEpTION - Core - Formats API diff --git a/inception/inception-api-render/pom.xml b/inception/inception-api-render/pom.xml index 56445eeec76..2fe2dd6788b 100644 --- a/inception/inception-api-render/pom.xml +++ b/inception/inception-api-render/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-beta-1 + 30.0-SNAPSHOT inception-api-render INCEpTION - Core - Annotation rendering API diff --git a/inception/inception-api-schema/pom.xml b/inception/inception-api-schema/pom.xml index 850dc49fd67..76428916938 100644 --- a/inception/inception-api-schema/pom.xml +++ b/inception/inception-api-schema/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-beta-1 + 30.0-SNAPSHOT inception-api-schema INCEpTION - Core - Annotation Schema API diff --git a/inception/inception-api/pom.xml b/inception/inception-api/pom.xml index 9995ddee096..35c5f8b7d66 100644 --- a/inception/inception-api/pom.xml +++ b/inception/inception-api/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-beta-1 + 30.0-SNAPSHOT inception-api INCEpTION - Core - API diff --git a/inception/inception-app-webapp/pom.xml b/inception/inception-app-webapp/pom.xml index ed7ee6afb89..4e93d9b8a88 100644 --- a/inception/inception-app-webapp/pom.xml +++ b/inception/inception-app-webapp/pom.xml @@ -21,7 +21,7 @@ de.tudarmstadt.ukp.inception.app inception-app - 30.0-beta-1 + 30.0-SNAPSHOT .. diff --git a/inception/inception-bom/pom.xml b/inception/inception-bom/pom.xml index 346777f8a69..2b14187ef0b 100644 --- a/inception/inception-bom/pom.xml +++ b/inception/inception-bom/pom.xml @@ -20,7 +20,7 @@ de.tudarmstadt.ukp.inception.app inception - 30.0-beta-1 + 30.0-SNAPSHOT ../.. @@ -33,222 +33,222 @@ de.tudarmstadt.ukp.inception.app inception-doc - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-agreement - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-ui-agreement - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-ui-annotation - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-ui-project - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-ui-tagsets - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-curation - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-ui-curation - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-ui-search - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-workload - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-workload-dynamic - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-workload-matrix - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-workload-ui - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-external-editor - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-external-search-core - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-external-search-pubannotation - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-external-search-pubmed - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-external-search-elastic - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-external-search-opensearch - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-external-search-solr - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-ui-external-search - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-ui-dashboard - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-ui-dashboard-activity - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-kb - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-kb-fact-linking - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-html-apache-annotator-editor - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-html-editor - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-html-recogito-editor - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-pdf-editor - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-pdf-editor2 - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-recommendation - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-recommendation-api - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-review-editor - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-sharing - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-preferences - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-guidelines - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-schema - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-active-learning - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-ui-core - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-ui-kb - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-concept-linking - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-imls-opennlp - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-imls-elg - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app inception-imls-hf - 30.0-beta-1 + 30.0-SNAPSHOT de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api test diff --git a/inception/inception-preferences/src/test/java/de/tudarmstadt/ukp/inception/preferences/PreferencesServiceImplIntegrationTest.java b/inception/inception-preferences/src/test/java/de/tudarmstadt/ukp/inception/preferences/PreferencesServiceImplIntegrationTest.java index be68da79fb8..de8035a7e8f 100644 --- a/inception/inception-preferences/src/test/java/de/tudarmstadt/ukp/inception/preferences/PreferencesServiceImplIntegrationTest.java +++ b/inception/inception-preferences/src/test/java/de/tudarmstadt/ukp/inception/preferences/PreferencesServiceImplIntegrationTest.java @@ -37,13 +37,13 @@ import org.springframework.context.annotation.Import; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.config.ProjectServiceAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.config.SecurityAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.inception.documents.api.RepositoryAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; @DataJpaTest( // showSql = false, // diff --git a/inception/inception-project-api/LICENSE.txt b/inception/inception-project-api/LICENSE.txt new file mode 100644 index 00000000000..d6456956733 --- /dev/null +++ b/inception/inception-project-api/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/inception/inception-project-api/pom.xml b/inception/inception-project-api/pom.xml new file mode 100644 index 00000000000..a3305a8bcd4 --- /dev/null +++ b/inception/inception-project-api/pom.xml @@ -0,0 +1,65 @@ + + + 4.0.0 + + de.tudarmstadt.ukp.inception.app + inception-app + 30.0-SNAPSHOT + + inception-project-api + INCEpTION - Project - API + + + de.tudarmstadt.ukp.inception.app + inception-model + + + de.tudarmstadt.ukp.inception.app + inception-model-export + + + de.tudarmstadt.ukp.inception.app + inception-security + + + de.tudarmstadt.ukp.inception.app + inception-support + + + + org.slf4j + slf4j-api + + + + org.apache.commons + commons-lang3 + + + + + org.springframework + spring-context + + + org.springframework.security + spring-security-core + + + \ No newline at end of file diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/project/ProjectInitializer.java b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/ProjectInitializer.java similarity index 95% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/project/ProjectInitializer.java rename to inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/ProjectInitializer.java index 27d9f644150..8243e018948 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/project/ProjectInitializer.java +++ b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/ProjectInitializer.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.clarin.webanno.api.project; +package de.tudarmstadt.ukp.inception.project.api; import java.io.IOException; import java.util.List; diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/ProjectService.java b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/ProjectService.java similarity index 99% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/ProjectService.java rename to inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/ProjectService.java index ada04aed518..f07d185d0c3 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/ProjectService.java +++ b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/ProjectService.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.clarin.webanno.api; +package de.tudarmstadt.ukp.inception.project.api; import static de.tudarmstadt.ukp.clarin.webanno.support.logging.Logging.KEY_PROJECT_ID; import static de.tudarmstadt.ukp.clarin.webanno.support.logging.Logging.KEY_REPOSITORY_PATH; @@ -33,8 +33,6 @@ import org.slf4j.MDC; import org.springframework.security.access.prepost.PreAuthorize; -import de.tudarmstadt.ukp.clarin.webanno.api.event.ProjectStateChangedEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.PermissionLevel; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -46,6 +44,7 @@ import de.tudarmstadt.ukp.clarin.webanno.security.Realm; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.clarin.webanno.support.logging.MDCContext; +import de.tudarmstadt.ukp.inception.project.api.event.ProjectStateChangedEvent; public interface ProjectService { diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/AfterProjectCreatedEvent.java b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/AfterProjectCreatedEvent.java similarity index 95% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/AfterProjectCreatedEvent.java rename to inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/AfterProjectCreatedEvent.java index ccff5113675..61323c50a66 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/AfterProjectCreatedEvent.java +++ b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/AfterProjectCreatedEvent.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.clarin.webanno.api.event; +package de.tudarmstadt.ukp.inception.project.api.event; import org.springframework.context.ApplicationEvent; diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/AfterProjectRemovedEvent.java b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/AfterProjectRemovedEvent.java similarity index 95% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/AfterProjectRemovedEvent.java rename to inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/AfterProjectRemovedEvent.java index 9ea8b42ef92..990dda3b6cc 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/AfterProjectRemovedEvent.java +++ b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/AfterProjectRemovedEvent.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.clarin.webanno.api.event; +package de.tudarmstadt.ukp.inception.project.api.event; import org.springframework.context.ApplicationEvent; diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/BeforeProjectRemovedEvent.java b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/BeforeProjectRemovedEvent.java similarity index 95% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/BeforeProjectRemovedEvent.java rename to inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/BeforeProjectRemovedEvent.java index e940c9652b1..38528acbaa7 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/BeforeProjectRemovedEvent.java +++ b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/BeforeProjectRemovedEvent.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.clarin.webanno.api.event; +package de.tudarmstadt.ukp.inception.project.api.event; import org.springframework.context.ApplicationEvent; diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/ProjectImportEvent.java b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/ProjectImportEvent.java similarity index 96% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/ProjectImportEvent.java rename to inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/ProjectImportEvent.java index 2628e07a6ca..c9b5d36c405 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/ProjectImportEvent.java +++ b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/ProjectImportEvent.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.clarin.webanno.api.event; +package de.tudarmstadt.ukp.inception.project.api.event; import java.util.zip.ZipFile; diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/ProjectPermissionsChangedEvent.java b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/ProjectPermissionsChangedEvent.java similarity index 97% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/ProjectPermissionsChangedEvent.java rename to inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/ProjectPermissionsChangedEvent.java index c76dbcb401c..264b6428f86 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/ProjectPermissionsChangedEvent.java +++ b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/ProjectPermissionsChangedEvent.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.clarin.webanno.api.event; +package de.tudarmstadt.ukp.inception.project.api.event; import static java.util.Collections.unmodifiableList; diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/ProjectPermissionsEvent.java b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/ProjectPermissionsEvent.java similarity index 95% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/ProjectPermissionsEvent.java rename to inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/ProjectPermissionsEvent.java index 2c9c3edf682..2cf903990b7 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/ProjectPermissionsEvent.java +++ b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/ProjectPermissionsEvent.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.clarin.webanno.api.event; +package de.tudarmstadt.ukp.inception.project.api.event; import org.springframework.context.ApplicationEvent; diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/ProjectStateChangedEvent.java b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/ProjectStateChangedEvent.java similarity index 96% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/ProjectStateChangedEvent.java rename to inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/ProjectStateChangedEvent.java index 7dcaa0725ec..ef3c1da9a4f 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/ProjectStateChangedEvent.java +++ b/inception/inception-project-api/src/main/java/de/tudarmstadt/ukp/inception/project/api/event/ProjectStateChangedEvent.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.clarin.webanno.api.event; +package de.tudarmstadt.ukp.inception.project.api.event; import org.springframework.context.ApplicationEvent; diff --git a/inception/inception-project-export/pom.xml b/inception/inception-project-export/pom.xml index 6ab953b0e6c..0526fc222b1 100644 --- a/inception/inception-project-export/pom.xml +++ b/inception/inception-project-export/pom.xml @@ -42,6 +42,10 @@ de.tudarmstadt.ukp.inception.app inception-model + + de.tudarmstadt.ukp.inception.app + inception-project-api + de.tudarmstadt.ukp.inception.app inception-websocket diff --git a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/ProjectExportServiceImpl.java b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/ProjectExportServiceImpl.java index bdbbbbc3479..cb16a3314bc 100644 --- a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/ProjectExportServiceImpl.java +++ b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/ProjectExportServiceImpl.java @@ -17,9 +17,9 @@ */ package de.tudarmstadt.ukp.inception.project.export; -import static de.tudarmstadt.ukp.clarin.webanno.api.ProjectService.withProjectLogger; import static de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportTaskState.NOT_STARTED; import static de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportTaskState.RUNNING; +import static de.tudarmstadt.ukp.inception.project.api.ProjectService.withProjectLogger; import static java.lang.System.currentTimeMillis; import static java.util.Arrays.asList; import static java.util.Collections.unmodifiableList; @@ -66,7 +66,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ConcurrentReferenceHashMap; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.export.FullProjectExportRequest; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportException; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportRequest_ImplBase; @@ -80,6 +79,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.ZipUtils; import de.tudarmstadt.ukp.clarin.webanno.support.logging.BaseLoggers; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.project.export.config.ProjectExportServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.project.export.model.ProjectExportTask; import de.tudarmstadt.ukp.inception.project.export.task.backup.BackupProjectExportTask; diff --git a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/config/ProjectExportServiceAutoConfiguration.java b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/config/ProjectExportServiceAutoConfiguration.java index efcafb8e096..17aa1b08630 100644 --- a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/config/ProjectExportServiceAutoConfiguration.java +++ b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/config/ProjectExportServiceAutoConfiguration.java @@ -28,9 +28,9 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExporter; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.project.export.ProjectExportExtension; import de.tudarmstadt.ukp.inception.project.export.ProjectExportExtensionPoint; import de.tudarmstadt.ukp.inception.project.export.ProjectExportExtensionPointImpl; diff --git a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/controller/ExportServiceControllerImpl.java b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/controller/ExportServiceControllerImpl.java index b65c7271788..b14c3cc0cad 100644 --- a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/controller/ExportServiceControllerImpl.java +++ b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/controller/ExportServiceControllerImpl.java @@ -45,7 +45,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportTaskHandle; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportTaskMonitor; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportTaskState; @@ -53,6 +52,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.project.export.ProjectExportService; import de.tudarmstadt.ukp.inception.project.export.model.MProjectExportStateUpdate; import de.tudarmstadt.ukp.inception.project.export.model.RExportLogMessage; diff --git a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/legacy/LegacyProjectExportPanel.java b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/legacy/LegacyProjectExportPanel.java index c699a2c2c98..641bacee3b3 100644 --- a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/legacy/LegacyProjectExportPanel.java +++ b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/legacy/LegacyProjectExportPanel.java @@ -42,7 +42,6 @@ import org.wicketstuff.progressbar.ProgressBar; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.api.export.FullProjectExportRequest; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportRequest_ImplBase; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportTaskHandle; @@ -54,6 +53,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.wicket.AjaxDownloadBehavior; import de.tudarmstadt.ukp.clarin.webanno.ui.core.settings.ProjectSettingsPanelBase; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.project.export.ProjectExportService; import de.tudarmstadt.ukp.inception.project.export.settings.FormatDropdownChoice; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; diff --git a/inception/inception-project-export/src/test/java/de/tudarmstadt/ukp/inception/project/export/controller/ExportServiceControllerImplTest.java b/inception/inception-project-export/src/test/java/de/tudarmstadt/ukp/inception/project/export/controller/ExportServiceControllerImplTest.java index 74b07bd833b..530c3870a36 100644 --- a/inception/inception-project-export/src/test/java/de/tudarmstadt/ukp/inception/project/export/controller/ExportServiceControllerImplTest.java +++ b/inception/inception-project-export/src/test/java/de/tudarmstadt/ukp/inception/project/export/controller/ExportServiceControllerImplTest.java @@ -69,7 +69,6 @@ import org.springframework.web.socket.client.standard.StandardWebSocketClient; import org.springframework.web.socket.messaging.WebSocketStompClient; -import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService; import de.tudarmstadt.ukp.clarin.webanno.model.PermissionLevel; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.config.ProjectServiceAutoConfiguration; @@ -84,6 +83,7 @@ import de.tudarmstadt.ukp.inception.documents.api.RepositoryAutoConfiguration; import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.documents.config.DocumentServiceAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.project.export.config.ProjectExportServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.support.findbugs.SuppressFBWarnings; diff --git a/inception/inception-project-initializers-basic/pom.xml b/inception/inception-project-initializers-basic/pom.xml index 0e8af8c0039..beb0d3f9a54 100644 --- a/inception/inception-project-initializers-basic/pom.xml +++ b/inception/inception-project-initializers-basic/pom.xml @@ -31,7 +31,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicProjectInitializer.java b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicProjectInitializer.java index 773c9293b56..58c5125a12f 100644 --- a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicProjectInitializer.java +++ b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicProjectInitializer.java @@ -27,9 +27,9 @@ import org.apache.wicket.request.resource.ResourceReference; import org.springframework.context.ApplicationContext; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.QuickProjectInitializer; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.basic.config.InceptionBasicProjectInitializersAutoConfiguration; /** diff --git a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationLayerInitializer.java b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationLayerInitializer.java index 8dd73fc8d2b..f4370ef8457 100644 --- a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationLayerInitializer.java +++ b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationLayerInitializer.java @@ -30,12 +30,12 @@ import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.LayerInitializer; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.basic.config.InceptionBasicProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; diff --git a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationRecommenderInitializer.java b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationRecommenderInitializer.java index 7462c0b3133..8df00967771 100644 --- a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationRecommenderInitializer.java +++ b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationRecommenderInitializer.java @@ -25,10 +25,10 @@ import java.io.IOException; import java.util.List; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.basic.config.InceptionBasicProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender; diff --git a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationTagSetInitializer.java b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationTagSetInitializer.java index 507d4ec6735..d860d42e9f9 100644 --- a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationTagSetInitializer.java +++ b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationTagSetInitializer.java @@ -23,10 +23,10 @@ import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TagSetInitializer; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.basic.config.InceptionBasicProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; diff --git a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanLayerInitializer.java b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanLayerInitializer.java index 6d33cc0d74e..02086b92cdc 100644 --- a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanLayerInitializer.java +++ b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanLayerInitializer.java @@ -28,13 +28,13 @@ import org.apache.uima.cas.CAS; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.LayerInitializer; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TokenLayerInitializer; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.basic.config.InceptionBasicProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; diff --git a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanRecommenderInitializer.java b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanRecommenderInitializer.java index 9b2a308239f..6793a227cf4 100644 --- a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanRecommenderInitializer.java +++ b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanRecommenderInitializer.java @@ -24,10 +24,10 @@ import java.io.IOException; import java.util.List; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.basic.config.InceptionBasicProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender; diff --git a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanTagSetInitializer.java b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanTagSetInitializer.java index 9dafe814c34..6477633b596 100644 --- a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanTagSetInitializer.java +++ b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanTagSetInitializer.java @@ -23,10 +23,10 @@ import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TagSetInitializer; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.basic.config.InceptionBasicProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; diff --git a/inception/inception-project-initializers-doclabeling/pom.xml b/inception/inception-project-initializers-doclabeling/pom.xml index cca1fb9e586..f8684288586 100644 --- a/inception/inception-project-initializers-doclabeling/pom.xml +++ b/inception/inception-project-initializers-doclabeling/pom.xml @@ -35,7 +35,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelLayerInitializer.java b/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelLayerInitializer.java index fb37a2c0c22..a5c890ff586 100644 --- a/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelLayerInitializer.java +++ b/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelLayerInitializer.java @@ -27,12 +27,12 @@ import org.apache.uima.cas.CAS; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.LayerInitializer; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.doclabeling.config.InceptionDocumentLabelingProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.ui.core.docanno.layer.DocumentMetadataLayerSupport; diff --git a/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelTagSetInitializer.java b/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelTagSetInitializer.java index b736e9bf1a9..ef8bd1ad206 100644 --- a/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelTagSetInitializer.java +++ b/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelTagSetInitializer.java @@ -23,11 +23,11 @@ import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.Tag; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TagSetInitializer; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.doclabeling.config.InceptionDocumentLabelingProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; diff --git a/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelingProjectInitializer.java b/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelingProjectInitializer.java index 8d91f09dfef..3a928168ed6 100644 --- a/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelingProjectInitializer.java +++ b/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelingProjectInitializer.java @@ -28,12 +28,12 @@ import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.QuickProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TokenLayerInitializer; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.sidebar.AnnotationSidebarState; import de.tudarmstadt.ukp.inception.preferences.PreferencesService; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.doclabeling.config.InceptionDocumentLabelingProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.ui.core.docanno.sidebar.DocumentMetadataSidebarFactory; import de.tudarmstadt.ukp.inception.workload.matrix.MatrixWorkloadExtension; diff --git a/inception/inception-project-initializers-sentencelabeling/pom.xml b/inception/inception-project-initializers-sentencelabeling/pom.xml index 86f607c972d..dab2ad32fd8 100644 --- a/inception/inception-project-initializers-sentencelabeling/pom.xml +++ b/inception/inception-project-initializers-sentencelabeling/pom.xml @@ -31,7 +31,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelLayerInitializer.java b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelLayerInitializer.java index 66e495dcad4..1407cc213b9 100644 --- a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelLayerInitializer.java +++ b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelLayerInitializer.java @@ -28,12 +28,12 @@ import org.apache.uima.cas.CAS; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.LayerInitializer; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.sentencelabeling.config.InceptionSentenceLabelingProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; diff --git a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelRecommenderInitializer.java b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelRecommenderInitializer.java index 35462db5f89..1bc0c6b9a7a 100644 --- a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelRecommenderInitializer.java +++ b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelRecommenderInitializer.java @@ -24,10 +24,10 @@ import java.io.IOException; import java.util.List; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.sentencelabeling.config.InceptionSentenceLabelingProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender; diff --git a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelTagSetInitializer.java b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelTagSetInitializer.java index d8666200652..1432fc1d667 100644 --- a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelTagSetInitializer.java +++ b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelTagSetInitializer.java @@ -23,11 +23,11 @@ import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.Tag; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TagSetInitializer; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.sentencelabeling.config.InceptionSentenceLabelingProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; diff --git a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelingProjectInitializer.java b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelingProjectInitializer.java index b83d5f2d78e..7430bea3288 100644 --- a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelingProjectInitializer.java +++ b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelingProjectInitializer.java @@ -30,10 +30,10 @@ import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.QuickProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TokenLayerInitializer; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.sentencelabeling.config.InceptionSentenceLabelingProjectInitializersAutoConfiguration; /** diff --git a/inception/inception-project-initializers-ud/pom.xml b/inception/inception-project-initializers-ud/pom.xml index f3b33a17a91..d5cdbadf1d0 100644 --- a/inception/inception-project-initializers-ud/pom.xml +++ b/inception/inception-project-initializers-ud/pom.xml @@ -31,7 +31,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-project-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-project-initializers-ud/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/ud/UniversalDependenciesProjectInitializer.java b/inception/inception-project-initializers-ud/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/ud/UniversalDependenciesProjectInitializer.java index 03e9f6524e5..fcbb3901810 100644 --- a/inception/inception-project-initializers-ud/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/ud/UniversalDependenciesProjectInitializer.java +++ b/inception/inception-project-initializers-ud/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/ud/UniversalDependenciesProjectInitializer.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.Optional; -import de.tudarmstadt.ukp.clarin.webanno.api.project.ProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.DependencyLayerInitializer; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.LemmaLayerInitializer; @@ -33,6 +32,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.SurfaceFormLayerInitializer; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TokenLayerInitializer; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; +import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; /** *

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

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

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

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

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

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

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

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

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 b820632223f..a786546b5ce 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 @@ -62,7 +62,6 @@ 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.event.LayerConfigurationChangedEvent; import de.tudarmstadt.ukp.clarin.webanno.api.type.CASMetadata; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; @@ -72,6 +71,7 @@ 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.schema.event.LayerConfigurationChangedEvent; public class CasStorageServiceImplTest { diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/coloring/ColoringServiceImpl.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/coloring/ColoringServiceImpl.java index 540262f3be8..35a5b99c6e5 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/coloring/ColoringServiceImpl.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/coloring/ColoringServiceImpl.java @@ -44,7 +44,6 @@ import com.github.benmanes.caffeine.cache.LoadingCache; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.config.AnnotationAutoConfiguration; -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; import de.tudarmstadt.ukp.clarin.webanno.model.LinkMode; @@ -54,6 +53,7 @@ import de.tudarmstadt.ukp.inception.rendering.coloring.ReadonlyColoringBehaviour; import de.tudarmstadt.ukp.inception.rendering.editorstate.ColoringPreferences; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.event.LayerConfigurationChangedEvent; import de.tudarmstadt.ukp.inception.support.findbugs.SuppressFBWarnings; /** diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/PreRendererImpl.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/PreRendererImpl.java index a9736338770..583ad8d3ee4 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/PreRendererImpl.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/PreRendererImpl.java @@ -36,7 +36,6 @@ import com.github.benmanes.caffeine.cache.LoadingCache; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.config.AnnotationAutoConfiguration; -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; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -45,6 +44,7 @@ import de.tudarmstadt.ukp.inception.rendering.request.RenderRequest; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.event.LayerConfigurationChangedEvent; import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/KendoComboboxTextFeatureEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/KendoComboboxTextFeatureEditor.java index 0a8ab22406f..0fad3311cef 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/KendoComboboxTextFeatureEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/KendoComboboxTextFeatureEditor.java @@ -40,11 +40,11 @@ import com.googlecode.wicket.kendo.ui.form.combobox.ComboBoxBehavior; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.keybindings.KeyBindingsPanel; -import de.tudarmstadt.ukp.clarin.webanno.api.event.TagEvent; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.Tag; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; +import de.tudarmstadt.ukp.inception.schema.event.TagEvent; /** * String feature editor using a Kendo ComboBox field. diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/LayerConfigurationChangedEvent.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/LayerConfigurationChangedEvent.java similarity index 96% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/LayerConfigurationChangedEvent.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/LayerConfigurationChangedEvent.java index 9459b32999d..a7110fac354 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/LayerConfigurationChangedEvent.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/LayerConfigurationChangedEvent.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.clarin.webanno.api.event; +package de.tudarmstadt.ukp.inception.schema.event; import org.springframework.context.ApplicationEvent; diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/TagCreatedEvent.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagCreatedEvent.java similarity index 95% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/TagCreatedEvent.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagCreatedEvent.java index 1d7c7cdba3e..4c2b2c98f5c 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/TagCreatedEvent.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagCreatedEvent.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.clarin.webanno.api.event; +package de.tudarmstadt.ukp.inception.schema.event; import de.tudarmstadt.ukp.clarin.webanno.model.Tag; diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/TagDeletedEvent.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagDeletedEvent.java similarity index 95% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/TagDeletedEvent.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagDeletedEvent.java index 0663a711fba..508fab050ad 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/TagDeletedEvent.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagDeletedEvent.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.clarin.webanno.api.event; +package de.tudarmstadt.ukp.inception.schema.event; import de.tudarmstadt.ukp.clarin.webanno.model.Tag; diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/TagEvent.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagEvent.java similarity index 96% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/TagEvent.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagEvent.java index 4b00ce83802..4c1b4a774a4 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/TagEvent.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagEvent.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.clarin.webanno.api.event; +package de.tudarmstadt.ukp.inception.schema.event; import org.springframework.context.ApplicationEvent; diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/TagUpdatedEvent.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagUpdatedEvent.java similarity index 95% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/TagUpdatedEvent.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagUpdatedEvent.java index 7f3a6aea7b3..cbfea640fb6 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/TagUpdatedEvent.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagUpdatedEvent.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.clarin.webanno.api.event; +package de.tudarmstadt.ukp.inception.schema.event; import de.tudarmstadt.ukp.clarin.webanno.model.Tag; diff --git a/inception/inception-api/pom.xml b/inception/inception-api/pom.xml index d871f36d51b..05ddee9c019 100644 --- a/inception/inception-api/pom.xml +++ b/inception/inception-api/pom.xml @@ -53,10 +53,6 @@ org.springframework spring-context - - org.springframework.security - spring-security-core - org.springframework.boot spring-boot diff --git a/inception/inception-log/pom.xml b/inception/inception-log/pom.xml index 6fb21a22efd..1fb941eefbc 100644 --- a/inception/inception-log/pom.xml +++ b/inception/inception-log/pom.xml @@ -31,7 +31,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-api-schema de.tudarmstadt.ukp.inception.app @@ -183,12 +183,12 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema test de.tudarmstadt.ukp.inception.app - inception-schema + inception-api test diff --git a/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/LayerConfigurationChangedEventAdapter.java b/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/LayerConfigurationChangedEventAdapter.java index eb29d3689d8..1945ae63130 100644 --- a/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/LayerConfigurationChangedEventAdapter.java +++ b/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/LayerConfigurationChangedEventAdapter.java @@ -19,7 +19,7 @@ import org.springframework.stereotype.Component; -import de.tudarmstadt.ukp.clarin.webanno.api.event.LayerConfigurationChangedEvent; +import de.tudarmstadt.ukp.inception.schema.event.LayerConfigurationChangedEvent; @Component public class LayerConfigurationChangedEventAdapter diff --git a/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/TagEventAdapter.java b/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/TagEventAdapter.java index 60a8744ee9a..a880b5d36d0 100644 --- a/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/TagEventAdapter.java +++ b/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/TagEventAdapter.java @@ -23,9 +23,9 @@ import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; -import de.tudarmstadt.ukp.clarin.webanno.api.event.TagEvent; import de.tudarmstadt.ukp.clarin.webanno.support.JSONUtil; import de.tudarmstadt.ukp.inception.log.model.TagDetails; +import de.tudarmstadt.ukp.inception.schema.event.TagEvent; @Component public class TagEventAdapter 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 83774c57023..91a28fee522 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 @@ -84,9 +84,6 @@ 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; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature_; @@ -113,6 +110,9 @@ import de.tudarmstadt.ukp.inception.schema.adapter.IllegalFeatureValueException; import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; +import de.tudarmstadt.ukp.inception.schema.event.TagCreatedEvent; +import de.tudarmstadt.ukp.inception.schema.event.TagDeletedEvent; +import de.tudarmstadt.ukp.inception.schema.event.TagUpdatedEvent; import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; diff --git a/inception/inception-search-core/pom.xml b/inception/inception-search-core/pom.xml index 59ec7c8aff2..534425d60e2 100644 --- a/inception/inception-search-core/pom.xml +++ b/inception/inception-search-core/pom.xml @@ -37,10 +37,6 @@ de.tudarmstadt.ukp.inception.app inception-preferences - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-project-api diff --git a/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/SearchServiceImpl.java b/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/SearchServiceImpl.java index 001324d1a22..4378e436653 100644 --- a/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/SearchServiceImpl.java +++ b/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/SearchServiceImpl.java @@ -54,7 +54,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.event.TransactionalEventListener; -import de.tudarmstadt.ukp.clarin.webanno.api.event.LayerConfigurationChangedEvent; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; @@ -72,6 +71,7 @@ import de.tudarmstadt.ukp.inception.project.api.event.BeforeProjectRemovedEvent; import de.tudarmstadt.ukp.inception.scheduling.SchedulingService; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.event.LayerConfigurationChangedEvent; import de.tudarmstadt.ukp.inception.search.config.SearchServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.search.config.SearchServiceProperties; import de.tudarmstadt.ukp.inception.search.index.IndexRebuildRequiredException; 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 bbb473c0d9b..c9b5b5e600a 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 @@ -55,7 +55,6 @@ import org.apache.wicket.spring.injection.annot.SpringBean; 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; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -67,6 +66,7 @@ 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.event.LayerConfigurationChangedEvent; import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.schema.feature.FeatureType; 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 2720b68c009..a2b133b2aed 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 @@ -56,7 +56,6 @@ import org.apache.wicket.util.resource.IResourceStream; 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; import de.tudarmstadt.ukp.clarin.webanno.support.bootstrap.BootstrapModalDialog; @@ -74,6 +73,7 @@ import de.tudarmstadt.ukp.inception.export.LayerImportExportUtils; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.event.LayerConfigurationChangedEvent; import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; import de.tudarmstadt.ukp.inception.schema.layer.LayerType; 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 30a1ec6dd6f..a2611eb3d02 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,7 +74,6 @@ import org.slf4j.LoggerFactory; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; -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; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -96,6 +95,7 @@ import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.event.LayerConfigurationChangedEvent; import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; import de.tudarmstadt.ukp.inception.support.help.DocLink; diff --git a/inception/inception-websocket/pom.xml b/inception/inception-websocket/pom.xml index ae78adefd17..00dcbec4351 100644 --- a/inception/inception-websocket/pom.xml +++ b/inception/inception-websocket/pom.xml @@ -209,11 +209,6 @@ inception-annotation-storage test - - de.tudarmstadt.ukp.inception.app - inception-api - test - de.tudarmstadt.ukp.inception.app inception-export diff --git a/inception/inception-workload-dynamic/pom.xml b/inception/inception-workload-dynamic/pom.xml index 6ba2435c9ef..854a345049e 100644 --- a/inception/inception-workload-dynamic/pom.xml +++ b/inception/inception-workload-dynamic/pom.xml @@ -57,10 +57,6 @@ de.tudarmstadt.ukp.inception.app inception-api-schema - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-security @@ -247,6 +243,11 @@ inception-documents test + + de.tudarmstadt.ukp.inception.app + inception-api + test + diff --git a/inception/inception-workload-matrix/pom.xml b/inception/inception-workload-matrix/pom.xml index 3bb84d71511..c9d5a314c15 100644 --- a/inception/inception-workload-matrix/pom.xml +++ b/inception/inception-workload-matrix/pom.xml @@ -26,10 +26,6 @@ inception-workload-matrix INCEpTION - Workload Management - Matrix - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-project-api @@ -240,6 +236,11 @@ dkpro-core-api-ner-asl test + + de.tudarmstadt.ukp.inception.app + inception-api + test + From d6f3c715ed8084dfa6086cdb082ad1992e2f17bd Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Mon, 20 Nov 2023 21:10:53 +0100 Subject: [PATCH 27/53] #4316 - Dissolve generic API module - Move DocumentImportExportService interface to appropriate module --- inception/inception-api-annotation/pom.xml | 4 +++ .../export/ExportDocumentDialogContent.java | 2 +- inception/inception-api/pom.xml | 24 ----------------- .../CurationServiceAutoConfiguration.java | 2 +- .../export/CuratedDocumentsExporter.java | 2 +- .../export/CuratedDocumentsExporterTest.java | 2 +- .../CurationDocumentServiceImplTest.java | 2 +- inception/inception-documents/pom.xml | 4 --- .../documents/DocumentServiceImpl.java | 2 +- .../DocumentServiceAutoConfiguration.java | 2 +- .../DocumentServiceImplConcurrencyTest.java | 2 +- inception/inception-export-api/pom.xml | 26 +++++++------------ .../export}/DocumentImportExportService.java | 2 +- inception/inception-export/pom.xml | 4 --- .../DocumentImportExportServiceImpl.java | 2 +- ...tImportExportServiceAutoConfiguration.java | 2 +- inception/inception-external-editor/pom.xml | 2 +- .../XmlDocumentViewControllerImplBase.java | 2 +- .../XHtmlXmlDocumentViewControllerImpl.java | 2 +- .../xml/XmlDocumentViewControllerImpl.java | 2 +- inception/inception-guidelines/pom.xml | 4 --- .../settings/ImportGuidelinesPanel.java | 2 +- inception/inception-io-json/pom.xml | 2 +- .../io/jsoncas/UimaJsonCasFormatSupport.java | 2 +- .../UimaJsonCasSupportAutoConfiguration.java | 2 +- .../EventRepositoryImplIntegrationTest.java | 2 +- inception/inception-project-export/pom.xml | 4 --- .../legacy/LegacyProjectExportPanel.java | 2 +- .../export/settings/FormatDropdownChoice.java | 2 +- .../backup/BackupProjectExporterPanel.java | 2 +- .../CuratedDocumentsProjectExportTask.java | 2 +- .../AnnotationDocumentsExporterTest.java | 2 +- inception/inception-remote/pom.xml | 4 --- .../remoteapi/LegacyRemoteApiController.java | 2 +- .../aero/AeroRemoteApiController.java | 2 +- ...otationSchemaServiceAutoConfiguration.java | 2 +- .../exporters/AnnotationDocumentExporter.java | 2 +- .../DocumentServiceImplDatabaseTest.java | 2 +- .../AnnotationSchemaServiceImplTest.java | 2 +- .../inception-ui-external-search/pom.xml | 2 +- .../ExternalSearchAnnotationSidebar.java | 2 +- .../casdoctor/ProjectCasDoctorPanel.java | 2 +- .../documents/ImportDocumentsPanel.java | 2 +- .../documents/SourceDocumentTable.java | 2 +- inception/inception-workload-dynamic/pom.xml | 5 ++++ .../DynamicWorkloadExtensionImpl2Test.java | 2 +- .../DynamicWorkloadExtensionImplTest.java | 2 +- inception/inception-workload-matrix/pom.xml | 5 ++++ .../MatrixWorkloadExtensionImplTest.java | 2 +- 49 files changed, 63 insertions(+), 99 deletions(-) rename inception/{inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api => inception-export-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export}/DocumentImportExportService.java (99%) diff --git a/inception/inception-api-annotation/pom.xml b/inception/inception-api-annotation/pom.xml index 9fc01f3bf05..211db3e053d 100644 --- a/inception/inception-api-annotation/pom.xml +++ b/inception/inception-api-annotation/pom.xml @@ -47,6 +47,10 @@ de.tudarmstadt.ukp.inception.app inception-api + + de.tudarmstadt.ukp.inception.app + inception-export-api + de.tudarmstadt.ukp.inception.app inception-project-api diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/actionbar/export/ExportDocumentDialogContent.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/actionbar/export/ExportDocumentDialogContent.java index 72a5edd4530..8972d035b0a 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/actionbar/export/ExportDocumentDialogContent.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/actionbar/export/ExportDocumentDialogContent.java @@ -41,7 +41,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.format.FormatSupport; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxFormComponentUpdatingBehavior; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxLink; diff --git a/inception/inception-api/pom.xml b/inception/inception-api/pom.xml index 05ddee9c019..338d82d9902 100644 --- a/inception/inception-api/pom.xml +++ b/inception/inception-api/pom.xml @@ -25,28 +25,10 @@ inception-api INCEpTION - Core - API - - de.tudarmstadt.ukp.inception.app - inception-api-formats - de.tudarmstadt.ukp.inception.app inception-model - - de.tudarmstadt.ukp.inception.app - inception-support - - - - org.apache.commons - commons-lang3 - - - - org.apache.uima - uimaj-core - @@ -58,12 +40,6 @@ spring-boot - - - org.apache.wicket - wicket-core - - org.dkpro.core dkpro-core-api-segmentation-asl diff --git a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/config/CurationServiceAutoConfiguration.java b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/config/CurationServiceAutoConfiguration.java index 9b220c95d58..8851894f6eb 100644 --- a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/config/CurationServiceAutoConfiguration.java +++ b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/config/CurationServiceAutoConfiguration.java @@ -28,8 +28,8 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.inception.curation.export.CuratedDocumentsExporter; import de.tudarmstadt.ukp.inception.curation.export.CurationWorkflowExporter; import de.tudarmstadt.ukp.inception.curation.merge.DefaultMergeStrategyFactory; diff --git a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporter.java b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporter.java index f38ffc73f4e..eb726305ee9 100644 --- a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporter.java +++ b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporter.java @@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.export.FullProjectExportRequest; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportException; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportTaskMonitor; diff --git a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporterTest.java b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporterTest.java index 97d22eb6e0e..1bcb1bf2c51 100644 --- a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporterTest.java +++ b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporterTest.java @@ -40,8 +40,8 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectImportRequest; import de.tudarmstadt.ukp.clarin.webanno.diag.ChecksRegistry; import de.tudarmstadt.ukp.clarin.webanno.diag.RepairsRegistry; diff --git a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/service/CurationDocumentServiceImplTest.java b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/service/CurationDocumentServiceImplTest.java index b809e1bc8f9..1d41dd4d714 100644 --- a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/service/CurationDocumentServiceImplTest.java +++ b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/service/CurationDocumentServiceImplTest.java @@ -40,8 +40,8 @@ import org.springframework.context.annotation.Import; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; import de.tudarmstadt.ukp.clarin.webanno.model.Project; diff --git a/inception/inception-documents/pom.xml b/inception/inception-documents/pom.xml index 17098a936fb..5b53bb883fa 100644 --- a/inception/inception-documents/pom.xml +++ b/inception/inception-documents/pom.xml @@ -66,10 +66,6 @@ de.tudarmstadt.ukp.inception.app inception-model - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-project-api diff --git a/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/DocumentServiceImpl.java b/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/DocumentServiceImpl.java index 4e24aebff70..f1aea258b8f 100644 --- a/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/DocumentServiceImpl.java +++ b/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/DocumentServiceImpl.java @@ -102,11 +102,11 @@ import org.springframework.context.event.EventListener; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasAccessMode; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasUpgradeMode; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.ConcurentCasModificationException; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentStateChangeFlag; diff --git a/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/config/DocumentServiceAutoConfiguration.java b/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/config/DocumentServiceAutoConfiguration.java index 3cbda5ae59e..7ad89d5ec02 100644 --- a/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/config/DocumentServiceAutoConfiguration.java +++ b/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/config/DocumentServiceAutoConfiguration.java @@ -24,8 +24,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.inception.documents.DocumentAccess; import de.tudarmstadt.ukp.inception.documents.DocumentAccessImpl; diff --git a/inception/inception-documents/src/test/java/de/tudarmstadt/ukp/inception/documents/DocumentServiceImplConcurrencyTest.java b/inception/inception-documents/src/test/java/de/tudarmstadt/ukp/inception/documents/DocumentServiceImplConcurrencyTest.java index cc3ab9488ba..aa6b9283067 100644 --- a/inception/inception-documents/src/test/java/de/tudarmstadt/ukp/inception/documents/DocumentServiceImplConcurrencyTest.java +++ b/inception/inception-documents/src/test/java/de/tudarmstadt/ukp/inception/documents/DocumentServiceImplConcurrencyTest.java @@ -59,8 +59,8 @@ import org.slf4j.MDC; import org.springframework.context.ApplicationEventPublisher; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; diff --git a/inception/inception-export-api/pom.xml b/inception/inception-export-api/pom.xml index 8bbc69596c4..c67fb5c229f 100644 --- a/inception/inception-export-api/pom.xml +++ b/inception/inception-export-api/pom.xml @@ -50,21 +50,15 @@ org.apache.commons commons-lang3 + + + org.apache.uima + uimaj-core + + + + org.apache.wicket + wicket-core + - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - de.tudarmstadt.ukp.inception.app:inception-api-formats - - - - - - \ No newline at end of file diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/DocumentImportExportService.java b/inception/inception-export-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/DocumentImportExportService.java similarity index 99% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/DocumentImportExportService.java rename to inception/inception-export-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/DocumentImportExportService.java index 691c2feed6d..b635583468d 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/DocumentImportExportService.java +++ b/inception/inception-export-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/export/DocumentImportExportService.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.clarin.webanno.api; +package de.tudarmstadt.ukp.clarin.webanno.api.export; import java.io.File; import java.io.IOException; diff --git a/inception/inception-export/pom.xml b/inception/inception-export/pom.xml index fc354c32cce..d692bf1095e 100644 --- a/inception/inception-export/pom.xml +++ b/inception/inception-export/pom.xml @@ -33,10 +33,6 @@ de.tudarmstadt.ukp.inception.app inception-export-api - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-documents-api diff --git a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/DocumentImportExportServiceImpl.java b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/DocumentImportExportServiceImpl.java index e6226639894..482b08e090d 100644 --- a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/DocumentImportExportServiceImpl.java +++ b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/DocumentImportExportServiceImpl.java @@ -76,9 +76,9 @@ import org.springframework.core.annotation.AnnotationAwareOrderComparator; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.util.WebAnnoCasUtil; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.format.FormatSupport; import de.tudarmstadt.ukp.clarin.webanno.diag.CasDoctor; import de.tudarmstadt.ukp.clarin.webanno.diag.ChecksRegistry; diff --git a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/config/DocumentImportExportServiceAutoConfiguration.java b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/config/DocumentImportExportServiceAutoConfiguration.java index 24b232212b5..5ce21fcf59e 100644 --- a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/config/DocumentImportExportServiceAutoConfiguration.java +++ b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/config/DocumentImportExportServiceAutoConfiguration.java @@ -24,8 +24,8 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.format.FormatSupport; import de.tudarmstadt.ukp.clarin.webanno.diag.ChecksRegistry; import de.tudarmstadt.ukp.clarin.webanno.diag.RepairsRegistry; diff --git a/inception/inception-external-editor/pom.xml b/inception/inception-external-editor/pom.xml index 87d24fb4296..b19643e2cda 100644 --- a/inception/inception-external-editor/pom.xml +++ b/inception/inception-external-editor/pom.xml @@ -27,7 +27,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-export-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/XmlDocumentViewControllerImplBase.java b/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/XmlDocumentViewControllerImplBase.java index 2602b303856..9296e9d9345 100644 --- a/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/XmlDocumentViewControllerImplBase.java +++ b/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/XmlDocumentViewControllerImplBase.java @@ -22,7 +22,7 @@ import org.xml.sax.ContentHandler; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorRegistry; import de.tudarmstadt.ukp.inception.externaleditor.policy.DefaultHtmlDocumentPolicy; diff --git a/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xhtml/XHtmlXmlDocumentViewControllerImpl.java b/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xhtml/XHtmlXmlDocumentViewControllerImpl.java index 32a2cf0e083..0a3b76b6897 100644 --- a/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xhtml/XHtmlXmlDocumentViewControllerImpl.java +++ b/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xhtml/XHtmlXmlDocumentViewControllerImpl.java @@ -51,7 +51,7 @@ import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.ServletContextUtils; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; diff --git a/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xml/XmlDocumentViewControllerImpl.java b/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xml/XmlDocumentViewControllerImpl.java index 256a81ef968..60cdfb2e46b 100644 --- a/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xml/XmlDocumentViewControllerImpl.java +++ b/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xml/XmlDocumentViewControllerImpl.java @@ -43,7 +43,7 @@ import org.springframework.web.bind.annotation.RestController; import org.xml.sax.helpers.AttributesImpl; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.editor.AnnotationEditorRegistry; diff --git a/inception/inception-guidelines/pom.xml b/inception/inception-guidelines/pom.xml index 25f7ed1c076..d75820e6286 100644 --- a/inception/inception-guidelines/pom.xml +++ b/inception/inception-guidelines/pom.xml @@ -61,10 +61,6 @@ de.tudarmstadt.ukp.inception.app inception-export-api - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-project-api diff --git a/inception/inception-guidelines/src/main/java/de/tudarmstadt/ukp/inception/guidelines/settings/ImportGuidelinesPanel.java b/inception/inception-guidelines/src/main/java/de/tudarmstadt/ukp/inception/guidelines/settings/ImportGuidelinesPanel.java index 7ea0e479350..398eec7fe17 100644 --- a/inception/inception-guidelines/src/main/java/de/tudarmstadt/ukp/inception/guidelines/settings/ImportGuidelinesPanel.java +++ b/inception/inception-guidelines/src/main/java/de/tudarmstadt/ukp/inception/guidelines/settings/ImportGuidelinesPanel.java @@ -36,7 +36,7 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.spring.injection.annot.SpringBean; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.bootstrap.BootstrapFileInputField; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxButton; diff --git a/inception/inception-io-json/pom.xml b/inception/inception-io-json/pom.xml index f55da186c95..9edf868e9cd 100644 --- a/inception/inception-io-json/pom.xml +++ b/inception/inception-io-json/pom.xml @@ -35,7 +35,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-export-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-io-json/src/main/java/de/tudarmstadt/ukp/inception/io/jsoncas/UimaJsonCasFormatSupport.java b/inception/inception-io-json/src/main/java/de/tudarmstadt/ukp/inception/io/jsoncas/UimaJsonCasFormatSupport.java index 6e05c8dad31..57ed4fde945 100644 --- a/inception/inception-io-json/src/main/java/de/tudarmstadt/ukp/inception/io/jsoncas/UimaJsonCasFormatSupport.java +++ b/inception/inception-io-json/src/main/java/de/tudarmstadt/ukp/inception/io/jsoncas/UimaJsonCasFormatSupport.java @@ -34,7 +34,7 @@ import org.apache.uima.util.TypeSystemUtil; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.format.FormatSupport; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.inception.schema.service.AnnotationSchemaServiceImpl; diff --git a/inception/inception-io-json/src/main/java/de/tudarmstadt/ukp/inception/io/jsoncas/config/UimaJsonCasSupportAutoConfiguration.java b/inception/inception-io-json/src/main/java/de/tudarmstadt/ukp/inception/io/jsoncas/config/UimaJsonCasSupportAutoConfiguration.java index c4b3256f651..90ecd724007 100644 --- a/inception/inception-io-json/src/main/java/de/tudarmstadt/ukp/inception/io/jsoncas/config/UimaJsonCasSupportAutoConfiguration.java +++ b/inception/inception-io-json/src/main/java/de/tudarmstadt/ukp/inception/io/jsoncas/config/UimaJsonCasSupportAutoConfiguration.java @@ -22,7 +22,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.inception.io.jsoncas.LegacyUimaJsonFormatSupport; import de.tudarmstadt.ukp.inception.io.jsoncas.UimaJsonCasFormatSupport; diff --git a/inception/inception-log/src/test/java/de/tudarmstadt/ukp/inception/log/EventRepositoryImplIntegrationTest.java b/inception/inception-log/src/test/java/de/tudarmstadt/ukp/inception/log/EventRepositoryImplIntegrationTest.java index 3dcf52bbe65..7ae1aa5fff9 100644 --- a/inception/inception-log/src/test/java/de/tudarmstadt/ukp/inception/log/EventRepositoryImplIntegrationTest.java +++ b/inception/inception-log/src/test/java/de/tudarmstadt/ukp/inception/log/EventRepositoryImplIntegrationTest.java @@ -45,8 +45,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.config.ProjectServiceAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.security.config.SecurityAutoConfiguration; diff --git a/inception/inception-project-export/pom.xml b/inception/inception-project-export/pom.xml index 0526fc222b1..a2ac1443134 100644 --- a/inception/inception-project-export/pom.xml +++ b/inception/inception-project-export/pom.xml @@ -50,10 +50,6 @@ de.tudarmstadt.ukp.inception.app inception-websocket - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-documents-api diff --git a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/legacy/LegacyProjectExportPanel.java b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/legacy/LegacyProjectExportPanel.java index 641bacee3b3..0be3a007852 100644 --- a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/legacy/LegacyProjectExportPanel.java +++ b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/legacy/LegacyProjectExportPanel.java @@ -41,7 +41,7 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.wicketstuff.progressbar.ProgressBar; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.export.FullProjectExportRequest; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportRequest_ImplBase; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportTaskHandle; diff --git a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/settings/FormatDropdownChoice.java b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/settings/FormatDropdownChoice.java index aeb8aaab43a..78441cd7851 100644 --- a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/settings/FormatDropdownChoice.java +++ b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/settings/FormatDropdownChoice.java @@ -29,7 +29,7 @@ import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.spring.injection.annot.SpringBean; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.export.FullProjectExportRequest; import de.tudarmstadt.ukp.clarin.webanno.api.format.FormatSupport; diff --git a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/task/backup/BackupProjectExporterPanel.java b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/task/backup/BackupProjectExporterPanel.java index 65971882afd..036ada1ccc0 100644 --- a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/task/backup/BackupProjectExporterPanel.java +++ b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/task/backup/BackupProjectExporterPanel.java @@ -25,7 +25,7 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.export.FullProjectExportRequest; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxFormComponentUpdatingBehavior; diff --git a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/task/curated/CuratedDocumentsProjectExportTask.java b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/task/curated/CuratedDocumentsProjectExportTask.java index cfa200d3d3b..665b62cf782 100644 --- a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/task/curated/CuratedDocumentsProjectExportTask.java +++ b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/task/curated/CuratedDocumentsProjectExportTask.java @@ -32,7 +32,7 @@ import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportException; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportTaskMonitor; import de.tudarmstadt.ukp.clarin.webanno.api.format.FormatSupport; diff --git a/inception/inception-project-export/src/test/java/de/tudarmstadt/ukp/inception/project/export/AnnotationDocumentsExporterTest.java b/inception/inception-project-export/src/test/java/de/tudarmstadt/ukp/inception/project/export/AnnotationDocumentsExporterTest.java index 34bd8c9238b..97ffcb0a5b9 100644 --- a/inception/inception-project-export/src/test/java/de/tudarmstadt/ukp/inception/project/export/AnnotationDocumentsExporterTest.java +++ b/inception/inception-project-export/src/test/java/de/tudarmstadt/ukp/inception/project/export/AnnotationDocumentsExporterTest.java @@ -37,7 +37,7 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectImportRequest; import de.tudarmstadt.ukp.clarin.webanno.diag.ChecksRegistry; import de.tudarmstadt.ukp.clarin.webanno.diag.RepairsRegistry; diff --git a/inception/inception-remote/pom.xml b/inception/inception-remote/pom.xml index 028e939c62f..8d923678e5c 100644 --- a/inception/inception-remote/pom.xml +++ b/inception/inception-remote/pom.xml @@ -61,10 +61,6 @@ de.tudarmstadt.ukp.inception.app inception-ui-core - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-project-api diff --git a/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/LegacyRemoteApiController.java b/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/LegacyRemoteApiController.java index 84fcf250b19..c9ba256a7b4 100644 --- a/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/LegacyRemoteApiController.java +++ b/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/LegacyRemoteApiController.java @@ -59,7 +59,7 @@ import com.github.openjson.JSONArray; import com.github.openjson.JSONObject; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.format.FormatSupport; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; diff --git a/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/aero/AeroRemoteApiController.java b/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/aero/AeroRemoteApiController.java index ecb3b0e4509..01d00e185c5 100644 --- a/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/aero/AeroRemoteApiController.java +++ b/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/aero/AeroRemoteApiController.java @@ -89,7 +89,7 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.util.UriComponentsBuilder; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.export.FullProjectExportRequest; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportTaskMonitor; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectImportRequest; diff --git a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/config/AnnotationSchemaServiceAutoConfiguration.java b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/config/AnnotationSchemaServiceAutoConfiguration.java index 6d86ed96004..c41d802e375 100644 --- a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/config/AnnotationSchemaServiceAutoConfiguration.java +++ b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/config/AnnotationSchemaServiceAutoConfiguration.java @@ -29,8 +29,8 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.inception.annotation.feature.bool.BooleanFeatureSupport; import de.tudarmstadt.ukp.inception.annotation.feature.link.LinkFeatureSupport; diff --git a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/AnnotationDocumentExporter.java b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/AnnotationDocumentExporter.java index 504fd883f10..e0be9d772e8 100644 --- a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/AnnotationDocumentExporter.java +++ b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/AnnotationDocumentExporter.java @@ -68,7 +68,7 @@ import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.export.FullProjectExportRequest; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportException; import de.tudarmstadt.ukp.clarin.webanno.api.export.ProjectExportTaskMonitor; diff --git a/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/documents/service/DocumentServiceImplDatabaseTest.java b/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/documents/service/DocumentServiceImplDatabaseTest.java index 00b3085bb91..09990d44272 100644 --- a/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/documents/service/DocumentServiceImplDatabaseTest.java +++ b/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/documents/service/DocumentServiceImplDatabaseTest.java @@ -43,8 +43,8 @@ import org.springframework.context.annotation.Import; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; import de.tudarmstadt.ukp.clarin.webanno.model.Project; diff --git a/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceImplTest.java b/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceImplTest.java index c5836649f32..eb7473f032f 100644 --- a/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceImplTest.java +++ b/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceImplTest.java @@ -44,8 +44,8 @@ import org.springframework.context.annotation.Import; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; diff --git a/inception/inception-ui-external-search/pom.xml b/inception/inception-ui-external-search/pom.xml index 6b66b7e7d85..2ce62eb9674 100644 --- a/inception/inception-ui-external-search/pom.xml +++ b/inception/inception-ui-external-search/pom.xml @@ -71,7 +71,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-export-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/sidebar/ExternalSearchAnnotationSidebar.java b/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/sidebar/ExternalSearchAnnotationSidebar.java index a3ae922710d..cd0a7568555 100644 --- a/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/sidebar/ExternalSearchAnnotationSidebar.java +++ b/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/sidebar/ExternalSearchAnnotationSidebar.java @@ -52,8 +52,8 @@ import org.slf4j.LoggerFactory; import org.wicketstuff.event.annotation.OnEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; diff --git a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/casdoctor/ProjectCasDoctorPanel.java b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/casdoctor/ProjectCasDoctorPanel.java index 656e7ecc3b3..66ecfb0a89b 100644 --- a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/casdoctor/ProjectCasDoctorPanel.java +++ b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/casdoctor/ProjectCasDoctorPanel.java @@ -47,8 +47,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasStorageService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.diag.CasDoctor; import de.tudarmstadt.ukp.clarin.webanno.diag.ChecksRegistry; import de.tudarmstadt.ukp.clarin.webanno.diag.RepairsRegistry; diff --git a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/ImportDocumentsPanel.java b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/ImportDocumentsPanel.java index 1ef395365b6..3a6959964b6 100644 --- a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/ImportDocumentsPanel.java +++ b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/ImportDocumentsPanel.java @@ -44,7 +44,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.format.FormatSupport; import de.tudarmstadt.ukp.clarin.webanno.diag.CasDoctorException; import de.tudarmstadt.ukp.clarin.webanno.model.Project; diff --git a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/SourceDocumentTable.java b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/SourceDocumentTable.java index 78809381fd1..f6079a13931 100644 --- a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/SourceDocumentTable.java +++ b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/SourceDocumentTable.java @@ -59,7 +59,7 @@ import org.wicketstuff.event.annotation.OnEvent; import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.CssClassNameAppender; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.format.FormatSupport; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.clarin.webanno.support.bootstrap.BootstrapModalDialog; diff --git a/inception/inception-workload-dynamic/pom.xml b/inception/inception-workload-dynamic/pom.xml index 854a345049e..f5a563d2402 100644 --- a/inception/inception-workload-dynamic/pom.xml +++ b/inception/inception-workload-dynamic/pom.xml @@ -217,6 +217,11 @@ inception-schema test + + de.tudarmstadt.ukp.inception.app + inception-export-api + test + org.springframework.boot spring-boot-starter-data-jpa diff --git a/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImpl2Test.java b/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImpl2Test.java index 4cd388d5e53..28cb2e99b7c 100644 --- a/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImpl2Test.java +++ b/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImpl2Test.java @@ -44,8 +44,8 @@ import org.springframework.security.core.session.SessionRegistry; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; import de.tudarmstadt.ukp.clarin.webanno.model.Project; diff --git a/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImplTest.java b/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImplTest.java index 3afc98f011a..d8945ad00c5 100644 --- a/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImplTest.java +++ b/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImplTest.java @@ -47,8 +47,8 @@ import org.springframework.context.annotation.Import; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; import de.tudarmstadt.ukp.clarin.webanno.model.Project; diff --git a/inception/inception-workload-matrix/pom.xml b/inception/inception-workload-matrix/pom.xml index c9d5a314c15..19fb7e68df2 100644 --- a/inception/inception-workload-matrix/pom.xml +++ b/inception/inception-workload-matrix/pom.xml @@ -185,6 +185,11 @@ inception-project test + + de.tudarmstadt.ukp.inception.app + inception-export-api + test + de.tudarmstadt.ukp.inception.app inception-annotation-storage diff --git a/inception/inception-workload-matrix/src/test/java/de/tudarmstadt/ukp/inception/workload/matrix/MatrixWorkloadExtensionImplTest.java b/inception/inception-workload-matrix/src/test/java/de/tudarmstadt/ukp/inception/workload/matrix/MatrixWorkloadExtensionImplTest.java index 21c81e0bd6f..9305b998ee6 100644 --- a/inception/inception-workload-matrix/src/test/java/de/tudarmstadt/ukp/inception/workload/matrix/MatrixWorkloadExtensionImplTest.java +++ b/inception/inception-workload-matrix/src/test/java/de/tudarmstadt/ukp/inception/workload/matrix/MatrixWorkloadExtensionImplTest.java @@ -40,8 +40,8 @@ import org.springframework.context.annotation.Import; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; +import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; From fd67c0539a24cd71fc4eb79eb664af4492363a61 Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Mon, 20 Nov 2023 21:23:33 +0100 Subject: [PATCH 28/53] #4316 - Dissolve generic API module - Move TransientAnnotationStateChangedEvent interface to appropriate module --- inception/inception-diam/pom.xml | 4 ++++ .../ukp/inception/diam/service/DiamWebsocketController.java | 6 +++--- .../api/event/TransientAnnotationStateChangedEvent.java | 2 +- .../recommendation/event/PredictionsSwitchedEvent.java | 2 +- .../recommendation/event/RecommendationRejectedEvent.java | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) rename inception/{inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno => inception-recommendation-api/src/main/java/de/tudarmstadt/ukp/inception/recommendation}/api/event/TransientAnnotationStateChangedEvent.java (93%) diff --git a/inception/inception-diam/pom.xml b/inception/inception-diam/pom.xml index 902e27e656a..88205d9aaac 100644 --- a/inception/inception-diam/pom.xml +++ b/inception/inception-diam/pom.xml @@ -58,6 +58,10 @@ de.tudarmstadt.ukp.inception.app inception-api-render + + de.tudarmstadt.ukp.inception.app + inception-recommendation-api + de.tudarmstadt.ukp.inception.app inception-api-schema 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 f9833640e75..12dccb6b878 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 @@ -57,7 +57,6 @@ import com.github.benmanes.caffeine.cache.LoadingCache; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.preferences.UserPreferencesService; -import de.tudarmstadt.ukp.clarin.webanno.api.event.TransientAnnotationStateChangedEvent; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Mode; @@ -74,6 +73,7 @@ import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.documents.event.AfterCasWrittenEvent; import de.tudarmstadt.ukp.inception.project.api.ProjectService; +import de.tudarmstadt.ukp.inception.recommendation.api.event.TransientAnnotationStateChangedEvent; 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; @@ -190,13 +190,13 @@ private void closeViewport(ViewportDefinition aVpd) } @TransactionalEventListener(fallbackExecution = true) - public void afterAnnotationUpdate(AfterCasWrittenEvent aEvent) + public void onAfterCasWritten(AfterCasWrittenEvent aEvent) { sendUpdate(aEvent.getDocument()); } @EventListener - public void onRecommendationRejected(TransientAnnotationStateChangedEvent aEvent) + public void onTransientAnnotationStateChanged(TransientAnnotationStateChangedEvent aEvent) { var doc = aEvent.getDocument(); sendUpdate(doc.getProject().getId(), doc.getId(), aEvent.getUser(), 0, MAX_VALUE); diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/TransientAnnotationStateChangedEvent.java b/inception/inception-recommendation-api/src/main/java/de/tudarmstadt/ukp/inception/recommendation/api/event/TransientAnnotationStateChangedEvent.java similarity index 93% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/TransientAnnotationStateChangedEvent.java rename to inception/inception-recommendation-api/src/main/java/de/tudarmstadt/ukp/inception/recommendation/api/event/TransientAnnotationStateChangedEvent.java index f9a76297422..251114ccc24 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/event/TransientAnnotationStateChangedEvent.java +++ b/inception/inception-recommendation-api/src/main/java/de/tudarmstadt/ukp/inception/recommendation/api/event/TransientAnnotationStateChangedEvent.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.clarin.webanno.api.event; +package de.tudarmstadt.ukp.inception.recommendation.api.event; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/event/PredictionsSwitchedEvent.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/event/PredictionsSwitchedEvent.java index 129d4d4f75c..8e67817849c 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/event/PredictionsSwitchedEvent.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/event/PredictionsSwitchedEvent.java @@ -19,9 +19,9 @@ import org.springframework.context.ApplicationEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.event.TransientAnnotationStateChangedEvent; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.event.HybridApplicationUIEvent; +import de.tudarmstadt.ukp.inception.recommendation.api.event.TransientAnnotationStateChangedEvent; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; public class PredictionsSwitchedEvent diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/event/RecommendationRejectedEvent.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/event/RecommendationRejectedEvent.java index 189936e6c27..f97fc064a0e 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/event/RecommendationRejectedEvent.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/event/RecommendationRejectedEvent.java @@ -19,9 +19,9 @@ import org.springframework.context.ApplicationEvent; -import de.tudarmstadt.ukp.clarin.webanno.api.event.TransientAnnotationStateChangedEvent; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; +import de.tudarmstadt.ukp.inception.recommendation.api.event.TransientAnnotationStateChangedEvent; public class RecommendationRejectedEvent extends ApplicationEvent From e667086f58e674a9e74d90d46c6d72e4e19686b5 Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Mon, 20 Nov 2023 22:16:05 +0100 Subject: [PATCH 29/53] #4316 - Dissolve generic API module - Finally dissolve the module --- .../learning/ActiveLearningService.java | 2 +- .../learning/ActiveLearningServiceImpl.java | 6 +- .../ActiveLearningAutoConfiguration.java | 4 +- .../sidebar/ActiveLearningSidebar.java | 10 +- .../CohenKappaAgreementMeasure.java | 2 +- .../CohenKappaAgreementMeasureSupport.java | 2 +- .../FleissKappaAgreementMeasure.java | 2 +- .../FleissKappaAgreementMeasureSupport.java | 2 +- .../KrippendorffAlphaAgreementMeasure.java | 2 +- ...ppendorffAlphaAgreementMeasureSupport.java | 2 +- ...endorffAlphaUnitizingAgreementMeasure.java | 2 +- ...AlphaUnitizingAgreementMeasureSupport.java | 2 +- .../coding/PairwiseCodingAgreementTable.java | 2 +- .../PairwiseUnitizingAgreementTable.java | 2 +- .../AgreementMeasureTestSuite_ImplBase.java | 2 +- .../storage/CasStorageServiceImpl.java | 4 +- .../CasStorageServiceAutoConfiguration.java | 2 +- .../storage/CasStorageServiceImplTest.java | 2 +- inception/inception-api-annotation/pom.xml | 4 - .../ColoringRulesConfigurationPanel.java | 4 +- .../coloring/ColoringServiceImpl.java | 4 +- .../config/AnnotationAutoConfiguration.java | 6 +- .../exception/IllegalPlacementException.java | 2 +- .../exception/NotEditableException.java | 2 +- .../KeyBindingsConfigurationPanel.java | 8 +- .../keybindings/KeyBindingsPanel.java | 6 +- .../annotation/page/AnnotationPageBase.java | 8 +- .../AnnotationPreferencesDialogContent.java | 6 +- .../UserPreferencesServiceImpl.java | 6 +- .../annotation/rendering/ColorRenderer.java | 4 +- .../annotation/rendering/LabelRenderer.java | 2 +- .../api/annotation/rendering/NopRenderer.java | 6 +- .../annotation/rendering/PreRendererImpl.java | 8 +- .../rendering/Renderer_ImplBase.java | 6 +- .../feature/bool/BooleanFeatureEditor.java | 2 +- .../feature/bool/BooleanFeatureSupport.java | 4 +- .../feature/link/LinkFeatureDeletedEvent.java | 4 +- .../feature/link/LinkFeatureEditor.java | 20 +- .../feature/link/LinkFeatureEvent.java | 6 +- .../feature/link/LinkFeatureSupport.java | 12 +- .../feature/link/LinkFeatureTraitsEditor.java | 4 +- .../UimaPrimitiveFeatureSupport_ImplBase.java | 2 +- .../MultiSelectTextFeatureEditor.java | 8 +- .../MultiValueStringFeatureSupport.java | 8 +- .../MultiValueStringFeatureTraitsEditor.java | 4 +- .../feature/number/NumberFeatureEditor.java | 4 +- .../feature/number/NumberFeatureSupport.java | 4 +- .../number/NumberFeatureTraitsEditor.java | 4 +- .../feature/number/RatingFeatureEditor.java | 4 +- .../KendoComboboxTextFeatureEditor.java | 2 +- .../string/RadioGroupStringFeatureEditor.java | 2 +- .../feature/string/StringFeatureSupport.java | 8 +- .../string/StringFeatureTraitsEditor.java | 4 +- .../feature/string/TextFeatureEditorBase.java | 6 +- .../layer/LayerTraitsEditor_ImplBase.java | 4 +- .../layer/TypeAdapter_ImplBase.java | 12 +- .../layer/behaviors/LayerBehavior.java | 4 +- .../behaviors/LayerBehaviorRegistry.java | 2 +- .../behaviors/LayerBehaviorRegistryImpl.java | 2 +- .../behaviors/LayerSupportRegistryImpl.java | 6 +- .../annotation/layer/chain/ChainAdapter.java | 10 +- .../layer/chain/ChainLayerSupport.java | 6 +- .../layer/chain/ChainLayerTraitsEditor.java | 2 +- .../annotation/layer/chain/ChainRenderer.java | 6 +- .../layer/relation/RelationAdapter.java | 8 +- .../RelationCrossSentenceBehavior.java | 4 +- .../layer/relation/RelationLayerBehavior.java | 6 +- .../layer/relation/RelationLayerSupport.java | 6 +- .../relation/RelationLayerTraitsEditor.java | 2 +- .../relation/RelationOverlapBehavior.java | 6 +- .../layer/relation/RelationRenderer.java | 4 +- .../annotation/layer/span/SpanAdapter.java | 6 +- .../layer/span/SpanAnchoringModeBehavior.java | 6 +- .../layer/span/SpanCrossSentenceBehavior.java | 6 +- .../layer/span/SpanLayerBehavior.java | 6 +- .../layer/span/SpanLayerSupport.java | 6 +- .../layer/span/SpanLayerTraitsEditor.java | 2 +- .../layer/span/SpanOverlapBehavior.java | 8 +- .../annotation/layer/span/SpanRenderer.java | 6 +- .../editor/state/AnnotatorStateImpl.java | 6 +- .../feature/link/LinkFeatureSupportTest.java | 4 +- .../MultiValueStringFeatureSupportTest.java | 2 +- .../string/StringFeatureSupportTest.java | 2 +- .../layer/chain/ChainAdapterTest.java | 6 +- .../layer/relation/RelationAdapterTest.java | 6 +- .../layer/relation/RelationRendererTest.java | 2 +- .../layer/span/SpanAdapterTest.java | 6 +- .../layer/span/SpanRendererTest.java | 4 +- inception/inception-api-editor/pom.xml | 4 - .../editor/AnnotationEditorBase.java | 4 +- .../editor/AnnotationEditorExtension.java | 2 +- .../AnnotationEditorExtensionRegistry.java | 2 +- ...AnnotationEditorExtensionRegistryImpl.java | 2 +- inception/inception-api-render/pom.xml | 4 - .../editorstate/LayerSelectionState.java | 4 +- inception/inception-api-schema/pom.xml | 5 + .../action/AnnotationActionHandler.java | 2 +- .../ukp/inception/rendering/Renderer.java | 6 +- .../{ => api}/AnnotationSchemaService.java | 14 +- .../schema/{ => api}/AttachedAnnotation.java | 2 +- .../adapter/AnnotationComparator.java | 2 +- .../adapter/AnnotationComparisonUtils.java | 2 +- .../adapter/AnnotationException.java | 2 +- .../{ => api}/adapter/FeatureFilter.java | 2 +- .../adapter/IllegalFeatureValueException.java | 2 +- .../schema/{ => api}/adapter/TypeAdapter.java | 8 +- .../config/AnnotationSchemaProperties.java | 2 +- .../event/LayerConfigurationChangedEvent.java | 2 +- .../{ => api}/event/TagCreatedEvent.java | 2 +- .../{ => api}/event/TagDeletedEvent.java | 2 +- .../schema/{ => api}/event/TagEvent.java | 2 +- .../{ => api}/event/TagUpdatedEvent.java | 2 +- .../{ => api}/feature/FeatureEditor.java | 2 +- .../{ => api}/feature/FeatureEditorEvent.java | 2 +- .../FeatureEditorValueChangedEvent.java | 2 +- .../{ => api}/feature/FeatureSupport.java | 8 +- .../feature/FeatureSupportRegistry.java | 2 +- .../schema/{ => api}/feature/FeatureType.java | 2 +- .../schema/{ => api}/feature/FeatureUtil.java | 2 +- .../{ => api}/feature/LinkWithRoleModel.java | 2 +- .../schema/{ => api}/feature/TypeUtil.java | 4 +- .../schema/{ => api}/layer/LayerSupport.java | 6 +- .../{ => api}/layer/LayerSupportRegistry.java | 2 +- .../layer/LayerSupport_ImplBase.java | 6 +- .../schema/{ => api}/layer/LayerType.java | 2 +- .../{ => api}/validation/ValidationUtils.java | 2 +- inception/inception-api/LICENSE.txt | 202 ------------------ inception/inception-api/pom.xml | 48 ----- .../AnnotationSchemaAutoConfiguration.java | 28 --- .../main/resources/META-INF/spring.factories | 2 - inception/inception-bom/pom.xml | 5 - ...ntenceOrientedAnnotationEditorFactory.java | 2 +- ...BratAnnotationEditorAutoConfiguration.java | 2 +- .../brat/schema/BratSchemaGeneratorImpl.java | 2 +- .../brat/render/BratSerializerImplTest.java | 2 +- ...EntityLinkingServiceAutoConfiguration.java | 2 +- .../recommender/NamedEntityLinker.java | 2 +- .../recommender/NamedEntityLinkerFactory.java | 2 +- .../conceptlinking/NamedEntityLinkerTest.java | 4 +- .../webanno/curation/casdiff/CasDiff.java | 2 +- .../casdiff/api/CasDiffException.java | 2 +- inception/inception-curation/pom.xml | 4 - ...ationDocumentServiceAutoConfiguration.java | 2 +- .../CurationServiceAutoConfiguration.java | 4 +- .../merge/AlreadyMergedException.java | 2 +- .../inception/curation/merge/CasMerge.java | 14 +- .../curation/merge/CasMergeException.java | 2 +- .../merge/MergeConflictException.java | 2 +- .../UnfulfilledPrerequisitesException.java | 2 +- .../service/CurationDocumentServiceImpl.java | 2 +- .../service/CurationMergeServiceImpl.java | 2 +- .../export/CuratedDocumentsExporterTest.java | 2 +- .../merge/CasDiffLinkFeaturesTest.java | 2 +- .../curation/merge/CasMergeLinkTest.java | 2 +- .../curation/merge/CasMergeRelationTest.java | 2 +- .../curation/merge/CasMergeRemergeTest.java | 2 +- .../curation/merge/CasMergeSpanTest.java | 4 +- .../curation/merge/CasMergeTestBase.java | 2 +- .../CurationDocumentServiceImplTest.java | 4 +- ...ationsStartAndEndWithinSentencesCheck.java | 2 +- .../diag/checks/DanglingRelationsCheck.java | 2 +- ...chedSpanAnnotationsTrulyAttachedCheck.java | 2 +- .../LinksReachableThroughChainsCheck.java | 2 +- .../NoMultipleIncomingRelationsCheck.java | 2 +- .../diag/checks/RelationOffsetsCheck.java | 2 +- .../config/CasDoctorAutoConfiguration.java | 2 +- ...dSpanAnnotationsAndDeleteExtrasRepair.java | 2 +- ...hFeatureAttachedSpanAnnotationsRepair.java | 2 +- ...xFeatureAttachedSpanAnnotationsRepair.java | 2 +- .../diag/repairs/RelationOffsetsRepair.java | 2 +- .../RemoveDanglingChainLinksRepair.java | 2 +- ...gFeatureAttachedSpanAnnotationsRepair.java | 2 +- .../RemoveDanglingRelationsRepair.java | 2 +- .../diag/repairs/UpgradeCasRepair.java | 2 +- ...nsStartAndEndWithinSentencesCheckTest.java | 2 +- .../NoMultipleIncomingRelationsCheckTest.java | 2 +- inception/inception-diam-compactv2/pom.xml | 2 +- .../compactv2/CompactSerializerV2Impl.java | 2 +- .../config/DiamCompactV2AutoConfig.java | 2 +- .../CompactSerializerV2ImplTest.java | 10 +- inception/inception-diam/pom.xml | 4 - .../CreateRelationAnnotationHandler.java | 2 +- .../actions/DeleteAnnotationHandler.java | 4 +- .../actions/EditorAjaxRequestHandlerBase.java | 2 +- .../FillSlotWithNewAnnotationHandler.java | 2 +- .../actions/MoveSpanAnnotationHandler.java | 4 +- .../actions/SelectAnnotationHandler.java | 4 +- .../diam/editor/config/DiamAutoConfig.java | 8 +- .../lazydetails/LazyDetailsLookupService.java | 2 +- .../LazyDetailsLookupServiceImpl.java | 8 +- .../inception/diam/messages/MAnnotation.java | 2 +- .../model/compact/CompactSerializerImpl.java | 2 +- .../diam/service/DiamWebsocketController.java | 2 +- .../DocumentImportExportServiceImpl.java | 2 +- .../ukp/inception/export/JsonImportUtil.java | 2 +- .../export/LayerImportExportUtils.java | 2 +- .../export/TagsetImportExportUtils.java | 2 +- ...tImportExportServiceAutoConfiguration.java | 2 +- .../DocumentImportExportServiceImplTest.java | 2 +- .../ExternalAnnotationEditorBase.java | 2 +- .../pubmed/PubMedCentralProvider.java | 2 +- .../pubmed/PubMedCentralProviderFactory.java | 2 +- ...edDocumentRepositoryAutoConfiguration.java | 2 +- .../pubmed/PubMedProviderTest.java | 2 +- .../feature/lookup/LookupFeatureEditor.java | 8 +- .../feature/lookup/LookupFeatureSupport.java | 6 +- .../lookup/LookupFeatureTraitsEditor.java | 4 +- .../config/ImageSupportAutoConfiguration.java | 2 +- .../image/feature/ImageFeatureEditor.java | 2 +- .../image/feature/ImageFeatureSupport.java | 6 +- .../inception/image/sidebar/ImageSidebar.java | 2 +- .../image/sidebar/ImageSidebarFactory.java | 2 +- ...tchingRelationRecommenderTraitsEditor.java | 2 +- .../config/FactLinkingAutoConfiguration.java | 2 +- .../feature/FactLinkingServiceImpl.java | 6 +- .../feature/PropertyFeatureEditor.java | 8 +- .../feature/PropertyFeatureSupport.java | 6 +- .../feature/QualifierFeatureEditor.java | 14 +- .../feature/SubjectObjectFeatureEditor.java | 14 +- .../feature/SubjectObjectFeatureSupport.java | 8 +- .../initializers/FactLayerInitializer.java | 2 +- .../SubjectObjectFeatureSupportTest.java | 2 +- ...KnowledgeBaseServiceAutoConfiguration.java | 2 +- .../kb/exporter/KnowledgeBaseExporter.java | 2 +- .../kb/KnowledgeBaseExporterTest.java | 2 +- ...MetadataLayerSupportAutoConfiguration.java | 8 +- ...reateDocumentMetadataAnnotationAction.java | 4 +- ...eleteDocumentMetadataAnnotationAction.java | 4 +- .../layer/DocumentMetadataLayerAdapter.java | 6 +- ...MetadataLayerSingletonCreatingWatcher.java | 6 +- .../layer/DocumentMetadataLayerSupport.java | 6 +- ...DocumentMetadataAnnotationDetailPanel.java | 14 +- ...umentMetadataAnnotationSelectionPanel.java | 12 +- .../DocumentMetadataSidebarFactory.java | 2 +- inception/inception-log/pom.xml | 5 - ...LayerConfigurationChangedEventAdapter.java | 2 +- .../log/adapter/TagEventAdapter.java | 2 +- .../EventRepositoryImplIntegrationTest.java | 4 +- .../pdfeditor/PdfAnnotationEditor.java | 4 +- .../pdfanno/PdfDocumentIFrameView.java | 2 +- .../pdfanno/model/PdfAnnoRendererTest.java | 4 +- .../pdfeditor2/PdfAnnotationEditor.java | 2 +- .../view/PdfDocumentIFrameView.java | 2 +- .../legacy/LegacyProjectExportPanel.java | 2 +- .../AnnotationDocumentsExporterTest.java | 2 +- .../basic/BasicRelationLayerInitializer.java | 2 +- .../BasicRelationRecommenderInitializer.java | 2 +- .../basic/BasicRelationTagSetInitializer.java | 2 +- .../basic/BasicSpanLayerInitializer.java | 2 +- .../BasicSpanRecommenderInitializer.java | 2 +- .../basic/BasicSpanTagSetInitializer.java | 2 +- ...cProjectInitializersAutoConfiguration.java | 2 +- .../BasicDocumentLabelLayerInitializer.java | 2 +- .../BasicDocumentLabelTagSetInitializer.java | 2 +- ...gProjectInitializersAutoConfiguration.java | 2 +- .../SentenceLabelLayerInitializer.java | 2 +- .../SentenceLabelRecommenderInitializer.java | 2 +- .../SentenceLabelTagSetInitializer.java | 2 +- ...gProjectInitializersAutoConfiguration.java | 2 +- .../EntityLinkingProjectInitializer.java | 2 +- ...dentifierStringRecommenderInitializer.java | 2 +- ...gProjectInitializersAutoConfiguration.java | 2 +- .../initializers/ChunkLayerInitializer.java | 2 +- .../CoreferenceLayerInitializer.java | 2 +- .../CoreferenceRelationTagSetInitializer.java | 2 +- .../CoreferenceTypeTagSetInitializer.java | 2 +- .../DependencyFlavorTagSetInitializer.java | 2 +- .../DependencyLayerInitializer.java | 2 +- .../DependencyTypeTagSetInitializer.java | 2 +- .../initializers/LemmaLayerInitializer.java | 2 +- ...MorphologicalFeaturesLayerInitializer.java | 2 +- .../NamedEntityLayerInitializer.java | 2 +- .../NamedEntityTagSetInitializer.java | 2 +- .../OrthographyLayerInitializer.java | 2 +- .../PartOfSpeechLayerInitializer.java | 2 +- .../PartOfSpeechTagSetInitializer.java | 2 +- .../SemPredArgLayerInitializer.java | 2 +- .../SentenceLayerInitializer.java | 2 +- .../SofaChangeOperationTagSetInitializer.java | 2 +- .../SurfaceFormLayerInitializer.java | 2 +- .../initializers/TokenLayerInitializer.java | 2 +- .../ProjectInitializersAutoConfiguration.java | 2 +- .../api/RecommendationService.java | 2 +- inception/inception-recommendation/pom.xml | 4 - .../RecommendationEditorExtension.java | 6 +- .../RecommenderServiceAutoConfiguration.java | 4 +- .../exporter/LearningRecordExporter.java | 2 +- .../exporter/RecommenderExporter.java | 2 +- .../project/RecommenderEditorPanel.java | 2 +- .../RecommendationRelationRenderer.java | 6 +- .../render/RecommendationRenderer.java | 2 +- .../render/RecommendationSpanRenderer.java | 4 +- .../render/RecommendationTypeRenderer.java | 2 +- .../service/RecommendationServiceImpl.java | 8 +- .../sidebar/RecommendationSidebar.java | 2 +- .../sidebar/RecommenderInfoPanel.java | 4 +- ...NonTrainableRecommenderActivationTask.java | 2 +- .../recommendation/tasks/SelectionTask.java | 2 +- .../recommendation/tasks/TrainingTask.java | 2 +- .../exporter/LearningRecordExporterTest.java | 2 +- .../exporter/RecommenderExporterTest.java | 2 +- ...ommendationServiceImplIntegrationTest.java | 2 +- ...onSuggestionVisibilityCalculationTest.java | 2 +- ...anSuggestionVisibilityCalculationTest.java | 2 +- .../revieweditor/AnnotationPanel.java | 10 +- .../revieweditor/DocumentAnnotationPanel.java | 10 +- .../inception/revieweditor/ReviewEditor.java | 2 +- .../revieweditor/SpanAnnotationPanel.java | 6 +- inception/inception-schema/pom.xml | 4 - .../AnnotationSchemaPropertiesImpl.java | 6 +- ...otationSchemaServiceAutoConfiguration.java | 13 +- .../schema/exporters/LayerExporter.java | 2 +- .../exporters/LegacyProjectInitializer.java | 2 +- .../schema/exporters/TagSetExporter.java | 2 +- .../AnnotationSchemaServiceEventAdapter.java | 2 +- .../service/AnnotationSchemaServiceImpl.java | 30 +-- .../service/FeatureSupportRegistryImpl.java | 6 +- .../DocumentServiceImplDatabaseTest.java | 4 +- .../schema/exporters/LayerExporterTest.java | 2 +- .../AnnotationSchemaServiceImplTest.java | 6 +- .../search/PrimitiveUimaIndexingSupport.java | 4 +- .../inception/search/SearchServiceImpl.java | 4 +- .../SearchServiceAutoConfiguration.java | 4 +- .../search/model/BulkIndexingContext.java | 2 +- inception/inception-search-mtas/pom.xml | 5 - .../search/index/mtas/MtasDocumentIndex.java | 2 +- .../index/mtas/MtasDocumentIndexFactory.java | 2 +- .../search/index/mtas/MtasUimaParser.java | 2 +- .../MtasDocumentIndexAutoConfiguration.java | 2 +- .../index/mtas/MtasDocumentIndexTest.java | 2 - .../search/index/mtas/MtasUimaParserTest.java | 2 +- .../search/index/mtas/MtasUpgradeTest.java | 6 +- .../recommendation/RecommenderTestHelper.java | 2 +- .../ui/agreement/page/AgreementPage.java | 2 +- inception/inception-ui-annotation/pom.xml | 4 - .../webanno/ui/annotation/AnnotationPage.java | 4 +- .../actionbar/undo/ActionFactory.java | 2 +- .../undo/PostActionScrollToAndHighlight.java | 2 +- .../undo/PostActionScrollToAndSelect.java | 2 +- .../annotation/actionbar/undo/UndoPanel.java | 4 +- .../CreateChainLinkAnnotationAction.java | 4 +- .../CreateChainSpanAnnotationAction.java | 4 +- .../CreateRelationAnnotationAction.java | 4 +- .../actions/CreateSpanAnnotationAction.java | 4 +- .../DeleteRelationAnnotationAction.java | 4 +- .../actions/DeleteSpanAnnotationAction.java | 4 +- .../actions/MoveSpanAnnotationAction.java | 4 +- .../actions/RedoableAnnotationAction.java | 4 +- .../actions/UndoableAnnotationAction.java | 4 +- .../UpdateFeatureValueAnnotationAction.java | 4 +- .../detail/AnnotationDetailEditorPanel.java | 16 +- .../detail/AnnotationTextPanel.java | 4 +- .../detail/AttachedAnnotationListPanel.java | 14 +- .../detail/FeatureEditorListPanel.java | 10 +- .../detail/LayerSelectionPanel.java | 6 +- inception/inception-ui-curation/pom.xml | 4 - .../CuratorWorkflowActionBarItemGroup.java | 2 +- .../curation/component/AnnotatorsPanel.java | 10 +- .../component/BratSuggestionVisualizer.java | 2 +- .../render/CurationRendererImpl.java | 4 +- .../ui/curation/page/CurationPage.java | 4 +- .../sidebar/CurationEditorExtension.java | 8 +- .../ui/curation/sidebar/CurationSidebar.java | 2 +- .../CurationSidebarAutoConfiguration.java | 6 +- .../render/CurationSidebarRenderer.java | 6 +- .../DocumentRepositoryEditorPanel.java | 2 +- .../ExternalSearchAnnotationSidebar.java | 2 +- ...owledgeBaseServiceUIAutoConfiguration.java | 4 +- ...BrowseKnowledgeBaseDialogContentPanel.java | 2 +- .../ui/kb/feature/ConceptFeatureEditor.java | 6 +- .../ConceptFeatureEditor_ImplBase.java | 4 +- .../ui/kb/feature/ConceptFeatureSupport.java | 6 +- .../feature/ConceptFeatureTraitsEditor.java | 4 +- .../ui/kb/feature/DisabledKBWarning.java | 2 +- .../MultiValueConceptFeatureEditor.java | 4 +- .../MultiValueConceptFeatureSupport.java | 8 +- .../MultiValueConceptFeatureTraitsEditor.java | 4 +- ...medEntityIdentifierFeatureInitializer.java | 2 +- .../search/ConceptFeatureIndexingSupport.java | 4 +- .../ConceptFeatureIndexingSupportTest.java | 2 +- inception/inception-ui-project/pom.xml | 4 - .../ui/project/detail/ProjectDetailPanel.java | 2 +- .../documents/ImportDocumentsPanel.java | 2 +- ...teLayerConfirmationDialogContentPanel.java | 2 +- .../ui/project/layers/FeatureDetailForm.java | 10 +- .../ui/project/layers/LayerDetailForm.java | 12 +- .../ui/project/layers/ProjectLayersPanel.java | 10 +- .../sidebar/SearchAnnotationSidebar.java | 4 +- .../sidebar/StatisticsAnnotationSidebar.java | 2 +- .../webanno/ui/tagsets/TagEditorPanel.java | 2 +- .../webanno/ui/tagsets/TagSelectionPanel.java | 2 +- .../webanno/ui/tagsets/TagSetEditorPanel.java | 2 +- .../webanno/ui/tagsets/TagSetImportPanel.java | 2 +- .../ui/tagsets/TagSetSelectionPanel.java | 2 +- inception/inception-versioning/pom.xml | 5 - .../versioning/VersioningServiceImpl.java | 2 +- .../VersioningServiceAutoConfiguration.java | 2 +- .../versioning/VersioningServiceImplTest.java | 2 - inception/inception-workload-dynamic/pom.xml | 5 - ...icAnnotatorWorkflowActionBarItemGroup.java | 2 +- .../DynamicWorkloadExtensionImpl2Test.java | 4 +- .../DynamicWorkloadExtensionImplTest.java | 4 +- inception/inception-workload-matrix/pom.xml | 5 - .../MatrixWorkflowActionBarItemGroup.java | 2 +- .../MatrixWorkloadExtensionImplTest.java | 4 +- inception/installEclipseSettings.sh | 2 +- inception/pom.xml | 1 - 407 files changed, 732 insertions(+), 1087 deletions(-) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/AnnotationSchemaService.java (97%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/AttachedAnnotation.java (97%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/adapter/AnnotationComparator.java (95%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/adapter/AnnotationComparisonUtils.java (97%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/adapter/AnnotationException.java (95%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/adapter/FeatureFilter.java (94%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/adapter/IllegalFeatureValueException.java (95%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/adapter/TypeAdapter.java (96%) rename inception/{inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno => inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema}/api/config/AnnotationSchemaProperties.java (96%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/event/LayerConfigurationChangedEvent.java (95%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/event/TagCreatedEvent.java (95%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/event/TagDeletedEvent.java (95%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/event/TagEvent.java (96%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/event/TagUpdatedEvent.java (95%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/feature/FeatureEditor.java (98%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/feature/FeatureEditorEvent.java (96%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/feature/FeatureEditorValueChangedEvent.java (94%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/feature/FeatureSupport.java (98%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/feature/FeatureSupportRegistry.java (97%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/feature/FeatureType.java (98%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/feature/FeatureUtil.java (99%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/feature/LinkWithRoleModel.java (98%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/feature/TypeUtil.java (98%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/layer/LayerSupport.java (97%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/layer/LayerSupportRegistry.java (97%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/layer/LayerSupport_ImplBase.java (94%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/layer/LayerType.java (98%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/validation/ValidationUtils.java (96%) delete mode 100644 inception/inception-api/LICENSE.txt delete mode 100644 inception/inception-api/pom.xml delete mode 100644 inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/AnnotationSchemaAutoConfiguration.java delete mode 100644 inception/inception-api/src/main/resources/META-INF/spring.factories rename inception/{inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api => inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema}/config/AnnotationSchemaPropertiesImpl.java (91%) diff --git a/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/ActiveLearningService.java b/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/ActiveLearningService.java index 2549de5f2a4..f8792655ec4 100644 --- a/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/ActiveLearningService.java +++ b/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/ActiveLearningService.java @@ -29,7 +29,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.model.SpanSuggestion; import de.tudarmstadt.ukp.inception.recommendation.api.model.SuggestionGroup; import de.tudarmstadt.ukp.inception.recommendation.api.model.SuggestionGroup.Delta; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public interface ActiveLearningService { 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 9703be05e73..b39a93977a8 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 @@ -52,9 +52,9 @@ import de.tudarmstadt.ukp.inception.recommendation.api.model.SpanSuggestion; import de.tudarmstadt.ukp.inception.recommendation.api.model.SuggestionGroup; import de.tudarmstadt.ukp.inception.recommendation.api.model.SuggestionGroup.Delta; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; /** *

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 147b858bfa7..60e555498ea 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 @@ -34,8 +34,8 @@ import de.tudarmstadt.ukp.inception.recommendation.api.LearningRecordService; import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.config.RecommenderServiceAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; @Configuration @AutoConfigureAfter(RecommenderServiceAutoConfiguration.class) 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 314011781a6..63262a4212d 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 @@ -122,11 +122,11 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VMarker; import de.tudarmstadt.ukp.inception.rendering.vmodel.VRange; import de.tudarmstadt.ukp.inception.rendering.vmodel.VTextMarker; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; public class ActiveLearningSidebar extends AnnotationSidebar_ImplBase diff --git a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/cohenkappa/CohenKappaAgreementMeasure.java b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/cohenkappa/CohenKappaAgreementMeasure.java index f941f9046c3..aefe94f6ff1 100644 --- a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/cohenkappa/CohenKappaAgreementMeasure.java +++ b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/cohenkappa/CohenKappaAgreementMeasure.java @@ -39,7 +39,7 @@ import de.tudarmstadt.ukp.clarin.webanno.curation.casdiff.api.DiffAdapter; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.Tag; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class CohenKappaAgreementMeasure extends CodingAgreementMeasure_ImplBase diff --git a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/cohenkappa/CohenKappaAgreementMeasureSupport.java b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/cohenkappa/CohenKappaAgreementMeasureSupport.java index 5af080b15f2..413c889ce37 100644 --- a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/cohenkappa/CohenKappaAgreementMeasureSupport.java +++ b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/cohenkappa/CohenKappaAgreementMeasureSupport.java @@ -25,7 +25,7 @@ import de.tudarmstadt.ukp.clarin.webanno.agreement.results.coding.AbstractCodingAgreementMeasureSupport; import de.tudarmstadt.ukp.clarin.webanno.agreement.results.coding.CodingAgreementResult; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Component public class CohenKappaAgreementMeasureSupport diff --git a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/fleisskappa/FleissKappaAgreementMeasure.java b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/fleisskappa/FleissKappaAgreementMeasure.java index 13592f21f97..27c67518e3a 100644 --- a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/fleisskappa/FleissKappaAgreementMeasure.java +++ b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/fleisskappa/FleissKappaAgreementMeasure.java @@ -39,7 +39,7 @@ import de.tudarmstadt.ukp.clarin.webanno.curation.casdiff.api.DiffAdapter; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.Tag; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class FleissKappaAgreementMeasure extends CodingAgreementMeasure_ImplBase diff --git a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/fleisskappa/FleissKappaAgreementMeasureSupport.java b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/fleisskappa/FleissKappaAgreementMeasureSupport.java index 6a93cce6a5e..857d3857dfa 100644 --- a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/fleisskappa/FleissKappaAgreementMeasureSupport.java +++ b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/fleisskappa/FleissKappaAgreementMeasureSupport.java @@ -25,7 +25,7 @@ import de.tudarmstadt.ukp.clarin.webanno.agreement.results.coding.AbstractCodingAgreementMeasureSupport; import de.tudarmstadt.ukp.clarin.webanno.agreement.results.coding.CodingAgreementResult; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Component public class FleissKappaAgreementMeasureSupport diff --git a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/krippendorffalpha/KrippendorffAlphaAgreementMeasure.java b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/krippendorffalpha/KrippendorffAlphaAgreementMeasure.java index c88b1a10d79..55c551d4a73 100644 --- a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/krippendorffalpha/KrippendorffAlphaAgreementMeasure.java +++ b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/krippendorffalpha/KrippendorffAlphaAgreementMeasure.java @@ -41,7 +41,7 @@ import de.tudarmstadt.ukp.clarin.webanno.curation.casdiff.api.DiffAdapter; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.Tag; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class KrippendorffAlphaAgreementMeasure extends CodingAgreementMeasure_ImplBase diff --git a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/krippendorffalpha/KrippendorffAlphaAgreementMeasureSupport.java b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/krippendorffalpha/KrippendorffAlphaAgreementMeasureSupport.java index b9fd433e0d4..7aa167dd7da 100644 --- a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/krippendorffalpha/KrippendorffAlphaAgreementMeasureSupport.java +++ b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/krippendorffalpha/KrippendorffAlphaAgreementMeasureSupport.java @@ -26,7 +26,7 @@ import de.tudarmstadt.ukp.clarin.webanno.agreement.results.coding.AbstractCodingAgreementMeasureSupport; import de.tudarmstadt.ukp.clarin.webanno.agreement.results.coding.CodingAgreementResult; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Component public class KrippendorffAlphaAgreementMeasureSupport diff --git a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/krippendorffalphaunitizing/KrippendorffAlphaUnitizingAgreementMeasure.java b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/krippendorffalphaunitizing/KrippendorffAlphaUnitizingAgreementMeasure.java index 2d666f96072..408968e24cc 100644 --- a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/krippendorffalphaunitizing/KrippendorffAlphaUnitizingAgreementMeasure.java +++ b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/krippendorffalphaunitizing/KrippendorffAlphaUnitizingAgreementMeasure.java @@ -38,7 +38,7 @@ import de.tudarmstadt.ukp.clarin.webanno.agreement.measures.AgreementMeasure_ImplBase; import de.tudarmstadt.ukp.clarin.webanno.agreement.results.unitizing.UnitizingAgreementResult; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class KrippendorffAlphaUnitizingAgreementMeasure extends AgreementMeasure_ImplBase 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 4a4ab40163e..bc02f16958c 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 @@ -29,7 +29,7 @@ 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; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Configuration @EnableConfigurationProperties({ CasStorageCachePropertiesImpl.class, 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 a786546b5ce..2828a225ca4 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 @@ -71,7 +71,7 @@ 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.schema.event.LayerConfigurationChangedEvent; +import de.tudarmstadt.ukp.inception.schema.api.event.LayerConfigurationChangedEvent; public class CasStorageServiceImplTest { diff --git a/inception/inception-api-annotation/pom.xml b/inception/inception-api-annotation/pom.xml index 211db3e053d..d195a350c5b 100644 --- a/inception/inception-api-annotation/pom.xml +++ b/inception/inception-api-annotation/pom.xml @@ -43,10 +43,6 @@ commons-text - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-export-api diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/coloring/ColoringRulesConfigurationPanel.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/coloring/ColoringRulesConfigurationPanel.java index d04e2f70043..f5190746ea2 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/coloring/ColoringRulesConfigurationPanel.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/coloring/ColoringRulesConfigurationPanel.java @@ -47,8 +47,8 @@ import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxLink; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxSubmitLink; import de.tudarmstadt.ukp.inception.rendering.coloring.ColoringRule; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; /** * Can be added to a feature support traits editor to configure coloring rules. diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/coloring/ColoringServiceImpl.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/coloring/ColoringServiceImpl.java index 35a5b99c6e5..3c61c08b15c 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/coloring/ColoringServiceImpl.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/coloring/ColoringServiceImpl.java @@ -52,8 +52,8 @@ import de.tudarmstadt.ukp.inception.rendering.coloring.ColoringStrategyType; import de.tudarmstadt.ukp.inception.rendering.coloring.ReadonlyColoringBehaviour; import de.tudarmstadt.ukp.inception.rendering.editorstate.ColoringPreferences; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.event.LayerConfigurationChangedEvent; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.event.LayerConfigurationChangedEvent; import de.tudarmstadt.ukp.inception.support.findbugs.SuppressFBWarnings; /** 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 6dba82dd4e2..fd5d784a812 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,12 +33,12 @@ 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.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.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; @Configuration @EnableConfigurationProperties(AnnotationEditorDefaultPreferencesPropertiesImpl.class) diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/exception/IllegalPlacementException.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/exception/IllegalPlacementException.java index f33b8ba7536..ed4f4c2ffb1 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/exception/IllegalPlacementException.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/exception/IllegalPlacementException.java @@ -17,7 +17,7 @@ */ package de.tudarmstadt.ukp.clarin.webanno.api.annotation.exception; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; /** * Indicates that an attempt to place an annotation at a given position failed because the diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/exception/NotEditableException.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/exception/NotEditableException.java index 449d1504fd0..528cb32e464 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/exception/NotEditableException.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/exception/NotEditableException.java @@ -17,7 +17,7 @@ */ package de.tudarmstadt.ukp.clarin.webanno.api.annotation.exception; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; /** * Indicates that an attempt edit a read-only document or value failed. diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/keybindings/KeyBindingsConfigurationPanel.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/keybindings/KeyBindingsConfigurationPanel.java index 13318a1087c..fa1f3f4ce25 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/keybindings/KeyBindingsConfigurationPanel.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/keybindings/KeyBindingsConfigurationPanel.java @@ -42,10 +42,10 @@ import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxSubmitLink; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; /** * Can be added to a feature support traits editor to configure key bindings. diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/keybindings/KeyBindingsPanel.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/keybindings/KeyBindingsPanel.java index e10b124b848..4a437f2f515 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/keybindings/KeyBindingsPanel.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/keybindings/KeyBindingsPanel.java @@ -40,9 +40,9 @@ import de.tudarmstadt.ukp.clarin.webanno.support.wicket.input.InputBehavior; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; import wicket.contrib.input.events.EventType; import wicket.contrib.input.events.key.KeyType; 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 0fb354f331e..e541028ed8f 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 @@ -70,10 +70,10 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.rendering.vmodel.VRange; -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.validation.ValidationUtils; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.validation.ValidationUtils; public abstract class AnnotationPageBase extends ProjectPageBase 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 e46c2e3b6ae..e79bc4fb44e 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 @@ -55,7 +55,6 @@ import org.slf4j.Logger; 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; @@ -70,7 +69,8 @@ import de.tudarmstadt.ukp.inception.rendering.coloring.ReadonlyColoringBehaviour; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotationPreference; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; /** * Modal Window to configure layers, window size, etc. @@ -201,7 +201,7 @@ private void actionSave(AjaxRequestTarget aTarget, Form aForm) // Make sure the visibility logic of the right sidebar sees if there are selectable // layers - state.refreshSelectableLayers(annotationEditorProperties); + state.refreshSelectableLayers(annotationEditorProperties::isLayerBlocked); userPreferencesService.savePreference(state, userDao.getCurrentUsername()); } 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 407d0bad8e3..3a34fb5923f 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,7 +49,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.config.AnnotationAutoConfiguration; -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; @@ -61,7 +60,8 @@ import de.tudarmstadt.ukp.inception.rendering.coloring.ColoringStrategyType; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotationPreference; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; /** *

@@ -129,7 +129,7 @@ public void loadPreferences(AnnotatorState aState, String aUsername) } // Make sure the visibility logic of the right sidebar sees if there are selectable layers - aState.refreshSelectableLayers(annotationEditorProperties); + aState.refreshSelectableLayers(annotationEditorProperties::isLayerBlocked); } @Override diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/ColorRenderer.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/ColorRenderer.java index 93e65117cb1..27913bcaab8 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/ColorRenderer.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/ColorRenderer.java @@ -46,8 +46,8 @@ import de.tudarmstadt.ukp.inception.rendering.request.RenderRequest; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; import de.tudarmstadt.ukp.inception.rendering.vmodel.VObject; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; /** *

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 3317ca7e52d..47f598f4333 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.feature.TypeUtil.getUiLabelText; +import static de.tudarmstadt.ukp.inception.schema.api.feature.TypeUtil.getUiLabelText; import org.springframework.core.annotation.Order; diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/NopRenderer.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/NopRenderer.java index 11c5bf85f10..89c6616662b 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/NopRenderer.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/NopRenderer.java @@ -27,9 +27,9 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; import de.tudarmstadt.ukp.inception.rendering.vmodel.VObject; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; public class NopRenderer extends Renderer_ImplBase diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/PreRendererImpl.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/PreRendererImpl.java index 583ad8d3ee4..b6df88442da 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/PreRendererImpl.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/PreRendererImpl.java @@ -43,10 +43,10 @@ import de.tudarmstadt.ukp.inception.rendering.pipeline.RenderStep; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequest; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.event.LayerConfigurationChangedEvent; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.event.LayerConfigurationChangedEvent; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; /** *

diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/Renderer_ImplBase.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/Renderer_ImplBase.java index 63186cedcfb..27c709390f2 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/Renderer_ImplBase.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/Renderer_ImplBase.java @@ -29,9 +29,9 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.inception.rendering.Renderer; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; public abstract class Renderer_ImplBase implements Renderer diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/bool/BooleanFeatureEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/bool/BooleanFeatureEditor.java index 89ef70f3b97..602ecf243bb 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/bool/BooleanFeatureEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/bool/BooleanFeatureEditor.java @@ -27,7 +27,7 @@ import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.checkbox.bootstrapcheckbox.BootstrapCheckBoxPicker; import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.checkbox.bootstrapcheckbox.BootstrapCheckBoxPickerConfig; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; public class BooleanFeatureEditor extends FeatureEditor diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/bool/BooleanFeatureSupport.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/bool/BooleanFeatureSupport.java index bd9cf8ea43c..04188e061d4 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/bool/BooleanFeatureSupport.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/bool/BooleanFeatureSupport.java @@ -33,8 +33,8 @@ import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureType; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureType; /** *

diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureDeletedEvent.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureDeletedEvent.java index 0df7cbae3b6..fd97c59c30e 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureDeletedEvent.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureDeletedEvent.java @@ -23,8 +23,8 @@ import org.apache.wicket.ajax.AjaxRequestTarget; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; public class LinkFeatureDeletedEvent extends LinkFeatureEvent 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 c15f261cf70..12804ff6195 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 @@ -87,16 +87,16 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; import de.tudarmstadt.ukp.inception.rendering.pipeline.RenderSlotsEvent; 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.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; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditorValueChangedEvent; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.feature.TypeUtil; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; public class LinkFeatureEditor extends FeatureEditor diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureEvent.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureEvent.java index df0d796a1bb..b4d651c640c 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureEvent.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureEvent.java @@ -23,9 +23,9 @@ import org.apache.wicket.ajax.AjaxRequestTarget; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditorEvent; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditorEvent; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; public abstract class LinkFeatureEvent extends FeatureEditorEvent diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureSupport.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureSupport.java index 4f6360a1310..7d4fb04e24b 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureSupport.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureSupport.java @@ -51,12 +51,12 @@ import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureType; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureType; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; /** *

diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureTraitsEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureTraitsEditor.java index c7510d564aa..4327b50e48d 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureTraitsEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureTraitsEditor.java @@ -44,8 +44,8 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Tag; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxFormComponentUpdatingBehavior; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; public class LinkFeatureTraitsEditor extends Panel diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/misc/UimaPrimitiveFeatureSupport_ImplBase.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/misc/UimaPrimitiveFeatureSupport_ImplBase.java index 446926db7ff..674a2496556 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/misc/UimaPrimitiveFeatureSupport_ImplBase.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/misc/UimaPrimitiveFeatureSupport_ImplBase.java @@ -25,7 +25,7 @@ import org.springframework.beans.factory.InitializingBean; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; public abstract class UimaPrimitiveFeatureSupport_ImplBase implements FeatureSupport, InitializingBean diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiSelectTextFeatureEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiSelectTextFeatureEditor.java index e69e12a5369..85bb06f7e52 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiSelectTextFeatureEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiSelectTextFeatureEditor.java @@ -46,10 +46,10 @@ import de.tudarmstadt.ukp.inception.annotation.feature.string.StringFeatureSupportProperties; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; public class MultiSelectTextFeatureEditor extends FeatureEditor diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureSupport.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureSupport.java index d40b76021c1..55d70643dc7 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureSupport.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureSupport.java @@ -50,10 +50,10 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetail; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetailGroup; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.IllegalFeatureValueException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureType; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.IllegalFeatureValueException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureType; /** *

diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureTraitsEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureTraitsEditor.java index b03f4cc1492..bb18f104132 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureTraitsEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureTraitsEditor.java @@ -30,8 +30,8 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.inception.annotation.feature.misc.UimaPrimitiveFeatureSupport_ImplBase; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; public class MultiValueStringFeatureTraitsEditor extends Panel diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureEditor.java index 384cc6d5486..a914128342a 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureEditor.java @@ -27,8 +27,8 @@ import com.googlecode.wicket.kendo.ui.form.NumberTextField; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; public class NumberFeatureEditor extends FeatureEditor diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureSupport.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureSupport.java index 3856c75a2d8..4a4cf967efe 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureSupport.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureSupport.java @@ -40,8 +40,8 @@ import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureType; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureType; /** *

diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureTraitsEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureTraitsEditor.java index b1ce1cde831..b2ed771799f 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureTraitsEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureTraitsEditor.java @@ -40,8 +40,8 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxFormComponentUpdatingBehavior; import de.tudarmstadt.ukp.inception.annotation.feature.misc.UimaPrimitiveFeatureSupport_ImplBase; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; public class NumberFeatureTraitsEditor extends Panel diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/RatingFeatureEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/RatingFeatureEditor.java index 4bbb127d7c9..aef405cc4d2 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/RatingFeatureEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/RatingFeatureEditor.java @@ -35,8 +35,8 @@ import org.apache.wicket.model.PropertyModel; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditorValueChangedEvent; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditorValueChangedEvent; public class RatingFeatureEditor extends FeatureEditor diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/KendoComboboxTextFeatureEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/KendoComboboxTextFeatureEditor.java index 0fad3311cef..6fe22844c3b 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/KendoComboboxTextFeatureEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/KendoComboboxTextFeatureEditor.java @@ -44,7 +44,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Tag; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.event.TagEvent; +import de.tudarmstadt.ukp.inception.schema.api.event.TagEvent; /** * String feature editor using a Kendo ComboBox field. diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/RadioGroupStringFeatureEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/RadioGroupStringFeatureEditor.java index 7e4e749bb86..58c560d86b6 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/RadioGroupStringFeatureEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/RadioGroupStringFeatureEditor.java @@ -49,7 +49,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxLink; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditorValueChangedEvent; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditorValueChangedEvent; public class RadioGroupStringFeatureEditor extends TextFeatureEditorBase diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/StringFeatureSupport.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/StringFeatureSupport.java index bc59cd25bb0..a820ecdedb7 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/StringFeatureSupport.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/StringFeatureSupport.java @@ -46,10 +46,10 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetail; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetailGroup; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureType; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureType; /** *

diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/StringFeatureTraitsEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/StringFeatureTraitsEditor.java index 7005e99bcd4..3cc0fbd03e7 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/StringFeatureTraitsEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/StringFeatureTraitsEditor.java @@ -42,8 +42,8 @@ import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxFormComponentUpdatingBehavior; import de.tudarmstadt.ukp.inception.annotation.feature.misc.UimaPrimitiveFeatureSupport_ImplBase; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; public class StringFeatureTraitsEditor extends Panel diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/TextFeatureEditorBase.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/TextFeatureEditorBase.java index d8992d280b9..e736ca22525 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/TextFeatureEditorBase.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/TextFeatureEditorBase.java @@ -28,9 +28,9 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.inception.annotation.feature.misc.ConstraintsInUseIndicator; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; public abstract class TextFeatureEditorBase extends FeatureEditor diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/LayerTraitsEditor_ImplBase.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/LayerTraitsEditor_ImplBase.java index fc17afe45e9..221e70f03e6 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/LayerTraitsEditor_ImplBase.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/LayerTraitsEditor_ImplBase.java @@ -26,8 +26,8 @@ import org.apache.wicket.spring.injection.annot.SpringBean; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; public abstract class LayerTraitsEditor_ImplBase> extends Panel diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/TypeAdapter_ImplBase.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/TypeAdapter_ImplBase.java index ec626f5ad44..33859fddbc9 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/TypeAdapter_ImplBase.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/TypeAdapter_ImplBase.java @@ -37,12 +37,12 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.inception.annotation.events.FeatureValueUpdatedEvent; -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.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; public abstract class TypeAdapter_ImplBase implements TypeAdapter diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerBehavior.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerBehavior.java index d8282be7ead..3fc60901bf0 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerBehavior.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerBehavior.java @@ -26,8 +26,8 @@ import org.apache.uima.cas.text.AnnotationFS; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; public interface LayerBehavior { diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerBehaviorRegistry.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerBehaviorRegistry.java index 35544b15eb0..133b68b7dfd 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerBehaviorRegistry.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerBehaviorRegistry.java @@ -19,7 +19,7 @@ import java.util.List; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; public interface LayerBehaviorRegistry { diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerBehaviorRegistryImpl.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerBehaviorRegistryImpl.java index 363362bb1fc..0fd4209ed07 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerBehaviorRegistryImpl.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerBehaviorRegistryImpl.java @@ -33,7 +33,7 @@ import org.springframework.core.annotation.AnnotationAwareOrderComparator; import de.tudarmstadt.ukp.clarin.webanno.support.logging.BaseLoggers; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; /** *

diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerSupportRegistryImpl.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerSupportRegistryImpl.java index 0380d400252..915f0a952b5 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerSupportRegistryImpl.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerSupportRegistryImpl.java @@ -39,9 +39,9 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.support.logging.BaseLoggers; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerType; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerType; /** *

diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainAdapter.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainAdapter.java index 32678a161e5..80af2dc7e00 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainAdapter.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainAdapter.java @@ -50,11 +50,11 @@ import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanLayerBehavior; import de.tudarmstadt.ukp.inception.rendering.selection.Selection; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationComparator; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationComparator; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; /** * Manage interactions with annotations on a chain layer. diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainLayerSupport.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainLayerSupport.java index f0bb0ced175..09e4ad28734 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainLayerSupport.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainLayerSupport.java @@ -41,9 +41,9 @@ import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.LayerBehaviorRegistry; import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanLayerBehavior; import de.tudarmstadt.ukp.inception.rendering.Renderer; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport_ImplBase; -import de.tudarmstadt.ukp.inception.schema.layer.LayerType; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport_ImplBase; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerType; /** *

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 22a01cb47cf..bada5ddcf27 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 @@ -26,12 +26,12 @@ 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.schema.api.config.AnnotationSchemaProperties; public class ChainLayerTraitsEditor extends LayerTraitsEditor_ImplBase 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 e8fff42592c..be2de86cd32 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.feature.TypeUtil.getUiLabelText; +import static de.tudarmstadt.ukp.inception.schema.api.feature.TypeUtil.getUiLabelText; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; import static java.util.stream.Collectors.toList; @@ -49,8 +49,8 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VObject; import de.tudarmstadt.ukp.inception.rendering.vmodel.VRange; import de.tudarmstadt.ukp.inception.rendering.vmodel.VSpan; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; public class ChainRenderer extends Renderer_ImplBase diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationAdapter.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationAdapter.java index cb8db6b656a..349f8e5c9f7 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationAdapter.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationAdapter.java @@ -48,10 +48,10 @@ import de.tudarmstadt.ukp.inception.annotation.layer.TypeAdapter_ImplBase; import de.tudarmstadt.ukp.inception.rendering.selection.Selection; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.FeatureFilter; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.FeatureFilter; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; /** * Manage interactions with annotations on a relation layer. diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationCrossSentenceBehavior.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationCrossSentenceBehavior.java index f342ba3ebd1..63cace4c086 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationCrossSentenceBehavior.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationCrossSentenceBehavior.java @@ -47,8 +47,8 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VComment; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; /** *

diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationLayerBehavior.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationLayerBehavior.java index aaf23f76025..b533bec774a 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationLayerBehavior.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationLayerBehavior.java @@ -30,9 +30,9 @@ import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.LayerBehavior; import de.tudarmstadt.ukp.inception.rendering.vmodel.VArc; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; public abstract class RelationLayerBehavior implements LayerBehavior diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationLayerSupport.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationLayerSupport.java index add700cc7ab..3fb8c61df0a 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationLayerSupport.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationLayerSupport.java @@ -40,9 +40,9 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.LayerBehaviorRegistry; import de.tudarmstadt.ukp.inception.rendering.Renderer; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport_ImplBase; -import de.tudarmstadt.ukp.inception.schema.layer.LayerType; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport_ImplBase; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerType; /** *

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 8b42520ec4a..915a69957ee 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 @@ -26,11 +26,11 @@ 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.schema.api.config.AnnotationSchemaProperties; public class RelationLayerTraitsEditor extends LayerTraitsEditor_ImplBase diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationOverlapBehavior.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationOverlapBehavior.java index 87f60785089..bfe51ca1d20 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationOverlapBehavior.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationOverlapBehavior.java @@ -47,9 +47,9 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VComment; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationComparator; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationComparator; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; /** * Handles the {@link OverlapMode} setting for {@link WebAnnoConst#RELATION_TYPE relation layers}. diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationRenderer.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationRenderer.java index 7feb26c508e..cd8c4a89048 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationRenderer.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationRenderer.java @@ -64,8 +64,8 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetail; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetailGroup; import de.tudarmstadt.ukp.inception.rendering.vmodel.VObject; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; /** * A class that is used to create Brat Arc to CAS relations and vice-versa diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanAdapter.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanAdapter.java index 351e9e8da6d..a69325b4214 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanAdapter.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanAdapter.java @@ -47,9 +47,9 @@ import de.tudarmstadt.ukp.inception.annotation.layer.TypeAdapter_ImplBase; import de.tudarmstadt.ukp.inception.rendering.selection.Selection; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; /** * Manage interactions with annotations on a span layer. diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanAnchoringModeBehavior.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanAnchoringModeBehavior.java index 953e5702099..0275fd91b89 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanAnchoringModeBehavior.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanAnchoringModeBehavior.java @@ -33,9 +33,9 @@ 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.layer.chain.ChainLayerSupport; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; /** *

diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanCrossSentenceBehavior.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanCrossSentenceBehavior.java index bb2656a8104..794b07bff0a 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanCrossSentenceBehavior.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanCrossSentenceBehavior.java @@ -46,9 +46,9 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.rendering.vmodel.VSpan; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; /** * Ensure that annotations do not cross sentence boundaries. For chain layers, this check applies diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanLayerBehavior.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanLayerBehavior.java index bda40f9363e..44b3d9949f0 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanLayerBehavior.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanLayerBehavior.java @@ -24,9 +24,9 @@ import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.LayerBehavior; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; import de.tudarmstadt.ukp.inception.rendering.vmodel.VSpan; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; public abstract class SpanLayerBehavior implements LayerBehavior diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanLayerSupport.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanLayerSupport.java index add470f9253..1eb54b36e6f 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanLayerSupport.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanLayerSupport.java @@ -36,9 +36,9 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.LayerBehaviorRegistry; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport_ImplBase; -import de.tudarmstadt.ukp.inception.schema.layer.LayerType; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport_ImplBase; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerType; /** *

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 8cd38168453..3917add820f 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 @@ -27,7 +27,6 @@ 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; @@ -36,6 +35,7 @@ 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.schema.api.config.AnnotationSchemaProperties; public class SpanLayerTraitsEditor extends LayerTraitsEditor_ImplBase diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanOverlapBehavior.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanOverlapBehavior.java index 9c3aad5247b..8680dc83fc6 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanOverlapBehavior.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanOverlapBehavior.java @@ -45,10 +45,10 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.rendering.vmodel.VSpan; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationComparator; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationComparator; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; /** * Handles the {@link OverlapMode} setting for {@link WebAnnoConst#SPAN_TYPE span layers}. diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanRenderer.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanRenderer.java index 4b085d9ff89..06591845691 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanRenderer.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanRenderer.java @@ -50,9 +50,9 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VObject; import de.tudarmstadt.ukp.inception.rendering.vmodel.VRange; import de.tudarmstadt.ukp.inception.rendering.vmodel.VSpan; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; /** * Render spans. 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 847038a4fdb..2f1cb7a41e8 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 @@ -30,6 +30,7 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; +import java.util.function.Predicate; import org.apache.uima.cas.CAS; import org.apache.uima.cas.text.AnnotationFS; @@ -39,7 +40,6 @@ 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; @@ -416,12 +416,12 @@ public List getSelectableLayers() } @Override - public void refreshSelectableLayers(AnnotationSchemaProperties aProperties) + public void refreshSelectableLayers(Predicate isLayerBlocked) { selectableLayers.clear(); for (AnnotationLayer layer : getAnnotationLayers()) { - if (!layer.isEnabled() || layer.isReadonly() || aProperties.isLayerBlocked(layer)) { + if (!layer.isEnabled() || layer.isReadonly() || isLayerBlocked.test(layer)) { continue; } diff --git a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureSupportTest.java b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureSupportTest.java index 7158acaa27a..481b4c296a8 100644 --- a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureSupportTest.java +++ b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureSupportTest.java @@ -47,8 +47,8 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Tag; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.support.uima.ICasUtil; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; @ExtendWith(MockitoExtension.class) public class LinkFeatureSupportTest diff --git a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureSupportTest.java b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureSupportTest.java index f3aea005c1e..e6ad5d5599e 100644 --- a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureSupportTest.java +++ b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureSupportTest.java @@ -40,7 +40,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.support.uima.ICasUtil; import de.tudarmstadt.ukp.inception.annotation.feature.string.StringFeatureSupportPropertiesImpl; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @ExtendWith(MockitoExtension.class) public class MultiValueStringFeatureSupportTest diff --git a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/feature/string/StringFeatureSupportTest.java b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/feature/string/StringFeatureSupportTest.java index d93a5baf9ad..613af4d71cd 100644 --- a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/feature/string/StringFeatureSupportTest.java +++ b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/feature/string/StringFeatureSupportTest.java @@ -35,7 +35,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.support.uima.ICasUtil; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @ExtendWith(MockitoExtension.class) public class StringFeatureSupportTest diff --git a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainAdapterTest.java b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainAdapterTest.java index 528be39fdbd..6264bb1ede0 100644 --- a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainAdapterTest.java +++ b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainAdapterTest.java @@ -51,9 +51,9 @@ import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanCrossSentenceBehavior; import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanLayerBehavior; import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanOverlapBehavior; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; @ExtendWith(MockitoExtension.class) public class ChainAdapterTest diff --git a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationAdapterTest.java b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationAdapterTest.java index 248f00be259..947736d9a23 100644 --- a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationAdapterTest.java +++ b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationAdapterTest.java @@ -59,9 +59,9 @@ import de.tudarmstadt.ukp.dkpro.core.api.syntax.type.dependency.Dependency; import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.LayerSupportRegistryImpl; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; @ExtendWith(MockitoExtension.class) public class RelationAdapterTest diff --git a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationRendererTest.java b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationRendererTest.java index 3dd47983abc..459f057ff1f 100644 --- a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationRendererTest.java +++ b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationRendererTest.java @@ -59,7 +59,7 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VComment; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; @ExtendWith(MockitoExtension.class) public class RelationRendererTest diff --git a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanAdapterTest.java b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanAdapterTest.java index 3ebe3ae23a8..95b027a5c84 100644 --- a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanAdapterTest.java +++ b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanAdapterTest.java @@ -49,9 +49,9 @@ 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.layer.behaviors.LayerSupportRegistryImpl; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; @ExtendWith(MockitoExtension.class) public class SpanAdapterTest diff --git a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanRendererTest.java b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanRendererTest.java index e6d02091d4a..7282aa5a4cc 100644 --- a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanRendererTest.java +++ b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanRendererTest.java @@ -43,8 +43,8 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VComment; import de.tudarmstadt.ukp.inception.rendering.vmodel.VCommentType; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; @ExtendWith(MockitoExtension.class) public class SpanRendererTest diff --git a/inception/inception-api-editor/pom.xml b/inception/inception-api-editor/pom.xml index fc88931bfbd..e8f8353aa1d 100644 --- a/inception/inception-api-editor/pom.xml +++ b/inception/inception-api-editor/pom.xml @@ -31,10 +31,6 @@ uimaj-core - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-annotation-storage-api 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 0df22cd19bb..dcd1c1a648f 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 @@ -40,7 +40,6 @@ import org.slf4j.Logger; 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; @@ -53,7 +52,8 @@ import de.tudarmstadt.ukp.inception.rendering.request.RenderRequestedEvent; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; import de.tudarmstadt.ukp.inception.rendering.vmodel.serialization.VDocumentSerializer; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; public abstract class AnnotationEditorBase extends Panel diff --git a/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtension.java b/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtension.java index e29dc15afef..c96b308ec4d 100644 --- a/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtension.java +++ b/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtension.java @@ -33,7 +33,7 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetailGroup; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public interface AnnotationEditorExtension { diff --git a/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtensionRegistry.java b/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtensionRegistry.java index 30e6321161c..b7b3eb0a755 100644 --- a/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtensionRegistry.java +++ b/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtensionRegistry.java @@ -28,7 +28,7 @@ import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public interface AnnotationEditorExtensionRegistry { diff --git a/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtensionRegistryImpl.java b/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtensionRegistryImpl.java index b4a0f10ddea..864ef97fe20 100644 --- a/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtensionRegistryImpl.java +++ b/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtensionRegistryImpl.java @@ -41,7 +41,7 @@ import de.tudarmstadt.ukp.inception.editor.config.AnnotationEditorAutoConfiguration; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; /** *

diff --git a/inception/inception-api-render/pom.xml b/inception/inception-api-render/pom.xml index 2fe2dd6788b..79e1fcb9bb9 100644 --- a/inception/inception-api-render/pom.xml +++ b/inception/inception-api-render/pom.xml @@ -26,10 +26,6 @@ INCEpTION - Core - Annotation rendering API - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-model 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 a2cffd10a61..a9941c8a842 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 @@ -18,8 +18,8 @@ package de.tudarmstadt.ukp.inception.rendering.editorstate; import java.util.List; +import java.util.function.Predicate; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; public interface LayerSelectionState @@ -75,7 +75,7 @@ public interface LayerSelectionState */ void setAnnotationLayers(List aAnnotationLayers); - void refreshSelectableLayers(AnnotationSchemaProperties aProperties); + void refreshSelectableLayers(Predicate isLayerBlocked); List getSelectableLayers(); } diff --git a/inception/inception-api-schema/pom.xml b/inception/inception-api-schema/pom.xml index 76428916938..186b07c2fe1 100644 --- a/inception/inception-api-schema/pom.xml +++ b/inception/inception-api-schema/pom.xml @@ -97,5 +97,10 @@ com.fasterxml.jackson.core jackson-databind + + + org.dkpro.core + dkpro-core-api-segmentation-asl + \ No newline at end of file diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/editor/action/AnnotationActionHandler.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/editor/action/AnnotationActionHandler.java index d5a7f1d068e..bfc15603db2 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/editor/action/AnnotationActionHandler.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/editor/action/AnnotationActionHandler.java @@ -25,7 +25,7 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public interface AnnotationActionHandler { diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/rendering/Renderer.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/rendering/Renderer.java index 375b7fe6635..267b0381e80 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/rendering/Renderer.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/rendering/Renderer.java @@ -18,7 +18,7 @@ package de.tudarmstadt.ukp.inception.rendering; import static de.tudarmstadt.ukp.clarin.webanno.support.uima.ICasUtil.selectByAddr; -import static de.tudarmstadt.ukp.inception.schema.validation.ValidationUtils.isRequiredFeatureMissing; +import static de.tudarmstadt.ukp.inception.schema.api.validation.ValidationUtils.isRequiredFeatureMissing; import static org.apache.commons.lang3.StringUtils.defaultString; import java.util.ArrayList; @@ -40,8 +40,8 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetail; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetailGroup; import de.tudarmstadt.ukp.inception.rendering.vmodel.VObject; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; /** * Type renderer for span, arc, and chain annotations 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/api/AnnotationSchemaService.java similarity index 97% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/AnnotationSchemaService.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/AnnotationSchemaService.java index ff56e354768..c10d78b8ec2 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/api/AnnotationSchemaService.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; +package de.tudarmstadt.ukp.inception.schema.api; import java.io.IOException; import java.util.List; @@ -41,12 +41,12 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Tag; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; -import de.tudarmstadt.ukp.inception.schema.adapter.IllegalFeatureValueException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.adapter.IllegalFeatureValueException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; /** * This interface contains methods which are related to TagSet, Tag and Type for the annotation diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/AttachedAnnotation.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/AttachedAnnotation.java similarity index 97% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/AttachedAnnotation.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/AttachedAnnotation.java index 5bef69b3c19..0dd936eca88 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/AttachedAnnotation.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/AttachedAnnotation.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; +package de.tudarmstadt.ukp.inception.schema.api; import org.apache.uima.cas.text.AnnotationFS; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/AnnotationComparator.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationComparator.java similarity index 95% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/AnnotationComparator.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationComparator.java index 3585a5e5450..1796a10548c 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/AnnotationComparator.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationComparator.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.api.adapter; import java.util.Comparator; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/AnnotationComparisonUtils.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationComparisonUtils.java similarity index 97% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/AnnotationComparisonUtils.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationComparisonUtils.java index 5fd695c059e..d937e431177 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/AnnotationComparisonUtils.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationComparisonUtils.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.api.adapter; import static de.tudarmstadt.ukp.clarin.webanno.support.uima.ICasUtil.getDefaultFeatureValue; import static de.tudarmstadt.ukp.clarin.webanno.support.uima.ICasUtil.getFeatureValue; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/AnnotationException.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationException.java similarity index 95% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/AnnotationException.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationException.java index ba33bdd1512..ea4c3cf7045 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/AnnotationException.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationException.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.api.adapter; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.CommonException; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/FeatureFilter.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/FeatureFilter.java similarity index 94% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/FeatureFilter.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/FeatureFilter.java index e91824d4a70..b61cb9ea566 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/FeatureFilter.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/FeatureFilter.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.api.adapter; import org.apache.uima.cas.Feature; import org.apache.uima.cas.FeatureStructure; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/IllegalFeatureValueException.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/IllegalFeatureValueException.java similarity index 95% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/IllegalFeatureValueException.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/IllegalFeatureValueException.java index 721034003c8..ffc9a849d00 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/IllegalFeatureValueException.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/IllegalFeatureValueException.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.api.adapter; public class IllegalFeatureValueException extends AnnotationException diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/TypeAdapter.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/TypeAdapter.java similarity index 96% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/TypeAdapter.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/TypeAdapter.java index 8d8c0c9e6d4..a43c63bf6a7 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/TypeAdapter.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/TypeAdapter.java @@ -15,9 +15,9 @@ * 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.api.adapter; -import static de.tudarmstadt.ukp.inception.schema.adapter.AnnotationComparisonUtils.isEquivalentSpanAnnotation; +import static de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationComparisonUtils.isEquivalentSpanAnnotation; import java.util.Collection; import java.util.List; @@ -39,8 +39,8 @@ import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.inception.rendering.selection.Selection; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; /** * A type adapter encapsulates a specific kind of annotation layer, e.g. spans, relations or chains. diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/AnnotationSchemaProperties.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/config/AnnotationSchemaProperties.java similarity index 96% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/AnnotationSchemaProperties.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/config/AnnotationSchemaProperties.java index 33281158525..38f48d7eef1 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/AnnotationSchemaProperties.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/config/AnnotationSchemaProperties.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.schema.api.config; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Sentence; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/LayerConfigurationChangedEvent.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/LayerConfigurationChangedEvent.java similarity index 95% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/LayerConfigurationChangedEvent.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/LayerConfigurationChangedEvent.java index a7110fac354..ff6c4b00c37 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/LayerConfigurationChangedEvent.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/LayerConfigurationChangedEvent.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.event; +package de.tudarmstadt.ukp.inception.schema.api.event; import org.springframework.context.ApplicationEvent; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagCreatedEvent.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagCreatedEvent.java similarity index 95% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagCreatedEvent.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagCreatedEvent.java index 4c2b2c98f5c..82d75689f5a 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagCreatedEvent.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagCreatedEvent.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.event; +package de.tudarmstadt.ukp.inception.schema.api.event; import de.tudarmstadt.ukp.clarin.webanno.model.Tag; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagDeletedEvent.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagDeletedEvent.java similarity index 95% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagDeletedEvent.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagDeletedEvent.java index 508fab050ad..2b5fa9ef91a 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagDeletedEvent.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagDeletedEvent.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.event; +package de.tudarmstadt.ukp.inception.schema.api.event; import de.tudarmstadt.ukp.clarin.webanno.model.Tag; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagEvent.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagEvent.java similarity index 96% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagEvent.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagEvent.java index 4c1b4a774a4..e6eb3615f75 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagEvent.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagEvent.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.event; +package de.tudarmstadt.ukp.inception.schema.api.event; import org.springframework.context.ApplicationEvent; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagUpdatedEvent.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagUpdatedEvent.java similarity index 95% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagUpdatedEvent.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagUpdatedEvent.java index cbfea640fb6..ff8fd9bdc29 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagUpdatedEvent.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagUpdatedEvent.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.event; +package de.tudarmstadt.ukp.inception.schema.api.event; import de.tudarmstadt.ukp.clarin.webanno.model.Tag; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureEditor.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditor.java similarity index 98% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureEditor.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditor.java index 896cf2d6f94..490e7814451 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureEditor.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditor.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.feature; +package de.tudarmstadt.ukp.inception.schema.api.feature; import static org.apache.wicket.event.Broadcast.BUBBLE; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureEditorEvent.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditorEvent.java similarity index 96% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureEditorEvent.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditorEvent.java index 9cc989aa8d2..7233e0b3718 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureEditorEvent.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditorEvent.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.feature; +package de.tudarmstadt.ukp.inception.schema.api.feature; import org.apache.wicket.ajax.AjaxRequestTarget; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureEditorValueChangedEvent.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditorValueChangedEvent.java similarity index 94% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureEditorValueChangedEvent.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditorValueChangedEvent.java index c142d27c5cf..2ef71168794 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureEditorValueChangedEvent.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditorValueChangedEvent.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.feature; +package de.tudarmstadt.ukp.inception.schema.api.feature; import org.apache.wicket.ajax.AjaxRequestTarget; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureSupport.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureSupport.java similarity index 98% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureSupport.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureSupport.java index 25b9cf1402c..211412f81ab 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureSupport.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureSupport.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.schema.feature; +package de.tudarmstadt.ukp.inception.schema.api.feature; import static de.tudarmstadt.ukp.clarin.webanno.support.uima.ICasUtil.selectFsByAddr; -import static de.tudarmstadt.ukp.inception.schema.feature.FeatureUtil.setFeature; +import static de.tudarmstadt.ukp.inception.schema.api.feature.FeatureUtil.setFeature; import java.io.Serializable; import java.util.Collections; @@ -44,8 +44,8 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetailGroup; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; /** * Extension point for new types of annotation features. diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureSupportRegistry.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureSupportRegistry.java similarity index 97% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureSupportRegistry.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureSupportRegistry.java index 167856c2f79..010cea6ab3b 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureSupportRegistry.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureSupportRegistry.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.feature; +package de.tudarmstadt.ukp.inception.schema.api.feature; import java.util.List; import java.util.Optional; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureType.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureType.java similarity index 98% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureType.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureType.java index 9e6bc0b2ec6..21bec203cdb 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureType.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureType.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.feature; +package de.tudarmstadt.ukp.inception.schema.api.feature; import java.io.Serializable; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureUtil.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureUtil.java similarity index 99% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureUtil.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureUtil.java index b230822aeed..2f8d9483059 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureUtil.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureUtil.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.feature; +package de.tudarmstadt.ukp.inception.schema.api.feature; import static de.tudarmstadt.ukp.clarin.webanno.support.uima.ICasUtil.selectFsByAddr; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/LinkWithRoleModel.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/LinkWithRoleModel.java similarity index 98% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/LinkWithRoleModel.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/LinkWithRoleModel.java index 045e5a25022..f0de33544ef 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/LinkWithRoleModel.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/LinkWithRoleModel.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.feature; +package de.tudarmstadt.ukp.inception.schema.api.feature; import java.io.Serializable; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/TypeUtil.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/TypeUtil.java similarity index 98% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/TypeUtil.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/TypeUtil.java index aa32681fbdd..10554646648 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/TypeUtil.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/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.feature; +package de.tudarmstadt.ukp.inception.schema.api.feature; import static java.lang.Long.parseLong; @@ -32,7 +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; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; /** * Utility Class for {@link TypeAdapter} with static methods such as getting {@link TypeAdapter} diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/layer/LayerSupport.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupport.java similarity index 97% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/layer/LayerSupport.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupport.java index 3cf9933a5c8..599d7d6f2d8 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/layer/LayerSupport.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupport.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.layer; +package de.tudarmstadt.ukp.inception.schema.api.layer; import static java.util.Arrays.asList; @@ -34,8 +34,8 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.inception.rendering.Renderer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; public interface LayerSupport extends BeanNameAware diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/layer/LayerSupportRegistry.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupportRegistry.java similarity index 97% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/layer/LayerSupportRegistry.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupportRegistry.java index 77edc8fa451..9c022a1d5a0 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/layer/LayerSupportRegistry.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupportRegistry.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.layer; +package de.tudarmstadt.ukp.inception.schema.api.layer; import static java.util.Comparator.comparing; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/layer/LayerSupport_ImplBase.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupport_ImplBase.java similarity index 94% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/layer/LayerSupport_ImplBase.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupport_ImplBase.java index 768e1226626..121b7b0d029 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/layer/LayerSupport_ImplBase.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupport_ImplBase.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.layer; +package de.tudarmstadt.ukp.inception.schema.api.layer; import static de.tudarmstadt.ukp.clarin.webanno.support.JSONUtil.fromJsonString; import static de.tudarmstadt.ukp.clarin.webanno.support.JSONUtil.toJsonString; @@ -30,8 +30,8 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; public abstract class LayerSupport_ImplBase implements LayerSupport diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/layer/LayerType.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerType.java similarity index 98% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/layer/LayerType.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerType.java index 39fa3ba36ef..b8aac56a8af 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/layer/LayerType.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerType.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.layer; +package de.tudarmstadt.ukp.inception.schema.api.layer; import java.io.Serializable; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/validation/ValidationUtils.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/validation/ValidationUtils.java similarity index 96% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/validation/ValidationUtils.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/validation/ValidationUtils.java index 737141d8e79..a793e754971 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/validation/ValidationUtils.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/validation/ValidationUtils.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.validation; +package de.tudarmstadt.ukp.inception.schema.api.validation; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.uima.cas.CAS.TYPE_NAME_STRING; diff --git a/inception/inception-api/LICENSE.txt b/inception/inception-api/LICENSE.txt deleted file mode 100644 index d6456956733..00000000000 --- a/inception/inception-api/LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - - 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-api/pom.xml b/inception/inception-api/pom.xml deleted file mode 100644 index 338d82d9902..00000000000 --- a/inception/inception-api/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - 4.0.0 - - de.tudarmstadt.ukp.inception.app - inception-app - 30.0-SNAPSHOT - - inception-api - INCEpTION - Core - API - - - de.tudarmstadt.ukp.inception.app - inception-model - - - - - org.springframework - spring-context - - - org.springframework.boot - spring-boot - - - - 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/config/AnnotationSchemaAutoConfiguration.java b/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/AnnotationSchemaAutoConfiguration.java deleted file mode 100644 index 48d46746f53..00000000000 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/AnnotationSchemaAutoConfiguration.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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.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/src/main/resources/META-INF/spring.factories b/inception/inception-api/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 96d6ad8e87e..00000000000 --- a/inception/inception-api/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration \ No newline at end of file diff --git a/inception/inception-bom/pom.xml b/inception/inception-bom/pom.xml index de125ffc0c8..2cd5204c47d 100644 --- a/inception/inception-bom/pom.xml +++ b/inception/inception-bom/pom.xml @@ -332,11 +332,6 @@ inception-search-mtas 30.0-SNAPSHOT - - de.tudarmstadt.ukp.inception.app - inception-api - 30.0-SNAPSHOT - de.tudarmstadt.ukp.inception.app inception-js-api 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 34ac638b8e7..8e4ae51f45d 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 @@ -27,7 +27,7 @@ import de.tudarmstadt.ukp.inception.editor.AnnotationEditorFactoryImplBase; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/config/BratAnnotationEditorAutoConfiguration.java b/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/config/BratAnnotationEditorAutoConfiguration.java index 04458b1f37e..6ca26309a7a 100644 --- a/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/config/BratAnnotationEditorAutoConfiguration.java +++ b/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/config/BratAnnotationEditorAutoConfiguration.java @@ -32,7 +32,7 @@ import de.tudarmstadt.ukp.clarin.webanno.brat.schema.BratSchemaGenerator; import de.tudarmstadt.ukp.clarin.webanno.brat.schema.BratSchemaGeneratorImpl; import de.tudarmstadt.ukp.inception.preferences.PreferencesService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @ConditionalOnWebApplication @Configuration diff --git a/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/schema/BratSchemaGeneratorImpl.java b/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/schema/BratSchemaGeneratorImpl.java index fcf4d3a8960..c1428ea7c61 100644 --- a/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/schema/BratSchemaGeneratorImpl.java +++ b/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/schema/BratSchemaGeneratorImpl.java @@ -39,7 +39,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.dkpro.core.api.lexmorph.type.pos.POS; import de.tudarmstadt.ukp.dkpro.core.api.syntax.type.dependency.Dependency; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-brat-editor/src/test/java/de/tudarmstadt/ukp/clarin/webanno/brat/render/BratSerializerImplTest.java b/inception/inception-brat-editor/src/test/java/de/tudarmstadt/ukp/clarin/webanno/brat/render/BratSerializerImplTest.java index 436989ad736..23f8c5a7681 100644 --- a/inception/inception-brat-editor/src/test/java/de/tudarmstadt/ukp/clarin/webanno/brat/render/BratSerializerImplTest.java +++ b/inception/inception-brat-editor/src/test/java/de/tudarmstadt/ukp/clarin/webanno/brat/render/BratSerializerImplTest.java @@ -76,7 +76,7 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequest; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.service.FeatureSupportRegistryImpl; @ExtendWith(MockitoExtension.class) 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 537172f6918..26158eb3c35 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 @@ -42,7 +42,7 @@ import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBaseServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.config.RecommenderServiceAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; @Configuration @AutoConfigureAfter({ KnowledgeBaseServiceAutoConfiguration.class, diff --git a/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/recommender/NamedEntityLinker.java b/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/recommender/NamedEntityLinker.java index 604b30401b8..0929ad0bde2 100644 --- a/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/recommender/NamedEntityLinker.java +++ b/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/recommender/NamedEntityLinker.java @@ -49,7 +49,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommenderContext.Key; import de.tudarmstadt.ukp.inception.recommendation.api.recommender.TrainingCapability; import de.tudarmstadt.ukp.inception.rendering.model.Range; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; public class NamedEntityLinker extends RecommendationEngine diff --git a/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/recommender/NamedEntityLinkerFactory.java b/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/recommender/NamedEntityLinkerFactory.java index 394347bd95f..d235cef4771 100644 --- a/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/recommender/NamedEntityLinkerFactory.java +++ b/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/recommender/NamedEntityLinkerFactory.java @@ -35,7 +35,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender; import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommendationEngine; import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommendationEngineFactoryImplBase; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; /** *

diff --git a/inception/inception-concept-linking/src/test/java/de/tudarmstadt/ukp/inception/conceptlinking/NamedEntityLinkerTest.java b/inception/inception-concept-linking/src/test/java/de/tudarmstadt/ukp/inception/conceptlinking/NamedEntityLinkerTest.java index 432043807b2..8f5f49ba4ab 100644 --- a/inception/inception-concept-linking/src/test/java/de/tudarmstadt/ukp/inception/conceptlinking/NamedEntityLinkerTest.java +++ b/inception/inception-concept-linking/src/test/java/de/tudarmstadt/ukp/inception/conceptlinking/NamedEntityLinkerTest.java @@ -66,8 +66,8 @@ import de.tudarmstadt.ukp.inception.kb.model.KnowledgeBase; import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender; import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommenderContext; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.support.test.recommendation.DkproTestHelper; import de.tudarmstadt.ukp.inception.support.test.recommendation.RecommenderTestHelper; diff --git a/inception/inception-curation-legacy/src/main/java/de/tudarmstadt/ukp/clarin/webanno/curation/casdiff/CasDiff.java b/inception/inception-curation-legacy/src/main/java/de/tudarmstadt/ukp/clarin/webanno/curation/casdiff/CasDiff.java index 2160402ec42..398a83d8759 100644 --- a/inception/inception-curation-legacy/src/main/java/de/tudarmstadt/ukp/clarin/webanno/curation/casdiff/CasDiff.java +++ b/inception/inception-curation-legacy/src/main/java/de/tudarmstadt/ukp/clarin/webanno/curation/casdiff/CasDiff.java @@ -72,7 +72,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.uima.ICasUtil; import de.tudarmstadt.ukp.inception.annotation.layer.relation.RelationAdapter; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class CasDiff { diff --git a/inception/inception-curation-legacy/src/main/java/de/tudarmstadt/ukp/clarin/webanno/curation/casdiff/api/CasDiffException.java b/inception/inception-curation-legacy/src/main/java/de/tudarmstadt/ukp/clarin/webanno/curation/casdiff/api/CasDiffException.java index 409b308e82b..fc8b5de93a3 100644 --- a/inception/inception-curation-legacy/src/main/java/de/tudarmstadt/ukp/clarin/webanno/curation/casdiff/api/CasDiffException.java +++ b/inception/inception-curation-legacy/src/main/java/de/tudarmstadt/ukp/clarin/webanno/curation/casdiff/api/CasDiffException.java @@ -17,7 +17,7 @@ */ package de.tudarmstadt.ukp.clarin.webanno.curation.casdiff.api; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; /** * Thrown if there is a problem during CAS diff computation. diff --git a/inception/inception-curation/pom.xml b/inception/inception-curation/pom.xml index 0ddaa61e389..f0ac41c2167 100644 --- a/inception/inception-curation/pom.xml +++ b/inception/inception-curation/pom.xml @@ -65,10 +65,6 @@ de.tudarmstadt.ukp.inception.app inception-export-api - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-annotation-storage 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 e1e5d837749..0b65b94c6d3 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 @@ -28,7 +28,7 @@ import de.tudarmstadt.ukp.inception.curation.service.CurationDocumentService; import de.tudarmstadt.ukp.inception.curation.service.CurationDocumentServiceImpl; import de.tudarmstadt.ukp.inception.project.api.ProjectService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Configuration @AutoConfigureAfter(name = { 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 8851894f6eb..6e143113d90 100644 --- a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/config/CurationServiceAutoConfiguration.java +++ b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/config/CurationServiceAutoConfiguration.java @@ -28,7 +28,6 @@ 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.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.inception.curation.export.CuratedDocumentsExporter; import de.tudarmstadt.ukp.inception.curation.export.CurationWorkflowExporter; @@ -46,7 +45,8 @@ import de.tudarmstadt.ukp.inception.curation.settings.CurationProjectSettingsMenuItem; import de.tudarmstadt.ukp.inception.curation.settings.CurationProjectSettingsPanelFactory; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; @Configuration public class CurationServiceAutoConfiguration diff --git a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/AlreadyMergedException.java b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/AlreadyMergedException.java index c07435738bc..18a4b174589 100644 --- a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/AlreadyMergedException.java +++ b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/AlreadyMergedException.java @@ -17,7 +17,7 @@ */ package de.tudarmstadt.ukp.inception.curation.merge; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; /** * Indicates that a merge operation could not be performed because the annotation had already been diff --git a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/CasMerge.java b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/CasMerge.java index 28968552f61..cee3130904d 100644 --- a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/CasMerge.java +++ b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/CasMerge.java @@ -90,13 +90,13 @@ import de.tudarmstadt.ukp.inception.curation.merge.strategy.DefaultMergeStrategy; import de.tudarmstadt.ukp.inception.curation.merge.strategy.MergeStrategy; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationComparisonUtils; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.FeatureFilter; -import de.tudarmstadt.ukp.inception.schema.adapter.IllegalFeatureValueException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationComparisonUtils; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.FeatureFilter; +import de.tudarmstadt.ukp.inception.schema.api.adapter.IllegalFeatureValueException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; /** * Do a merge CAS out of multiple user annotations diff --git a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeException.java b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeException.java index 8c20cc3eb11..79180d3a9a5 100644 --- a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeException.java +++ b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeException.java @@ -17,7 +17,7 @@ */ package de.tudarmstadt.ukp.inception.curation.merge; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; /** * Thrown if there is a problem during CAS merge operation. diff --git a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/MergeConflictException.java b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/MergeConflictException.java index d64229f56bd..63d16c9c966 100644 --- a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/MergeConflictException.java +++ b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/MergeConflictException.java @@ -17,7 +17,7 @@ */ package de.tudarmstadt.ukp.inception.curation.merge; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; /** * Indicates that a merge operation could not be performed because there was a conflict, e.g. diff --git a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/UnfulfilledPrerequisitesException.java b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/UnfulfilledPrerequisitesException.java index 05545016eda..108b35fdaa2 100644 --- a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/UnfulfilledPrerequisitesException.java +++ b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/UnfulfilledPrerequisitesException.java @@ -17,7 +17,7 @@ */ package de.tudarmstadt.ukp.inception.curation.merge; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; /** * Indicates that the prerequisites to perform a merge operation are not fulfilled. E.g. on an 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 b53deb5c43d..a1936185a66 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 @@ -46,7 +46,7 @@ import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.inception.curation.config.CurationDocumentServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/service/CurationMergeServiceImpl.java b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/service/CurationMergeServiceImpl.java index 0b6e9a647eb..aba46b075cf 100644 --- a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/service/CurationMergeServiceImpl.java +++ b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/service/CurationMergeServiceImpl.java @@ -45,7 +45,7 @@ import de.tudarmstadt.ukp.inception.curation.config.CurationServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.curation.merge.CasMerge; import de.tudarmstadt.ukp.inception.curation.merge.strategy.MergeStrategy; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

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 1bcb1bf2c51..ea6ed120d4a 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 @@ -62,7 +62,7 @@ import de.tudarmstadt.ukp.inception.io.xmi.XmiFormatSupport; import de.tudarmstadt.ukp.inception.io.xmi.config.UimaFormatsPropertiesImpl.XmiFormatProperties; import de.tudarmstadt.ukp.inception.project.export.ProjectExportServiceImpl; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @ExtendWith(MockitoExtension.class) public class CuratedDocumentsExporterTest diff --git a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasDiffLinkFeaturesTest.java b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasDiffLinkFeaturesTest.java index 0ec4b097b26..a9bdf8f390f 100644 --- a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasDiffLinkFeaturesTest.java +++ b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasDiffLinkFeaturesTest.java @@ -23,7 +23,7 @@ import static de.tudarmstadt.ukp.inception.curation.merge.CurationTestUtils.createMultiLinkWithRoleTestTypeSystem; import static de.tudarmstadt.ukp.inception.curation.merge.CurationTestUtils.makeLinkFS; import static de.tudarmstadt.ukp.inception.curation.merge.CurationTestUtils.makeLinkHostFS; -import static de.tudarmstadt.ukp.inception.schema.feature.FeatureUtil.setLinkFeatureValue; +import static de.tudarmstadt.ukp.inception.schema.api.feature.FeatureUtil.setLinkFeatureValue; import static java.util.Arrays.asList; import static org.apache.uima.fit.factory.JCasFactory.createJCas; import static org.assertj.core.api.Assertions.assertThat; diff --git a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeLinkTest.java b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeLinkTest.java index a660415f651..1eef03fd03c 100644 --- a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeLinkTest.java +++ b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeLinkTest.java @@ -39,7 +39,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.JSONUtil; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.inception.annotation.feature.link.LinkFeatureTraits; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; public class CasMergeLinkTest extends CasMergeTestBase diff --git a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeRelationTest.java b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeRelationTest.java index b1432e0c1cc..304234cc1bb 100644 --- a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeRelationTest.java +++ b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeRelationTest.java @@ -37,7 +37,7 @@ import de.tudarmstadt.ukp.dkpro.core.api.lexmorph.type.pos.POS; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.dkpro.core.api.syntax.type.dependency.Dependency; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class CasMergeRelationTest extends CasMergeTestBase diff --git a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeRemergeTest.java b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeRemergeTest.java index 08f037d6771..bcd79c436b5 100644 --- a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeRemergeTest.java +++ b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeRemergeTest.java @@ -55,7 +55,7 @@ import de.tudarmstadt.ukp.dkpro.core.api.lexmorph.type.pos.POS; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.inception.curation.merge.strategy.MergeIncompleteStrategy; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; public class CasMergeRemergeTest extends CasMergeTestBase diff --git a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeSpanTest.java b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeSpanTest.java index a10ee7ce3b7..93b5944f756 100644 --- a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeSpanTest.java +++ b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeSpanTest.java @@ -41,8 +41,8 @@ import de.tudarmstadt.ukp.dkpro.core.api.lexmorph.type.pos.POS; import de.tudarmstadt.ukp.dkpro.core.api.ner.type.NamedEntity; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; public class CasMergeSpanTest extends CasMergeTestBase diff --git a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeTestBase.java b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeTestBase.java index da0432555dc..9268726c386 100644 --- a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeTestBase.java +++ b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeTestBase.java @@ -66,7 +66,7 @@ import de.tudarmstadt.ukp.inception.annotation.layer.chain.ChainLayerSupport; import de.tudarmstadt.ukp.inception.annotation.layer.relation.RelationLayerSupport; import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanLayerSupport; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.service.FeatureSupportRegistryImpl; @ExtendWith(MockitoExtension.class) 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 1d41dd4d714..022aa3bb8f4 100644 --- a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/service/CurationDocumentServiceImplTest.java +++ b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/service/CurationDocumentServiceImplTest.java @@ -40,7 +40,6 @@ import org.springframework.context.annotation.Import; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; @@ -57,7 +56,7 @@ import de.tudarmstadt.ukp.inception.documents.api.RepositoryAutoConfiguration; import de.tudarmstadt.ukp.inception.documents.config.DocumentServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; @EnableAutoConfiguration @@ -74,7 +73,6 @@ CasStorageServiceAutoConfiguration.class, // RepositoryAutoConfiguration.class, // AnnotationSchemaServiceAutoConfiguration.class, // - AnnotationSchemaAutoConfiguration.class, // SecurityAutoConfiguration.class, // CurationDocumentServiceAutoConfiguration.class }) public class CurationDocumentServiceImplTest diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/AllAnnotationsStartAndEndWithinSentencesCheck.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/AllAnnotationsStartAndEndWithinSentencesCheck.java index f17ba3e1434..e9eda9a4984 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/AllAnnotationsStartAndEndWithinSentencesCheck.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/AllAnnotationsStartAndEndWithinSentencesCheck.java @@ -33,7 +33,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Sentence; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class AllAnnotationsStartAndEndWithinSentencesCheck implements Check diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/DanglingRelationsCheck.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/DanglingRelationsCheck.java index 32dd493f2a5..d35ec8828a9 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/DanglingRelationsCheck.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/DanglingRelationsCheck.java @@ -33,7 +33,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; import de.tudarmstadt.ukp.clarin.webanno.support.uima.ICasUtil; import de.tudarmstadt.ukp.inception.annotation.layer.relation.RelationAdapter; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** * Checks if there are any relations that do not have a source or target. Note that relations diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/FeatureAttachedSpanAnnotationsTrulyAttachedCheck.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/FeatureAttachedSpanAnnotationsTrulyAttachedCheck.java index be7d6bd15fb..f68c509146c 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/FeatureAttachedSpanAnnotationsTrulyAttachedCheck.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/FeatureAttachedSpanAnnotationsTrulyAttachedCheck.java @@ -33,7 +33,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogLevel; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class FeatureAttachedSpanAnnotationsTrulyAttachedCheck implements Check diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/LinksReachableThroughChainsCheck.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/LinksReachableThroughChainsCheck.java index 38a55a9cfcb..115519a3b73 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/LinksReachableThroughChainsCheck.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/LinksReachableThroughChainsCheck.java @@ -34,7 +34,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogLevel; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class LinksReachableThroughChainsCheck implements Check diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/NoMultipleIncomingRelationsCheck.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/NoMultipleIncomingRelationsCheck.java index 3ea30c1a239..2dae4b164a1 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/NoMultipleIncomingRelationsCheck.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/NoMultipleIncomingRelationsCheck.java @@ -39,7 +39,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; import de.tudarmstadt.ukp.dkpro.core.api.syntax.type.dependency.Dependency; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class NoMultipleIncomingRelationsCheck implements Check diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/RelationOffsetsCheck.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/RelationOffsetsCheck.java index 2c16beab610..9f6ee852096 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/RelationOffsetsCheck.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/RelationOffsetsCheck.java @@ -33,7 +33,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogLevel; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** * Checks that the offsets of relations match the target of the relation. This mirrors the DKPro diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/config/CasDoctorAutoConfiguration.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/config/CasDoctorAutoConfiguration.java index 81955c278fd..645313efbf8 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/config/CasDoctorAutoConfiguration.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/config/CasDoctorAutoConfiguration.java @@ -56,7 +56,7 @@ import de.tudarmstadt.ukp.clarin.webanno.diag.repairs.Repair; import de.tudarmstadt.ukp.clarin.webanno.diag.repairs.SwitchBeginAndEndOnNegativeSizedAnnotationsRepair; import de.tudarmstadt.ukp.clarin.webanno.diag.repairs.UpgradeCasRepair; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Configuration @EnableConfigurationProperties(CasDoctorPropertiesImpl.class) diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/ReattachFeatureAttachedSpanAnnotationsAndDeleteExtrasRepair.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/ReattachFeatureAttachedSpanAnnotationsAndDeleteExtrasRepair.java index 7972540caad..96daac31525 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/ReattachFeatureAttachedSpanAnnotationsAndDeleteExtrasRepair.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/ReattachFeatureAttachedSpanAnnotationsAndDeleteExtrasRepair.java @@ -35,7 +35,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Safe(false) public class ReattachFeatureAttachedSpanAnnotationsAndDeleteExtrasRepair diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/ReattachFeatureAttachedSpanAnnotationsRepair.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/ReattachFeatureAttachedSpanAnnotationsRepair.java index 5369dffa92c..fa43af45ec6 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/ReattachFeatureAttachedSpanAnnotationsRepair.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/ReattachFeatureAttachedSpanAnnotationsRepair.java @@ -34,7 +34,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Safe public class ReattachFeatureAttachedSpanAnnotationsRepair diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/ReindexFeatureAttachedSpanAnnotationsRepair.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/ReindexFeatureAttachedSpanAnnotationsRepair.java index 7d43872d0e2..b774ae5e308 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/ReindexFeatureAttachedSpanAnnotationsRepair.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/ReindexFeatureAttachedSpanAnnotationsRepair.java @@ -35,7 +35,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogLevel; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** * Finds annotations that are reachable through an attach-feature but that are not actually indexed diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RelationOffsetsRepair.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RelationOffsetsRepair.java index d4e2f0c3a4d..09f4455abc6 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RelationOffsetsRepair.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RelationOffsetsRepair.java @@ -35,7 +35,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogLevel; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** * Ensures that the offsets of relations match the target of the relation. This mirrors the DKPro diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RemoveDanglingChainLinksRepair.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RemoveDanglingChainLinksRepair.java index dd6ee8cecd3..4c95efa0ba7 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RemoveDanglingChainLinksRepair.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RemoveDanglingChainLinksRepair.java @@ -34,7 +34,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogLevel; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Safe(false) public class RemoveDanglingChainLinksRepair diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RemoveDanglingFeatureAttachedSpanAnnotationsRepair.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RemoveDanglingFeatureAttachedSpanAnnotationsRepair.java index b3f0902d695..7d80fe5bf56 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RemoveDanglingFeatureAttachedSpanAnnotationsRepair.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RemoveDanglingFeatureAttachedSpanAnnotationsRepair.java @@ -36,7 +36,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Safe(false) public class RemoveDanglingFeatureAttachedSpanAnnotationsRepair diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RemoveDanglingRelationsRepair.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RemoveDanglingRelationsRepair.java index 45f74a4adfd..fa7a282fdab 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RemoveDanglingRelationsRepair.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RemoveDanglingRelationsRepair.java @@ -36,7 +36,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; import de.tudarmstadt.ukp.inception.annotation.layer.relation.RelationAdapter; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** * Removes relations that were not properly cleaned up after deleting a source/target span. Such diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/UpgradeCasRepair.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/UpgradeCasRepair.java index 45f038c8350..fdf07c6c4b4 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/UpgradeCasRepair.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/UpgradeCasRepair.java @@ -36,7 +36,7 @@ import de.tudarmstadt.ukp.clarin.webanno.diag.repairs.Repair.Safe; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** * Ensures that the CAS is up-to-date with the project type system. It performs the same operation diff --git a/inception/inception-diag/src/test/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/AllAnnotationsStartAndEndWithinSentencesCheckTest.java b/inception/inception-diag/src/test/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/AllAnnotationsStartAndEndWithinSentencesCheckTest.java index bf41125030d..b220b4203d2 100644 --- a/inception/inception-diag/src/test/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/AllAnnotationsStartAndEndWithinSentencesCheckTest.java +++ b/inception/inception-diag/src/test/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/AllAnnotationsStartAndEndWithinSentencesCheckTest.java @@ -41,7 +41,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; import de.tudarmstadt.ukp.dkpro.core.api.ner.type.NamedEntity; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Sentence; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @ExtendWith(SpringExtension.class) class AllAnnotationsStartAndEndWithinSentencesCheckTest diff --git a/inception/inception-diag/src/test/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/NoMultipleIncomingRelationsCheckTest.java b/inception/inception-diag/src/test/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/NoMultipleIncomingRelationsCheckTest.java index e4155a7ce0c..8a089c0e847 100644 --- a/inception/inception-diag/src/test/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/NoMultipleIncomingRelationsCheckTest.java +++ b/inception/inception-diag/src/test/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/NoMultipleIncomingRelationsCheckTest.java @@ -42,7 +42,7 @@ import de.tudarmstadt.ukp.dkpro.core.api.coref.type.CoreferenceChain; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.dkpro.core.api.syntax.type.dependency.Dependency; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @ExtendWith(SpringExtension.class) public class NoMultipleIncomingRelationsCheckTest diff --git a/inception/inception-diam-compactv2/pom.xml b/inception/inception-diam-compactv2/pom.xml index b025824232e..388b9f53d60 100644 --- a/inception/inception-diam-compactv2/pom.xml +++ b/inception/inception-diam-compactv2/pom.xml @@ -36,7 +36,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-api-schema de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-diam-compactv2/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 index 71dbc3c0f31..0a598e9dc4a 100644 --- a/inception/inception-diam-compactv2/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,7 +28,6 @@ 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; @@ -40,6 +39,7 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.rendering.vmodel.VSpan; import de.tudarmstadt.ukp.inception.rendering.vmodel.VTextMarker; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.inception.support.text.TextUtils; /** 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 index 3ae5121e2ce..9f0243039da 100644 --- 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 @@ -20,9 +20,9 @@ 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; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; @Configuration public class DiamCompactV2AutoConfig diff --git a/inception/inception-diam-compactv2/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 index 425f4fcc58a..cd69e5c4ae0 100644 --- a/inception/inception-diam-compactv2/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 @@ -23,8 +23,10 @@ import java.util.Map; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; -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; @@ -39,9 +41,13 @@ 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.api.config.AnnotationSchemaProperties; +@ExtendWith(MockitoExtension.class) public class CompactSerializerV2ImplTest { + private @Mock AnnotationSchemaProperties annotationSchemaProperties; + @Test void thatSerializationWorks() throws Exception { @@ -83,7 +89,7 @@ void thatSerializationWorks() throws Exception var req = RenderRequest.builder() // .withWindow(0, Integer.MAX_VALUE) // .build(); - var sut = new CompactSerializerV2Impl(new AnnotationSchemaPropertiesImpl()); + var sut = new CompactSerializerV2Impl(annotationSchemaProperties); var cdoc = sut.render(vdoc, req); var actual = JSONUtil.toPrettyJsonString(cdoc); diff --git a/inception/inception-diam/pom.xml b/inception/inception-diam/pom.xml index 88205d9aaac..143bdc13ff0 100644 --- a/inception/inception-diam/pom.xml +++ b/inception/inception-diam/pom.xml @@ -26,10 +26,6 @@ inception-diam INCEpTION - DIAM - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-documents-api diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/CreateRelationAnnotationHandler.java b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/CreateRelationAnnotationHandler.java index d8b897a1de9..090f481fd8d 100644 --- a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/CreateRelationAnnotationHandler.java +++ b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/CreateRelationAnnotationHandler.java @@ -34,7 +34,7 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.selection.Selection; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; /** *

diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/DeleteAnnotationHandler.java b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/DeleteAnnotationHandler.java index df8bc7afd1b..804e38630f5 100644 --- a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/DeleteAnnotationHandler.java +++ b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/DeleteAnnotationHandler.java @@ -29,8 +29,8 @@ import de.tudarmstadt.ukp.inception.diam.model.ajax.DefaultAjaxResponse; 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.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; /** *

diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/EditorAjaxRequestHandlerBase.java b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/EditorAjaxRequestHandlerBase.java index d75f1cd5fab..f04adf23df0 100644 --- a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/EditorAjaxRequestHandlerBase.java +++ b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/EditorAjaxRequestHandlerBase.java @@ -33,7 +33,7 @@ import de.tudarmstadt.ukp.inception.diam.model.ajax.DefaultAjaxResponse; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public abstract class EditorAjaxRequestHandlerBase implements EditorAjaxRequestHandler diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/FillSlotWithNewAnnotationHandler.java b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/FillSlotWithNewAnnotationHandler.java index 89164f24f02..32c247be099 100644 --- a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/FillSlotWithNewAnnotationHandler.java +++ b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/FillSlotWithNewAnnotationHandler.java @@ -31,7 +31,7 @@ import de.tudarmstadt.ukp.inception.diam.model.ajax.DefaultAjaxResponse; import de.tudarmstadt.ukp.inception.diam.model.compact.CompactRange; import de.tudarmstadt.ukp.inception.diam.model.compact.CompactRangeList; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; /** *

diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/MoveSpanAnnotationHandler.java b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/MoveSpanAnnotationHandler.java index b919788a9f7..cb2c1ec4697 100644 --- a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/MoveSpanAnnotationHandler.java +++ b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/MoveSpanAnnotationHandler.java @@ -35,8 +35,8 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.model.Range; 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.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; /** *

diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/SelectAnnotationHandler.java b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/SelectAnnotationHandler.java index 7fdc6acd87c..73de72ef0f6 100644 --- a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/SelectAnnotationHandler.java +++ b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/SelectAnnotationHandler.java @@ -30,8 +30,8 @@ import de.tudarmstadt.ukp.inception.diam.model.ajax.DefaultAjaxResponse; 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.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; /** *

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 ba9eecfd6f6..972851baf0f 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,7 +24,6 @@ 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; @@ -52,9 +51,10 @@ import de.tudarmstadt.ukp.inception.preferences.PreferencesService; import de.tudarmstadt.ukp.inception.rendering.pipeline.RenderingPipeline; import de.tudarmstadt.ukp.inception.rendering.vmodel.serialization.VDocumentSerializerExtensionPoint; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; @Configuration public class DiamAutoConfig 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 c3571b7edc8..3bdf35b449d 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 @@ -26,7 +26,7 @@ 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; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public interface LazyDetailsLookupService { 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 710a8196895..9ccd00f3bd3 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 @@ -44,10 +44,10 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetail; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetailGroup; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; /** *

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 759403544a6..d8cbd7fa046 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.feature.TypeUtil; +import de.tudarmstadt.ukp.inception.schema.api.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 f36ffca358e..9499a795eea 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,7 +22,6 @@ 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; @@ -34,6 +33,7 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.rendering.vmodel.VSpan; import de.tudarmstadt.ukp.inception.rendering.vmodel.VTextMarker; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.inception.support.text.TextUtils; /** 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 12dccb6b878..0bc6bb598dd 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 @@ -77,7 +77,7 @@ 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; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** * Differential INCEpTION Annotation Messaging (DIAM) protocol controller. 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 482b08e090d..73f383eae70 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 @@ -100,7 +100,7 @@ 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; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import it.unimi.dsi.fastutil.ints.IntArrayList; /** diff --git a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/JsonImportUtil.java b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/JsonImportUtil.java index 17d6c7b2465..60d804876e8 100644 --- a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/JsonImportUtil.java +++ b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/JsonImportUtil.java @@ -30,7 +30,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Tag; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.support.JSONUtil; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class JsonImportUtil { diff --git a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/LayerImportExportUtils.java b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/LayerImportExportUtils.java index c9ad5a6f181..a8fc8571bd0 100644 --- a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/LayerImportExportUtils.java +++ b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/LayerImportExportUtils.java @@ -51,7 +51,7 @@ import de.tudarmstadt.ukp.dkpro.core.api.lexmorph.type.morph.MorphologicalFeatures; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Lemma; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** * This class contains Utility methods that can be used in Project settings. diff --git a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/TagsetImportExportUtils.java b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/TagsetImportExportUtils.java index 2be7b46652c..79cac102159 100644 --- a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/TagsetImportExportUtils.java +++ b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/TagsetImportExportUtils.java @@ -29,7 +29,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.Tag; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class TagsetImportExportUtils { 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 5ce21fcf59e..ccc7dec7e1e 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 @@ -36,7 +36,7 @@ import de.tudarmstadt.ukp.inception.export.exporters.ProjectSettingsExporter; import de.tudarmstadt.ukp.inception.io.xmi.XmiFormatSupport; import de.tudarmstadt.ukp.inception.project.api.ProjectService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Configuration // @EnableConfigurationProperties({ DocumentImportExportServicePropertiesImpl.class }) 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 2bae0b596da..618d2dbed3e 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 @@ -87,7 +87,7 @@ import de.tudarmstadt.ukp.inception.export.config.DocumentImportExportServicePropertiesImpl; import de.tudarmstadt.ukp.inception.io.xmi.XmiFormatSupport; import de.tudarmstadt.ukp.inception.io.xmi.config.UimaFormatsPropertiesImpl.XmiFormatProperties; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.service.AnnotationSchemaServiceImpl; @ExtendWith(MockitoExtension.class) 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 46a8755f797..36b33d61465 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 @@ -75,7 +75,7 @@ import de.tudarmstadt.ukp.inception.rendering.selection.ScrollToEvent; import de.tudarmstadt.ukp.inception.rendering.selection.Selection; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public abstract class ExternalAnnotationEditorBase extends AnnotationEditorBase diff --git a/inception/inception-external-search-pubmed/src/main/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/PubMedCentralProvider.java b/inception/inception-external-search-pubmed/src/main/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/PubMedCentralProvider.java index 3c373d21ecf..9b23981cc33 100644 --- a/inception/inception-external-search-pubmed/src/main/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/PubMedCentralProvider.java +++ b/inception/inception-external-search-pubmed/src/main/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/PubMedCentralProvider.java @@ -45,7 +45,7 @@ import de.tudarmstadt.ukp.inception.externalsearch.pubmed.traits.PubMedProviderTraits; import de.tudarmstadt.ukp.inception.io.bioc.BioCFormatSupport; import de.tudarmstadt.ukp.inception.io.bioc.model.BioCToCas; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class PubMedCentralProvider implements ExternalSearchProvider diff --git a/inception/inception-external-search-pubmed/src/main/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/PubMedCentralProviderFactory.java b/inception/inception-external-search-pubmed/src/main/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/PubMedCentralProviderFactory.java index 49f6e0d3c29..e23cac15b38 100644 --- a/inception/inception-external-search-pubmed/src/main/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/PubMedCentralProviderFactory.java +++ b/inception/inception-external-search-pubmed/src/main/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/PubMedCentralProviderFactory.java @@ -37,7 +37,7 @@ import de.tudarmstadt.ukp.inception.externalsearch.pubmed.pmcoa.PmcOaClient; import de.tudarmstadt.ukp.inception.externalsearch.pubmed.traits.PubMedProviderTraits; import de.tudarmstadt.ukp.inception.externalsearch.pubmed.traits.PubMedProviderTraitsEditor; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** * Support for PubAnnotation. diff --git a/inception/inception-external-search-pubmed/src/main/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/config/PubMedDocumentRepositoryAutoConfiguration.java b/inception/inception-external-search-pubmed/src/main/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/config/PubMedDocumentRepositoryAutoConfiguration.java index 3af31c28c5a..88b4e07ae83 100644 --- a/inception/inception-external-search-pubmed/src/main/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/config/PubMedDocumentRepositoryAutoConfiguration.java +++ b/inception/inception-external-search-pubmed/src/main/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/config/PubMedDocumentRepositoryAutoConfiguration.java @@ -30,7 +30,7 @@ import de.tudarmstadt.ukp.inception.externalsearch.pubmed.pmcoa.PmcOaClient; import de.tudarmstadt.ukp.inception.io.bioc.BioCFormatSupport; import de.tudarmstadt.ukp.inception.io.bioc.config.BioCAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Configuration @AutoConfigureAfter({ ExternalSearchAutoConfiguration.class, BioCAutoConfiguration.class, diff --git a/inception/inception-external-search-pubmed/src/test/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/PubMedProviderTest.java b/inception/inception-external-search-pubmed/src/test/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/PubMedProviderTest.java index 67e17192cff..b2ad5853994 100644 --- a/inception/inception-external-search-pubmed/src/test/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/PubMedProviderTest.java +++ b/inception/inception-external-search-pubmed/src/test/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/PubMedProviderTest.java @@ -36,7 +36,7 @@ import de.tudarmstadt.ukp.inception.externalsearch.pubmed.entrez.EntrezClient; import de.tudarmstadt.ukp.inception.externalsearch.pubmed.pmcoa.PmcOaClient; import de.tudarmstadt.ukp.inception.externalsearch.pubmed.traits.PubMedProviderTraits; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @ExtendWith(MockitoExtension.class) @Tag("slow") diff --git a/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureEditor.java b/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureEditor.java index 5339e1378cb..a7f66ffc9af 100644 --- a/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureEditor.java +++ b/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureEditor.java @@ -63,10 +63,10 @@ import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -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.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditorValueChangedEvent; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.support.kendo.KendoStyleUtils; public class LookupFeatureEditor diff --git a/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureSupport.java b/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureSupport.java index 8fccf5284df..fb38b12c1f5 100644 --- a/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureSupport.java +++ b/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureSupport.java @@ -44,9 +44,9 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetail; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetailGroup; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureType; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureType; /** *

diff --git a/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureTraitsEditor.java b/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureTraitsEditor.java index fdd18989dac..58e3eaaad4c 100644 --- a/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureTraitsEditor.java +++ b/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureTraitsEditor.java @@ -40,8 +40,8 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxFormComponentUpdatingBehavior; import de.tudarmstadt.ukp.inception.feature.lookup.config.LookupServiceProperties; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.security.client.auth.AuthenticationTraitsEditor; import de.tudarmstadt.ukp.inception.security.client.auth.AuthenticationType; import de.tudarmstadt.ukp.inception.security.client.auth.NoAuthenticationTraitsEditor; diff --git a/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/config/ImageSupportAutoConfiguration.java b/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/config/ImageSupportAutoConfiguration.java index 5780e390758..9f8c178b518 100644 --- a/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/config/ImageSupportAutoConfiguration.java +++ b/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/config/ImageSupportAutoConfiguration.java @@ -22,7 +22,7 @@ import de.tudarmstadt.ukp.inception.image.feature.ImageFeatureSupport; import de.tudarmstadt.ukp.inception.image.sidebar.ImageSidebarFactory; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Configuration public class ImageSupportAutoConfiguration diff --git a/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/feature/ImageFeatureEditor.java b/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/feature/ImageFeatureEditor.java index a4941b2ed6e..88e13281f7c 100644 --- a/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/feature/ImageFeatureEditor.java +++ b/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/feature/ImageFeatureEditor.java @@ -33,7 +33,7 @@ import com.googlecode.wicket.kendo.ui.form.TextField; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; public class ImageFeatureEditor extends FeatureEditor diff --git a/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/feature/ImageFeatureSupport.java b/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/feature/ImageFeatureSupport.java index 4f8f3c8cd3e..81540f72778 100644 --- a/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/feature/ImageFeatureSupport.java +++ b/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/feature/ImageFeatureSupport.java @@ -46,9 +46,9 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetail; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetailGroup; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureType; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureType; /** * Extension providing image-related features for annotations. 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 cfa692fcc26..7011360c800 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 @@ -66,7 +66,7 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequestedEvent; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class ImageSidebar extends AnnotationSidebar_ImplBase 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 5a6553e1166..4f1372e59c3 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 @@ -32,7 +32,7 @@ import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.image.config.ImageSupportAutoConfiguration; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-imls-stringmatch/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/stringmatch/relation/settings/StringMatchingRelationRecommenderTraitsEditor.java b/inception/inception-imls-stringmatch/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/stringmatch/relation/settings/StringMatchingRelationRecommenderTraitsEditor.java index 3561038a24b..d9214f32955 100644 --- a/inception/inception-imls-stringmatch/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/stringmatch/relation/settings/StringMatchingRelationRecommenderTraitsEditor.java +++ b/inception/inception-imls-stringmatch/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/stringmatch/relation/settings/StringMatchingRelationRecommenderTraitsEditor.java @@ -33,7 +33,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.recommender.DefaultTrainableRecommenderTraitsEditor; import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommendationEngineFactory; import de.tudarmstadt.ukp.inception.recommendation.imls.stringmatch.relation.StringMatchingRelationRecommenderTraits; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class StringMatchingRelationRecommenderTraitsEditor extends DefaultTrainableRecommenderTraitsEditor diff --git a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/config/FactLinkingAutoConfiguration.java b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/config/FactLinkingAutoConfiguration.java index 4f57801478d..cfc4f207e5e 100644 --- a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/config/FactLinkingAutoConfiguration.java +++ b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/config/FactLinkingAutoConfiguration.java @@ -31,7 +31,7 @@ import de.tudarmstadt.ukp.inception.kb.factlinking.feature.PropertyFeatureSupport; import de.tudarmstadt.ukp.inception.kb.factlinking.feature.SubjectObjectFeatureSupport; import de.tudarmstadt.ukp.inception.kb.factlinking.initializers.FactLayerInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Deprecated @Configuration diff --git a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/FactLinkingServiceImpl.java b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/FactLinkingServiceImpl.java index b074a13005e..83977531d1a 100644 --- a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/FactLinkingServiceImpl.java +++ b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/FactLinkingServiceImpl.java @@ -43,9 +43,9 @@ import de.tudarmstadt.ukp.inception.kb.graph.KBInstance; import de.tudarmstadt.ukp.inception.kb.graph.KBProperty; import de.tudarmstadt.ukp.inception.kb.model.KnowledgeBase; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; /** *

diff --git a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/PropertyFeatureEditor.java b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/PropertyFeatureEditor.java index 5dc39d9c366..68300fc9330 100644 --- a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/PropertyFeatureEditor.java +++ b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/PropertyFeatureEditor.java @@ -54,10 +54,10 @@ import de.tudarmstadt.ukp.inception.kb.model.KnowledgeBase; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; import de.tudarmstadt.ukp.inception.ui.kb.feature.DisabledKBWarning; @Deprecated diff --git a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/PropertyFeatureSupport.java b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/PropertyFeatureSupport.java index bb21c8dcc90..b04a7d00bb7 100644 --- a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/PropertyFeatureSupport.java +++ b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/PropertyFeatureSupport.java @@ -45,9 +45,9 @@ import de.tudarmstadt.ukp.inception.kb.graph.KBProperty; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureType; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureType; /** *

diff --git a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/QualifierFeatureEditor.java b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/QualifierFeatureEditor.java index 42498fe25b9..c95082477c9 100644 --- a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/QualifierFeatureEditor.java +++ b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/QualifierFeatureEditor.java @@ -74,13 +74,13 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; import de.tudarmstadt.ukp.inception.rendering.pipeline.RenderSlotsEvent; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureUtil; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureUtil; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; @Deprecated public class QualifierFeatureEditor diff --git a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/SubjectObjectFeatureEditor.java b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/SubjectObjectFeatureEditor.java index 3b7a3e6acc1..b127f2b7481 100644 --- a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/SubjectObjectFeatureEditor.java +++ b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/SubjectObjectFeatureEditor.java @@ -72,13 +72,13 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; import de.tudarmstadt.ukp.inception.rendering.pipeline.RenderSlotsEvent; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureUtil; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureUtil; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; @Deprecated public class SubjectObjectFeatureEditor diff --git a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/SubjectObjectFeatureSupport.java b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/SubjectObjectFeatureSupport.java index 4c18974bd19..ec8cf88127b 100644 --- a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/SubjectObjectFeatureSupport.java +++ b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/SubjectObjectFeatureSupport.java @@ -46,10 +46,10 @@ import de.tudarmstadt.ukp.inception.kb.factlinking.config.FactLinkingAutoConfiguration; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureType; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureType; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; /** * To create feature support for subject and object of the fact layer diff --git a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/initializers/FactLayerInitializer.java b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/initializers/FactLayerInitializer.java index 74f84d7e688..a6117e79b20 100644 --- a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/initializers/FactLayerInitializer.java +++ b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/initializers/FactLayerInitializer.java @@ -43,7 +43,7 @@ import de.tudarmstadt.ukp.inception.kb.factlinking.feature.FactLinkingConstants; import de.tudarmstadt.ukp.inception.kb.factlinking.feature.PropertyFeatureSupport; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-kb-fact-linking/src/test/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/SubjectObjectFeatureSupportTest.java b/inception/inception-kb-fact-linking/src/test/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/SubjectObjectFeatureSupportTest.java index 80569793b5a..09b530e303a 100644 --- a/inception/inception-kb-fact-linking/src/test/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/SubjectObjectFeatureSupportTest.java +++ b/inception/inception-kb-fact-linking/src/test/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/SubjectObjectFeatureSupportTest.java @@ -35,7 +35,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.LinkMode; import de.tudarmstadt.ukp.clarin.webanno.model.MultiValueMode; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; @Deprecated public class SubjectObjectFeatureSupportTest 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 323c51b75a5..97eee158675 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 @@ -29,7 +29,7 @@ import de.tudarmstadt.ukp.inception.kb.KnowledgeBaseService; import de.tudarmstadt.ukp.inception.kb.KnowledgeBaseServiceImpl; import de.tudarmstadt.ukp.inception.kb.exporter.KnowledgeBaseExporter; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Configuration @ConditionalOnProperty(prefix = "knowledge-base", name = "enabled", havingValue = "true", matchIfMissing = true) diff --git a/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/exporter/KnowledgeBaseExporter.java b/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/exporter/KnowledgeBaseExporter.java index c536e515747..a9847f99bdc 100644 --- a/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/exporter/KnowledgeBaseExporter.java +++ b/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/exporter/KnowledgeBaseExporter.java @@ -57,7 +57,7 @@ import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBaseServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.kb.model.KnowledgeBase; import de.tudarmstadt.ukp.inception.kb.reification.Reification; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.exporters.LayerExporter; /** diff --git a/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseExporterTest.java b/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseExporterTest.java index 5121118309d..b9981340ace 100644 --- a/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseExporterTest.java +++ b/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseExporterTest.java @@ -60,7 +60,7 @@ import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBasePropertiesImpl; import de.tudarmstadt.ukp.inception.kb.exporter.KnowledgeBaseExporter; import de.tudarmstadt.ukp.inception.kb.model.KnowledgeBase; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @ExtendWith(MockitoExtension.class) public class KnowledgeBaseExporterTest 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 b6e40a423dd..1675fa36a15 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 @@ -24,10 +24,10 @@ import org.springframework.context.annotation.Configuration; 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; -import de.tudarmstadt.ukp.inception.schema.layer.LayerType; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerType; import de.tudarmstadt.ukp.inception.ui.core.docanno.event.DocumentMetadataAnnotationActionUndoSupport; import de.tudarmstadt.ukp.inception.ui.core.docanno.layer.DocumentMetadataLayerSingletonCreatingWatcher; import de.tudarmstadt.ukp.inception.ui.core.docanno.layer.DocumentMetadataLayerSupport; diff --git a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/event/CreateDocumentMetadataAnnotationAction.java b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/event/CreateDocumentMetadataAnnotationAction.java index 2fd2ed29020..3d2b46b3af6 100644 --- a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/event/CreateDocumentMetadataAnnotationAction.java +++ b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/event/CreateDocumentMetadataAnnotationAction.java @@ -28,8 +28,8 @@ import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.actionbar.undo.actions.RedoableAnnotationAction; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.actionbar.undo.actions.UndoableAnnotationAction; 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.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; import de.tudarmstadt.ukp.inception.ui.core.docanno.layer.DocumentMetadataLayerAdapter; public class CreateDocumentMetadataAnnotationAction diff --git a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/event/DeleteDocumentMetadataAnnotationAction.java b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/event/DeleteDocumentMetadataAnnotationAction.java index 28a9619deb7..a46ae88231d 100644 --- a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/event/DeleteDocumentMetadataAnnotationAction.java +++ b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/event/DeleteDocumentMetadataAnnotationAction.java @@ -24,8 +24,8 @@ import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.actionbar.undo.PostAction; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class DeleteDocumentMetadataAnnotationAction extends CreateDocumentMetadataAnnotationAction diff --git a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/layer/DocumentMetadataLayerAdapter.java b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/layer/DocumentMetadataLayerAdapter.java index ef86472bc2f..93de62a44df 100644 --- a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/layer/DocumentMetadataLayerAdapter.java +++ b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/layer/DocumentMetadataLayerAdapter.java @@ -38,9 +38,9 @@ import de.tudarmstadt.ukp.inception.annotation.layer.TypeAdapter_ImplBase; import de.tudarmstadt.ukp.inception.rendering.selection.Selection; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; import de.tudarmstadt.ukp.inception.ui.core.docanno.event.DocumentMetadataCreatedEvent; import de.tudarmstadt.ukp.inception.ui.core.docanno.event.DocumentMetadataDeletedEvent; 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 6bdad68f182..e77610f847e 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 @@ -29,9 +29,9 @@ 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; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; import de.tudarmstadt.ukp.inception.ui.core.docanno.config.DocumentMetadataLayerSupportAutoConfiguration; /** diff --git a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/layer/DocumentMetadataLayerSupport.java b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/layer/DocumentMetadataLayerSupport.java index 7a8758d7a6e..a4b2bc33140 100644 --- a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/layer/DocumentMetadataLayerSupport.java +++ b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/layer/DocumentMetadataLayerSupport.java @@ -37,9 +37,9 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.inception.rendering.Renderer; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport_ImplBase; -import de.tudarmstadt.ukp.inception.schema.layer.LayerType; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport_ImplBase; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerType; import de.tudarmstadt.ukp.inception.ui.core.docanno.config.DocumentMetadataLayerSupportAutoConfiguration; import de.tudarmstadt.ukp.inception.ui.core.docanno.config.DocumentMetadataLayerSupportProperties; 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 f6d10ba2cfc..d2a78b30a10 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 @@ -60,13 +60,13 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; 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.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.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditorValueChangedEvent; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; public class DocumentMetadataAnnotationDetailPanel extends Panel 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 5e086be50ce..d0e5b53b76f 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 @@ -68,12 +68,12 @@ import de.tudarmstadt.ukp.inception.rendering.Renderer; 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.feature.TypeUtil; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.feature.TypeUtil; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; import de.tudarmstadt.ukp.inception.ui.core.docanno.event.DocumentMetadataEvent; import de.tudarmstadt.ukp.inception.ui.core.docanno.layer.DocumentMetadataLayerAdapter; import de.tudarmstadt.ukp.inception.ui.core.docanno.layer.DocumentMetadataLayerSupport; 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 d5f2e0a7a53..fe532617443 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 @@ -29,7 +29,7 @@ import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.sidebar.AnnotationSidebar_ImplBase; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.ui.core.docanno.config.DocumentMetadataLayerSupportAutoConfiguration; import de.tudarmstadt.ukp.inception.ui.core.docanno.layer.DocumentMetadataLayerSupport; diff --git a/inception/inception-log/pom.xml b/inception/inception-log/pom.xml index 1fb941eefbc..9792a09873d 100644 --- a/inception/inception-log/pom.xml +++ b/inception/inception-log/pom.xml @@ -186,11 +186,6 @@ inception-schema test - - de.tudarmstadt.ukp.inception.app - inception-api - test - diff --git a/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/LayerConfigurationChangedEventAdapter.java b/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/LayerConfigurationChangedEventAdapter.java index 1945ae63130..601d50cfd78 100644 --- a/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/LayerConfigurationChangedEventAdapter.java +++ b/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/LayerConfigurationChangedEventAdapter.java @@ -19,7 +19,7 @@ import org.springframework.stereotype.Component; -import de.tudarmstadt.ukp.inception.schema.event.LayerConfigurationChangedEvent; +import de.tudarmstadt.ukp.inception.schema.api.event.LayerConfigurationChangedEvent; @Component public class LayerConfigurationChangedEventAdapter diff --git a/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/TagEventAdapter.java b/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/TagEventAdapter.java index a880b5d36d0..4a337bc761f 100644 --- a/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/TagEventAdapter.java +++ b/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/TagEventAdapter.java @@ -25,7 +25,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.JSONUtil; import de.tudarmstadt.ukp.inception.log.model.TagDetails; -import de.tudarmstadt.ukp.inception.schema.event.TagEvent; +import de.tudarmstadt.ukp.inception.schema.api.event.TagEvent; @Component public class TagEventAdapter 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 7ae1aa5fff9..c68c11d383d 100644 --- a/inception/inception-log/src/test/java/de/tudarmstadt/ukp/inception/log/EventRepositoryImplIntegrationTest.java +++ b/inception/inception-log/src/test/java/de/tudarmstadt/ukp/inception/log/EventRepositoryImplIntegrationTest.java @@ -45,7 +45,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.config.ProjectServiceAutoConfiguration; @@ -55,7 +54,7 @@ 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; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; @EnableAutoConfiguration @@ -71,7 +70,6 @@ CasStorageServiceAutoConfiguration.class, // RepositoryAutoConfiguration.class, // AnnotationSchemaServiceAutoConfiguration.class, // - AnnotationSchemaAutoConfiguration.class, // SecurityAutoConfiguration.class }) public class EventRepositoryImplIntegrationTest { 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 d202da88819..ee0b1ed77a1 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 @@ -63,8 +63,8 @@ import de.tudarmstadt.ukp.inception.pdfeditor.resources.PdfAnnotationEditorJavascriptResourceReference; import de.tudarmstadt.ukp.inception.rendering.coloring.ColoringService; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; /** * @deprecated Superseded by the new PDF editor 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 9d6aeb40b61..ca0e7ef3348 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 @@ -50,7 +50,7 @@ import de.tudarmstadt.ukp.inception.pdfeditor.PdfAnnotationEditor; import de.tudarmstadt.ukp.inception.pdfeditor.pdfanno.model.PdfExtractFile; import de.tudarmstadt.ukp.inception.pdfeditor.pdfextract.PDFExtractor; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; /** * @deprecated Superseded by the new PDF editor diff --git a/inception/inception-pdf-editor/src/test/java/de/tudarmstadt/ukp/inception/pdfeditor/pdfanno/model/PdfAnnoRendererTest.java b/inception/inception-pdf-editor/src/test/java/de/tudarmstadt/ukp/inception/pdfeditor/pdfanno/model/PdfAnnoRendererTest.java index f90aa88b099..d12729604c5 100644 --- a/inception/inception-pdf-editor/src/test/java/de/tudarmstadt/ukp/inception/pdfeditor/pdfanno/model/PdfAnnoRendererTest.java +++ b/inception/inception-pdf-editor/src/test/java/de/tudarmstadt/ukp/inception/pdfeditor/pdfanno/model/PdfAnnoRendererTest.java @@ -72,8 +72,8 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequest; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; import de.tudarmstadt.ukp.inception.schema.service.FeatureSupportRegistryImpl; /** 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 2a5205cc252..c8762154be7 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 @@ -40,7 +40,7 @@ import de.tudarmstadt.ukp.inception.pdfeditor2.view.PdfDocumentIFrameView; import de.tudarmstadt.ukp.inception.rendering.coloring.ColoringService; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class PdfAnnotationEditor extends ExternalAnnotationEditorBase 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 1b9cc30b710..c65f30a6397 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 @@ -52,7 +52,7 @@ import de.tudarmstadt.ukp.inception.pdfeditor2.view.pdfjs.PdfJsViewerPage; import de.tudarmstadt.ukp.inception.pdfeditor2.visual.VisualPDFTextStripper; import de.tudarmstadt.ukp.inception.pdfeditor2.visual.model.VModel; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class PdfDocumentIFrameView extends WebMarkupContainer 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 0be3a007852..67272d57970 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 @@ -56,7 +56,7 @@ import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.project.export.ProjectExportService; import de.tudarmstadt.ukp.inception.project.export.settings.FormatDropdownChoice; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** * A Panel used to add Project Guidelines in a selected {@link Project} 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 97ffcb0a5b9..3375de61c77 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 @@ -57,7 +57,7 @@ import de.tudarmstadt.ukp.inception.export.config.DocumentImportExportServicePropertiesImpl; import de.tudarmstadt.ukp.inception.io.xmi.XmiFormatSupport; import de.tudarmstadt.ukp.inception.io.xmi.config.UimaFormatsPropertiesImpl.XmiFormatProperties; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.exporters.AnnotationDocumentExporter; @ExtendWith(MockitoExtension.class) diff --git a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationLayerInitializer.java b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationLayerInitializer.java index f4370ef8457..0d42b2ca1e1 100644 --- a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationLayerInitializer.java +++ b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationLayerInitializer.java @@ -37,7 +37,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.LayerInitializer; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.basic.config.InceptionBasicProjectInitializersAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationRecommenderInitializer.java b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationRecommenderInitializer.java index 8df00967771..24551acebce 100644 --- a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationRecommenderInitializer.java +++ b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationRecommenderInitializer.java @@ -35,7 +35,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommendationEngineFactory; import de.tudarmstadt.ukp.inception.recommendation.imls.stringmatch.relation.StringMatchingRelationRecommenderFactory; import de.tudarmstadt.ukp.inception.recommendation.imls.stringmatch.relation.StringMatchingRelationRecommenderTraits; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationTagSetInitializer.java b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationTagSetInitializer.java index d860d42e9f9..982620b4b1e 100644 --- a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationTagSetInitializer.java +++ b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationTagSetInitializer.java @@ -28,7 +28,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TagSetInitializer; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.basic.config.InceptionBasicProjectInitializersAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanLayerInitializer.java b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanLayerInitializer.java index 02086b92cdc..1e1357ca0c4 100644 --- a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanLayerInitializer.java +++ b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanLayerInitializer.java @@ -36,7 +36,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TokenLayerInitializer; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.basic.config.InceptionBasicProjectInitializersAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanRecommenderInitializer.java b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanRecommenderInitializer.java index 6793a227cf4..d8475c954a5 100644 --- a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanRecommenderInitializer.java +++ b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanRecommenderInitializer.java @@ -32,7 +32,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender; import de.tudarmstadt.ukp.inception.recommendation.imls.stringmatch.span.StringMatchingRecommenderFactory; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanTagSetInitializer.java b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanTagSetInitializer.java index 6477633b596..c101d7f6b36 100644 --- a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanTagSetInitializer.java +++ b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanTagSetInitializer.java @@ -28,7 +28,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TagSetInitializer; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.basic.config.InceptionBasicProjectInitializersAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/config/InceptionBasicProjectInitializersAutoConfiguration.java b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/config/InceptionBasicProjectInitializersAutoConfiguration.java index 72fe33f42c9..d25e7dd02e8 100644 --- a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/config/InceptionBasicProjectInitializersAutoConfiguration.java +++ b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/config/InceptionBasicProjectInitializersAutoConfiguration.java @@ -35,7 +35,7 @@ import de.tudarmstadt.ukp.inception.recommendation.imls.stringmatch.config.StringMatchingRecommenderAutoConfiguration; import de.tudarmstadt.ukp.inception.recommendation.imls.stringmatch.relation.StringMatchingRelationRecommenderFactory; import de.tudarmstadt.ukp.inception.recommendation.imls.stringmatch.span.StringMatchingRecommenderFactory; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @AutoConfigureAfter({ // RecommenderServiceAutoConfiguration.class, // diff --git a/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelLayerInitializer.java b/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelLayerInitializer.java index a5c890ff586..788f2db3bda 100644 --- a/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelLayerInitializer.java +++ b/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelLayerInitializer.java @@ -34,7 +34,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.LayerInitializer; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.doclabeling.config.InceptionDocumentLabelingProjectInitializersAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.ui.core.docanno.layer.DocumentMetadataLayerSupport; /** diff --git a/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelTagSetInitializer.java b/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelTagSetInitializer.java index ef8bd1ad206..b7a6c14a0b2 100644 --- a/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelTagSetInitializer.java +++ b/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelTagSetInitializer.java @@ -29,7 +29,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TagSetInitializer; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.doclabeling.config.InceptionDocumentLabelingProjectInitializersAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/config/InceptionDocumentLabelingProjectInitializersAutoConfiguration.java b/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/config/InceptionDocumentLabelingProjectInitializersAutoConfiguration.java index 0d90f07927a..8cae419ff22 100644 --- a/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/config/InceptionDocumentLabelingProjectInitializersAutoConfiguration.java +++ b/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/config/InceptionDocumentLabelingProjectInitializersAutoConfiguration.java @@ -26,7 +26,7 @@ import de.tudarmstadt.ukp.inception.project.initializers.doclabeling.BasicDocumentLabelLayerInitializer; import de.tudarmstadt.ukp.inception.project.initializers.doclabeling.BasicDocumentLabelTagSetInitializer; import de.tudarmstadt.ukp.inception.project.initializers.doclabeling.BasicDocumentLabelingProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.ui.core.docanno.config.DocumentMetadataLayerSupportAutoConfiguration; import de.tudarmstadt.ukp.inception.ui.core.docanno.layer.DocumentMetadataLayerSupport; import de.tudarmstadt.ukp.inception.ui.core.docanno.sidebar.DocumentMetadataSidebarFactory; diff --git a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelLayerInitializer.java b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelLayerInitializer.java index 1407cc213b9..34c38505b51 100644 --- a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelLayerInitializer.java +++ b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelLayerInitializer.java @@ -35,7 +35,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.LayerInitializer; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.sentencelabeling.config.InceptionSentenceLabelingProjectInitializersAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelRecommenderInitializer.java b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelRecommenderInitializer.java index 1bc0c6b9a7a..9e6be32d5e3 100644 --- a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelRecommenderInitializer.java +++ b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelRecommenderInitializer.java @@ -32,7 +32,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender; import de.tudarmstadt.ukp.inception.recommendation.imls.opennlp.doccat.OpenNlpDoccatRecommenderFactory; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelTagSetInitializer.java b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelTagSetInitializer.java index 1432fc1d667..d606d6865bd 100644 --- a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelTagSetInitializer.java +++ b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelTagSetInitializer.java @@ -29,7 +29,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TagSetInitializer; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.sentencelabeling.config.InceptionSentenceLabelingProjectInitializersAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/config/InceptionSentenceLabelingProjectInitializersAutoConfiguration.java b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/config/InceptionSentenceLabelingProjectInitializersAutoConfiguration.java index ae968a67fea..ae0af444544 100644 --- a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/config/InceptionSentenceLabelingProjectInitializersAutoConfiguration.java +++ b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/config/InceptionSentenceLabelingProjectInitializersAutoConfiguration.java @@ -28,7 +28,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.config.RecommenderServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.recommendation.imls.opennlp.doccat.OpenNlpDoccatRecommenderFactory; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @AutoConfigureAfter({ // RecommenderServiceAutoConfiguration.class }) diff --git a/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/EntityLinkingProjectInitializer.java b/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/EntityLinkingProjectInitializer.java index 2d997db5111..1c2198c95db 100644 --- a/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/EntityLinkingProjectInitializer.java +++ b/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/EntityLinkingProjectInitializer.java @@ -32,7 +32,7 @@ import de.tudarmstadt.ukp.dkpro.core.api.ner.type.NamedEntity; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.wikidatalinking.config.WikiDataLinkingProjectInitializersAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.ui.kb.initializers.NamedEntityIdentifierFeatureInitializer; /** diff --git a/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/NamedEntityIdentifierStringRecommenderInitializer.java b/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/NamedEntityIdentifierStringRecommenderInitializer.java index 65bccab4020..c9eb9317185 100644 --- a/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/NamedEntityIdentifierStringRecommenderInitializer.java +++ b/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/NamedEntityIdentifierStringRecommenderInitializer.java @@ -31,7 +31,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender; import de.tudarmstadt.ukp.inception.recommendation.imls.stringmatch.span.StringMatchingRecommenderFactory; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.ui.kb.initializers.NamedEntityIdentifierFeatureInitializer; /** diff --git a/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/config/WikiDataLinkingProjectInitializersAutoConfiguration.java b/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/config/WikiDataLinkingProjectInitializersAutoConfiguration.java index e0b0b526a6e..6f0387fda1a 100644 --- a/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/config/WikiDataLinkingProjectInitializersAutoConfiguration.java +++ b/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/config/WikiDataLinkingProjectInitializersAutoConfiguration.java @@ -33,7 +33,7 @@ import de.tudarmstadt.ukp.inception.recommendation.config.RecommenderServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.recommendation.imls.stringmatch.config.StringMatchingRecommenderAutoConfiguration; import de.tudarmstadt.ukp.inception.recommendation.imls.stringmatch.span.StringMatchingRecommenderFactory; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @AutoConfigureAfter({ // KnowledgeBaseServiceAutoConfiguration.class, // diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/ChunkLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/ChunkLayerInitializer.java index aec03a48d2c..739dae8126e 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/ChunkLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/ChunkLayerInitializer.java @@ -34,7 +34,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.dkpro.core.api.syntax.type.chunk.Chunk; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceLayerInitializer.java index 82f5d81f2cf..e6f54d4bb50 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceLayerInitializer.java @@ -34,7 +34,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceRelationTagSetInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceRelationTagSetInitializer.java index bbe76f8e201..2489a844f9f 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceRelationTagSetInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceRelationTagSetInitializer.java @@ -29,7 +29,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceTypeTagSetInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceTypeTagSetInitializer.java index 9cde9de3480..b33ee901289 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceTypeTagSetInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceTypeTagSetInitializer.java @@ -29,7 +29,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyFlavorTagSetInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyFlavorTagSetInitializer.java index 703f8d85f04..166262ca54b 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyFlavorTagSetInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyFlavorTagSetInitializer.java @@ -29,7 +29,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyLayerInitializer.java index 1699e4e0e7f..bd6a2afcfde 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyLayerInitializer.java @@ -36,7 +36,7 @@ import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.dkpro.core.api.syntax.type.dependency.Dependency; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyTypeTagSetInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyTypeTagSetInitializer.java index 9881b3f4382..7622e09bf08 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyTypeTagSetInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyTypeTagSetInitializer.java @@ -29,7 +29,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/LemmaLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/LemmaLayerInitializer.java index e1a49e4ef9b..4db666b4865 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/LemmaLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/LemmaLayerInitializer.java @@ -35,7 +35,7 @@ import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Lemma; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/MorphologicalFeaturesLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/MorphologicalFeaturesLayerInitializer.java index 730c98d7460..c137d833f0c 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/MorphologicalFeaturesLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/MorphologicalFeaturesLayerInitializer.java @@ -35,7 +35,7 @@ import de.tudarmstadt.ukp.dkpro.core.api.lexmorph.type.morph.MorphologicalFeatures; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/NamedEntityLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/NamedEntityLayerInitializer.java index 3ea9a30d83e..04b61a194bd 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/NamedEntityLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/NamedEntityLayerInitializer.java @@ -35,7 +35,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.dkpro.core.api.ner.type.NamedEntity; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/NamedEntityTagSetInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/NamedEntityTagSetInitializer.java index c026836af72..7ae9e2c1478 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/NamedEntityTagSetInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/NamedEntityTagSetInitializer.java @@ -29,7 +29,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/OrthographyLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/OrthographyLayerInitializer.java index b6a3b33b253..1a8dd6edf8e 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/OrthographyLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/OrthographyLayerInitializer.java @@ -35,7 +35,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.dkpro.core.api.transform.type.SofaChangeAnnotation; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/PartOfSpeechLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/PartOfSpeechLayerInitializer.java index 18c813ec192..bb0d6356eff 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/PartOfSpeechLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/PartOfSpeechLayerInitializer.java @@ -36,7 +36,7 @@ import de.tudarmstadt.ukp.dkpro.core.api.lexmorph.type.pos.POS; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/PartOfSpeechTagSetInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/PartOfSpeechTagSetInitializer.java index 0f2aa4e7c67..f24b252e474 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/PartOfSpeechTagSetInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/PartOfSpeechTagSetInitializer.java @@ -29,7 +29,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SemPredArgLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SemPredArgLayerInitializer.java index 7cae80bcc1c..a46f8ceed3a 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SemPredArgLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SemPredArgLayerInitializer.java @@ -38,7 +38,7 @@ import de.tudarmstadt.ukp.dkpro.core.api.semantics.type.SemArgLink; import de.tudarmstadt.ukp.dkpro.core.api.semantics.type.SemPred; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SentenceLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SentenceLayerInitializer.java index 9b7c0e1b7f2..dca4157bcfb 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SentenceLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SentenceLayerInitializer.java @@ -33,7 +33,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Sentence; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SofaChangeOperationTagSetInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SofaChangeOperationTagSetInitializer.java index 32bb591b3c3..5c475833f17 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SofaChangeOperationTagSetInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SofaChangeOperationTagSetInitializer.java @@ -26,7 +26,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SurfaceFormLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SurfaceFormLayerInitializer.java index 78025d192af..a1fb1596b7c 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SurfaceFormLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SurfaceFormLayerInitializer.java @@ -34,7 +34,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.SurfaceForm; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/TokenLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/TokenLayerInitializer.java index ed03e689438..b30cbd4ca8c 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/TokenLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/TokenLayerInitializer.java @@ -33,7 +33,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/config/ProjectInitializersAutoConfiguration.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/config/ProjectInitializersAutoConfiguration.java index 91721fee3b1..489bc949b50 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/config/ProjectInitializersAutoConfiguration.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/config/ProjectInitializersAutoConfiguration.java @@ -43,7 +43,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TokenLayerInitializer; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.empty.EmptyProjectInitializer; import de.tudarmstadt.ukp.inception.project.api.ProjectService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Configuration public class ProjectInitializersAutoConfiguration diff --git a/inception/inception-recommendation-api/src/main/java/de/tudarmstadt/ukp/inception/recommendation/api/RecommendationService.java b/inception/inception-recommendation-api/src/main/java/de/tudarmstadt/ukp/inception/recommendation/api/RecommendationService.java index 9462f23a768..98fd8eea3b3 100644 --- a/inception/inception-recommendation-api/src/main/java/de/tudarmstadt/ukp/inception/recommendation/api/RecommendationService.java +++ b/inception/inception-recommendation-api/src/main/java/de/tudarmstadt/ukp/inception/recommendation/api/RecommendationService.java @@ -48,7 +48,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommendationEngineFactory; import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommenderContext; import de.tudarmstadt.ukp.inception.scheduling.TaskMonitor; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; /** * The main contact point of the Recommendation module. This interface can be injected in the Wicket diff --git a/inception/inception-recommendation/pom.xml b/inception/inception-recommendation/pom.xml index 015ad993541..10d70d6171b 100644 --- a/inception/inception-recommendation/pom.xml +++ b/inception/inception-recommendation/pom.xml @@ -57,10 +57,6 @@ de.tudarmstadt.ukp.inception.app inception-schema - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-project-api diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/RecommendationEditorExtension.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/RecommendationEditorExtension.java index f0000e0547b..6b8fc15880d 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/RecommendationEditorExtension.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/RecommendationEditorExtension.java @@ -73,9 +73,9 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetail; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetailGroup; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; /** * This component hooks into the annotation editor in order to: 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 15be093928c..d604f67309e 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 @@ -59,8 +59,8 @@ import de.tudarmstadt.ukp.inception.recommendation.service.RecommenderFactoryRegistryImpl; import de.tudarmstadt.ukp.inception.recommendation.sidebar.RecommendationSidebarFactory; import de.tudarmstadt.ukp.inception.scheduling.SchedulingService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; /** * Provides all back-end Spring beans for the recommendation functionality. 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 9949d7db7b4..21f12c790f3 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 @@ -42,7 +42,7 @@ 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; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.exporters.AnnotationDocumentExporter; import de.tudarmstadt.ukp.inception.schema.exporters.LayerExporter; diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/exporter/RecommenderExporter.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/exporter/RecommenderExporter.java index 28117762c9b..30b3b328bc5 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/exporter/RecommenderExporter.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/exporter/RecommenderExporter.java @@ -41,7 +41,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender; import de.tudarmstadt.ukp.inception.recommendation.config.RecommenderServiceAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.exporters.LayerExporter; /** diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/project/RecommenderEditorPanel.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/project/RecommenderEditorPanel.java index 58c04714214..35c714b0f20 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/project/RecommenderEditorPanel.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/project/RecommenderEditorPanel.java @@ -71,7 +71,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.api.RecommenderFactoryRegistry; import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class RecommenderEditorPanel extends Panel diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationRelationRenderer.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationRelationRenderer.java index 255b7d14748..5d86854c7aa 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationRelationRenderer.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationRelationRenderer.java @@ -42,9 +42,9 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VArc; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; /** *

diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationRenderer.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationRenderer.java index feab51f31b0..2ec63682a53 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationRenderer.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationRenderer.java @@ -32,7 +32,7 @@ import de.tudarmstadt.ukp.inception.rendering.pipeline.RenderStep; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequest; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationSpanRenderer.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationSpanRenderer.java index c471615d4cd..69602bde33c 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationSpanRenderer.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationSpanRenderer.java @@ -35,8 +35,8 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; import de.tudarmstadt.ukp.inception.rendering.vmodel.VRange; import de.tudarmstadt.ukp.inception.rendering.vmodel.VSpan; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; /** *

diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationTypeRenderer.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationTypeRenderer.java index cd332622d39..62d4789b5b2 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationTypeRenderer.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationTypeRenderer.java @@ -20,7 +20,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.model.Predictions; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequest; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; /** * Type Adapters for span, arc, and chain annotations 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 75018cf9495..882c71786f2 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 @@ -191,10 +191,10 @@ import de.tudarmstadt.ukp.inception.scheduling.SchedulingService; import de.tudarmstadt.ukp.inception.scheduling.Task; import de.tudarmstadt.ukp.inception.scheduling.TaskMonitor; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationComparisonUtils; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationComparisonUtils; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; /** * The implementation of the 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 31398acf55d..9bb8b648ac2 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 @@ -58,7 +58,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommendationEngineFactory; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequestedEvent; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.support.help.DocLink; public class RecommendationSidebar 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 bc890eeaa54..c0bcf687ca1 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 @@ -72,8 +72,8 @@ import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommenderContext; import de.tudarmstadt.ukp.inception.recommendation.event.PredictionsSwitchedEvent; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class RecommenderInfoPanel extends Panel diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/tasks/NonTrainableRecommenderActivationTask.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/tasks/NonTrainableRecommenderActivationTask.java index c9ab6d4ba30..10b9523266d 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/tasks/NonTrainableRecommenderActivationTask.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/tasks/NonTrainableRecommenderActivationTask.java @@ -45,7 +45,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommenderContext; import de.tudarmstadt.ukp.inception.recommendation.event.RecommenderEvaluationResultEvent; import de.tudarmstadt.ukp.inception.recommendation.event.RecommenderTaskNotificationEvent; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** * This task activates all non-trainable recommenders. 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 e8f00da9400..c610f715017 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 @@ -54,7 +54,7 @@ import de.tudarmstadt.ukp.inception.recommendation.event.RecommenderEvaluationResultEvent; import de.tudarmstadt.ukp.inception.recommendation.event.RecommenderTaskNotificationEvent; import de.tudarmstadt.ukp.inception.scheduling.SchedulingService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** * This task evaluates all available classification tools for all annotation layers of the current 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 3abd0390f9d..b4d02abfb4a 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 @@ -57,7 +57,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommenderContext; import de.tudarmstadt.ukp.inception.recommendation.event.RecommenderTaskNotificationEvent; import de.tudarmstadt.ukp.inception.scheduling.SchedulingService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class TrainingTask extends RecommendationTask_ImplBase 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 6bf8c51e20b..8b0fd2e6cc8 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 @@ -49,7 +49,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.model.LearningRecordChangeLocation; import de.tudarmstadt.ukp.inception.recommendation.api.model.LearningRecordType; import de.tudarmstadt.ukp.inception.recommendation.api.model.SuggestionType; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @ExtendWith(MockitoExtension.class) public class LearningRecordExporterTest diff --git a/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/exporter/RecommenderExporterTest.java b/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/exporter/RecommenderExporterTest.java index 41f0dab6890..e252d0608b3 100644 --- a/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/exporter/RecommenderExporterTest.java +++ b/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/exporter/RecommenderExporterTest.java @@ -52,7 +52,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @ExtendWith(MockitoExtension.class) public class RecommenderExporterTest 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 e66d8c82a01..277050bab92 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 @@ -83,7 +83,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.model.SpanSuggestion; import de.tudarmstadt.ukp.inception.recommendation.api.model.SuggestionType; import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommendationEngineFactory; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; import de.tudarmstadt.ukp.inception.schema.service.AnnotationSchemaServiceImpl; import de.tudarmstadt.ukp.inception.schema.service.FeatureSupportRegistryImpl; diff --git a/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/service/RelationSuggestionVisibilityCalculationTest.java b/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/service/RelationSuggestionVisibilityCalculationTest.java index be006db09e9..c6db4c9234b 100644 --- a/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/service/RelationSuggestionVisibilityCalculationTest.java +++ b/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/service/RelationSuggestionVisibilityCalculationTest.java @@ -48,7 +48,7 @@ import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.dkpro.core.api.syntax.type.dependency.Dependency; import de.tudarmstadt.ukp.inception.recommendation.api.model.AnnotationSuggestion; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @ExtendWith(MockitoExtension.class) public class RelationSuggestionVisibilityCalculationTest diff --git a/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/service/SpanSuggestionVisibilityCalculationTest.java b/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/service/SpanSuggestionVisibilityCalculationTest.java index 5a7b32ac6fa..fd489c6c1dd 100644 --- a/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/service/SpanSuggestionVisibilityCalculationTest.java +++ b/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/service/SpanSuggestionVisibilityCalculationTest.java @@ -53,7 +53,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.model.Offset; import de.tudarmstadt.ukp.inception.recommendation.api.model.SpanSuggestion; import de.tudarmstadt.ukp.inception.recommendation.api.model.SuggestionDocumentGroup; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @ExtendWith(MockitoExtension.class) public class SpanSuggestionVisibilityCalculationTest 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 1a0bbd7ee87..0ed9645386b 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 @@ -46,11 +46,11 @@ import de.tudarmstadt.ukp.inception.rendering.Renderer; 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.TypeAdapter; -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.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.feature.TypeUtil; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; import de.tudarmstadt.ukp.inception.ui.core.docanno.layer.DocumentMetadataLayerSupport; public abstract class AnnotationPanel 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 1976ac215d3..c70c652cdc4 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 @@ -51,11 +51,11 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.revieweditor.event.RefreshEvent; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; public class DocumentAnnotationPanel extends Panel 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 1e5fb02d4cf..fa2c60cbfe3 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 @@ -35,7 +35,7 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.revieweditor.event.RefreshEvent; import de.tudarmstadt.ukp.inception.revieweditor.event.SelectAnnotationEvent; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class ReviewEditor extends AnnotationEditorBase diff --git a/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/SpanAnnotationPanel.java b/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/SpanAnnotationPanel.java index b2cbe63dc2c..e226f47b840 100644 --- a/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/SpanAnnotationPanel.java +++ b/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/SpanAnnotationPanel.java @@ -44,9 +44,9 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.revieweditor.event.SelectAnnotationEvent; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; public class SpanAnnotationPanel extends Panel diff --git a/inception/inception-schema/pom.xml b/inception/inception-schema/pom.xml index 99cb72e7b59..34bd0c0b7fb 100644 --- a/inception/inception-schema/pom.xml +++ b/inception/inception-schema/pom.xml @@ -82,10 +82,6 @@ de.tudarmstadt.ukp.inception.app inception-model - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-api-annotation diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/AnnotationSchemaPropertiesImpl.java b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/config/AnnotationSchemaPropertiesImpl.java similarity index 91% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/AnnotationSchemaPropertiesImpl.java rename to inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/config/AnnotationSchemaPropertiesImpl.java index be8f49724e2..44943b75b50 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/AnnotationSchemaPropertiesImpl.java +++ b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/config/AnnotationSchemaPropertiesImpl.java @@ -15,15 +15,17 @@ * 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.schema.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.schema.api.config.AnnotationSchemaProperties; + /** *

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

*/ @ConfigurationProperties("ui") 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 c41d802e375..8b3e1872908 100644 --- a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/config/AnnotationSchemaServiceAutoConfiguration.java +++ b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/config/AnnotationSchemaServiceAutoConfiguration.java @@ -29,7 +29,6 @@ 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.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.inception.annotation.feature.bool.BooleanFeatureSupport; @@ -55,20 +54,22 @@ import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanOverlapBehavior; 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.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; import de.tudarmstadt.ukp.inception.schema.exporters.AnnotationDocumentExporter; import de.tudarmstadt.ukp.inception.schema.exporters.LayerExporter; import de.tudarmstadt.ukp.inception.schema.exporters.TagSetExporter; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; import de.tudarmstadt.ukp.inception.schema.service.AnnotationSchemaServiceEventAdapter; import de.tudarmstadt.ukp.inception.schema.service.AnnotationSchemaServiceImpl; import de.tudarmstadt.ukp.inception.schema.service.FeatureSupportRegistryImpl; @Configuration @EnableConfigurationProperties({ // + AnnotationSchemaPropertiesImpl.class, // StringFeatureSupportPropertiesImpl.class, // LinkFeatureSupportPropertiesImpl.class }) public class AnnotationSchemaServiceAutoConfiguration diff --git a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/LayerExporter.java b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/LayerExporter.java index e33d9a3304e..e410be22dc5 100644 --- a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/LayerExporter.java +++ b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/LayerExporter.java @@ -56,7 +56,7 @@ import de.tudarmstadt.ukp.dkpro.core.api.lexmorph.type.morph.MorphologicalFeatures; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Lemma; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; /** diff --git a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/LegacyProjectInitializer.java b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/LegacyProjectInitializer.java index 02730639a43..1c1d358bf40 100644 --- a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/LegacyProjectInitializer.java +++ b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/LegacyProjectInitializer.java @@ -43,7 +43,7 @@ import de.tudarmstadt.ukp.dkpro.core.api.syntax.type.chunk.Chunk; import de.tudarmstadt.ukp.dkpro.core.api.syntax.type.dependency.Dependency; import de.tudarmstadt.ukp.dkpro.core.api.syntax.type.dependency.DependencyFlavor; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class LegacyProjectInitializer { diff --git a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/TagSetExporter.java b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/TagSetExporter.java index 765c040b755..2a353f1cf29 100644 --- a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/TagSetExporter.java +++ b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/TagSetExporter.java @@ -39,7 +39,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Tag; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; /** diff --git a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceEventAdapter.java b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceEventAdapter.java index 3f49627f281..0969a2d464b 100644 --- a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceEventAdapter.java +++ b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceEventAdapter.java @@ -24,7 +24,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.inception.project.api.event.BeforeProjectRemovedEvent; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; /** diff --git a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceImpl.java b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceImpl.java index 91a28fee522..86ffa877fd7 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 @@ -25,9 +25,9 @@ import static de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst.RELATION_TYPE; import static de.tudarmstadt.ukp.clarin.webanno.support.uima.ICasUtil.selectByAddr; import static de.tudarmstadt.ukp.inception.project.api.ProjectService.withProjectLogger; -import static de.tudarmstadt.ukp.inception.schema.AttachedAnnotation.Direction.INCOMING; -import static de.tudarmstadt.ukp.inception.schema.AttachedAnnotation.Direction.LOOP; -import static de.tudarmstadt.ukp.inception.schema.AttachedAnnotation.Direction.OUTGOING; +import static de.tudarmstadt.ukp.inception.schema.api.AttachedAnnotation.Direction.INCOMING; +import static de.tudarmstadt.ukp.inception.schema.api.AttachedAnnotation.Direction.LOOP; +import static de.tudarmstadt.ukp.inception.schema.api.AttachedAnnotation.Direction.OUTGOING; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; import static java.util.Objects.isNull; @@ -83,7 +83,6 @@ 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.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature_; @@ -105,18 +104,19 @@ 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.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.AttachedAnnotation; -import de.tudarmstadt.ukp.inception.schema.adapter.IllegalFeatureValueException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AttachedAnnotation; +import de.tudarmstadt.ukp.inception.schema.api.adapter.IllegalFeatureValueException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; +import de.tudarmstadt.ukp.inception.schema.api.event.TagCreatedEvent; +import de.tudarmstadt.ukp.inception.schema.api.event.TagDeletedEvent; +import de.tudarmstadt.ukp.inception.schema.api.event.TagUpdatedEvent; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.event.TagCreatedEvent; -import de.tudarmstadt.ukp.inception.schema.event.TagDeletedEvent; -import de.tudarmstadt.ukp.inception.schema.event.TagUpdatedEvent; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; /** *

diff --git a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/service/FeatureSupportRegistryImpl.java b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/service/FeatureSupportRegistryImpl.java index 40d7e71da17..237e596621b 100644 --- a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/service/FeatureSupportRegistryImpl.java +++ b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/service/FeatureSupportRegistryImpl.java @@ -30,9 +30,9 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.support.extensionpoint.CachingContextLookupExtensionPoint_ImplBase; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureType; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureType; /** *

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 09990d44272..f4c245eaaa9 100644 --- a/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/documents/service/DocumentServiceImplDatabaseTest.java +++ b/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/documents/service/DocumentServiceImplDatabaseTest.java @@ -43,7 +43,6 @@ import org.springframework.context.annotation.Import; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; @@ -61,7 +60,7 @@ import de.tudarmstadt.ukp.inception.documents.api.RepositoryAutoConfiguration; import de.tudarmstadt.ukp.inception.documents.config.DocumentServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; @EnableAutoConfiguration @@ -79,7 +78,6 @@ 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/exporters/LayerExporterTest.java b/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/schema/exporters/LayerExporterTest.java index bfb78653168..d05e8349a79 100644 --- a/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/schema/exporters/LayerExporterTest.java +++ b/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/schema/exporters/LayerExporterTest.java @@ -50,7 +50,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.ValidationMode; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @ExtendWith(MockitoExtension.class) public class LayerExporterTest 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 eb7473f032f..1d01817de14 100644 --- a/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceImplTest.java +++ b/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceImplTest.java @@ -44,7 +44,6 @@ import org.springframework.context.annotation.Import; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -56,8 +55,8 @@ import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.documents.api.RepositoryAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.IllegalFeatureValueException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.IllegalFeatureValueException; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; @EnableAutoConfiguration @@ -74,7 +73,6 @@ ProjectServiceAutoConfiguration.class, // RepositoryAutoConfiguration.class, // AnnotationSchemaServiceAutoConfiguration.class, // - AnnotationSchemaAutoConfiguration.class, // SecurityAutoConfiguration.class }) class AnnotationSchemaServiceImplTest { diff --git a/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/PrimitiveUimaIndexingSupport.java b/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/PrimitiveUimaIndexingSupport.java index f6ff755a0a5..5c07ca666de 100644 --- a/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/PrimitiveUimaIndexingSupport.java +++ b/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/PrimitiveUimaIndexingSupport.java @@ -32,8 +32,8 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.search.config.SearchServiceAutoConfiguration; /** 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 4378e436653..23da9a0ef66 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 @@ -70,8 +70,8 @@ import de.tudarmstadt.ukp.inception.project.api.event.AfterProjectRemovedEvent; import de.tudarmstadt.ukp.inception.project.api.event.BeforeProjectRemovedEvent; import de.tudarmstadt.ukp.inception.scheduling.SchedulingService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.event.LayerConfigurationChangedEvent; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.event.LayerConfigurationChangedEvent; import de.tudarmstadt.ukp.inception.search.config.SearchServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.search.config.SearchServiceProperties; import de.tudarmstadt.ukp.inception.search.index.IndexRebuildRequiredException; 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 3c96a70eabf..50b087d44f9 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 @@ -30,8 +30,8 @@ import de.tudarmstadt.ukp.inception.preferences.PreferencesService; import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.scheduling.SchedulingService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupport; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupportRegistry; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupportRegistryImpl; diff --git a/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/model/BulkIndexingContext.java b/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/model/BulkIndexingContext.java index 26760bb76b6..4ed8e61f3fb 100644 --- a/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/model/BulkIndexingContext.java +++ b/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/model/BulkIndexingContext.java @@ -23,7 +23,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class BulkIndexingContext implements AutoCloseable diff --git a/inception/inception-search-mtas/pom.xml b/inception/inception-search-mtas/pom.xml index 2addae94af9..199d690854c 100644 --- a/inception/inception-search-mtas/pom.xml +++ b/inception/inception-search-mtas/pom.xml @@ -158,11 +158,6 @@ hsqldb test - - de.tudarmstadt.ukp.inception.app - inception-api - test - de.tudarmstadt.ukp.inception.app inception-schema diff --git a/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasDocumentIndex.java b/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasDocumentIndex.java index 6acc0c2e138..9df96cc8c8b 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 @@ -106,7 +106,7 @@ 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.schema.api.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.search.ExecutionException; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupport; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupportRegistry; 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 235d2733e8f..2ea5e98fafc 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 @@ -26,7 +26,7 @@ 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.schema.api.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupportRegistry; import de.tudarmstadt.ukp.inception.search.index.PhysicalIndex; import de.tudarmstadt.ukp.inception.search.index.PhysicalIndexFactoryImplBase; diff --git a/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasUimaParser.java b/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasUimaParser.java index 5a31f218c47..491023fb82b 100644 --- a/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasUimaParser.java +++ b/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasUimaParser.java @@ -67,7 +67,7 @@ import de.tudarmstadt.ukp.inception.annotation.layer.relation.RelationAdapter; import de.tudarmstadt.ukp.inception.preferences.PreferencesService; import de.tudarmstadt.ukp.inception.project.api.ProjectService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupport; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupportRegistry; import de.tudarmstadt.ukp.inception.search.model.AnnotationSearchState; 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 e4140c31141..8567a40d4f8 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 @@ -23,7 +23,7 @@ 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.schema.api.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupportRegistry; import de.tudarmstadt.ukp.inception.search.config.SearchServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.search.index.PhysicalIndexRegistry; 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 1517db48d16..c1566050d58 100644 --- a/inception/inception-search-mtas/src/test/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasDocumentIndexTest.java +++ b/inception/inception-search-mtas/src/test/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasDocumentIndexTest.java @@ -57,7 +57,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.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; @@ -117,7 +116,6 @@ @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 862bf3fb171..143b94bc803 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 @@ -58,7 +58,7 @@ import de.tudarmstadt.ukp.inception.annotation.feature.string.StringFeatureSupportPropertiesImpl; import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.LayerSupportRegistryImpl; import de.tudarmstadt.ukp.inception.annotation.layer.relation.RelationAdapter; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.service.FeatureSupportRegistryImpl; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupportRegistryImpl; import de.tudarmstadt.ukp.inception.search.PrimitiveUimaIndexingSupport; 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 f55298487b2..d3d7443f14d 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,8 +40,6 @@ import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.transaction.annotation.Transactional; -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; @@ -60,8 +58,10 @@ import de.tudarmstadt.ukp.inception.preferences.config.PreferencesServiceAutoConfig; import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.scheduling.config.SchedulingServiceAutoConfiguration; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaPropertiesImpl; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupportRegistry; import de.tudarmstadt.ukp.inception.search.config.SearchServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.search.index.IndexRebuildRequiredException; diff --git a/inception/inception-testing/src/main/java/de/tudarmstadt/ukp/inception/support/test/recommendation/RecommenderTestHelper.java b/inception/inception-testing/src/main/java/de/tudarmstadt/ukp/inception/support/test/recommendation/RecommenderTestHelper.java index 6d90ab9f263..0beae585823 100644 --- a/inception/inception-testing/src/main/java/de/tudarmstadt/ukp/inception/support/test/recommendation/RecommenderTestHelper.java +++ b/inception/inception-testing/src/main/java/de/tudarmstadt/ukp/inception/support/test/recommendation/RecommenderTestHelper.java @@ -40,7 +40,7 @@ import org.apache.uima.resource.metadata.TypeDescription; import org.apache.uima.resource.metadata.TypeSystemDescription; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.service.AnnotationSchemaServiceImpl; public class RecommenderTestHelper 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 4b55da85e15..cd434212de4 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 @@ -78,7 +78,7 @@ import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.project.api.ProjectService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.support.help.DocLink; @MountPath(NS_PROJECT + "/${" + PAGE_PARAM_PROJECT + "}/agreement") diff --git a/inception/inception-ui-annotation/pom.xml b/inception/inception-ui-annotation/pom.xml index 56e9c42b87a..2bb29a02f54 100644 --- a/inception/inception-ui-annotation/pom.xml +++ b/inception/inception-ui-annotation/pom.xml @@ -88,10 +88,6 @@ de.tudarmstadt.ukp.inception.app inception-model-vdoc - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-documents-api diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/AnnotationPage.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/AnnotationPage.java index d6ff4981335..8af95d200f5 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 @@ -98,8 +98,8 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.selection.AnnotatorViewportChangedEvent; import de.tudarmstadt.ukp.inception.rendering.selection.SelectionChangedEvent; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; @MountPath(NS_PROJECT + "/${" + PAGE_PARAM_PROJECT + "}/annotate/#{" + PAGE_PARAM_DOCUMENT + "}") public class AnnotationPage diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/ActionFactory.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/ActionFactory.java index c4b1fbcafd9..3ec246b4b91 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/ActionFactory.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/ActionFactory.java @@ -21,7 +21,7 @@ import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.actionbar.undo.actions.UndoableAnnotationAction; import de.tudarmstadt.ukp.inception.annotation.events.AnnotationEvent; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @FunctionalInterface public interface ActionFactory diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/PostActionScrollToAndHighlight.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/PostActionScrollToAndHighlight.java index aae87559a13..37beaf2d27f 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/PostActionScrollToAndHighlight.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/PostActionScrollToAndHighlight.java @@ -30,7 +30,7 @@ import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.inception.rendering.model.Range; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class PostActionScrollToAndHighlight implements PostAction diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/PostActionScrollToAndSelect.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/PostActionScrollToAndSelect.java index 29758fc6d81..bd2dd888380 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/PostActionScrollToAndSelect.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/PostActionScrollToAndSelect.java @@ -29,7 +29,7 @@ import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class PostActionScrollToAndSelect implements PostAction diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/UndoPanel.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/UndoPanel.java index a48267d9013..235f48e1c0c 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/UndoPanel.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/UndoPanel.java @@ -46,8 +46,8 @@ import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.actionbar.undo.actions.UndoableAnnotationAction; import de.tudarmstadt.ukp.inception.annotation.events.AnnotationEvent; import de.tudarmstadt.ukp.inception.annotation.events.DocumentOpenedEvent; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; import wicket.contrib.input.events.key.KeyType; public class UndoPanel diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateChainLinkAnnotationAction.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateChainLinkAnnotationAction.java index 54244d252bc..90081558475 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateChainLinkAnnotationAction.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateChainLinkAnnotationAction.java @@ -28,8 +28,8 @@ import de.tudarmstadt.ukp.inception.annotation.layer.chain.ChainEvent; import de.tudarmstadt.ukp.inception.rendering.model.Range; 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.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class CreateChainLinkAnnotationAction extends AnnotationAction_ImplBase diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateChainSpanAnnotationAction.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateChainSpanAnnotationAction.java index 10b6445a086..6a7783bf33a 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateChainSpanAnnotationAction.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateChainSpanAnnotationAction.java @@ -28,8 +28,8 @@ import de.tudarmstadt.ukp.inception.annotation.layer.chain.ChainEvent; import de.tudarmstadt.ukp.inception.rendering.model.Range; 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.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class CreateChainSpanAnnotationAction extends AnnotationAction_ImplBase diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateRelationAnnotationAction.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateRelationAnnotationAction.java index a830c3008a4..7293dfc627e 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateRelationAnnotationAction.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateRelationAnnotationAction.java @@ -30,8 +30,8 @@ import de.tudarmstadt.ukp.inception.annotation.layer.relation.RelationEvent; import de.tudarmstadt.ukp.inception.rendering.model.Range; 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.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class CreateRelationAnnotationAction extends AnnotationAction_ImplBase diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateSpanAnnotationAction.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateSpanAnnotationAction.java index e97a2e4c49d..eeddd2cf843 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateSpanAnnotationAction.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateSpanAnnotationAction.java @@ -30,8 +30,8 @@ import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanEvent; import de.tudarmstadt.ukp.inception.rendering.model.Range; 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.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class CreateSpanAnnotationAction extends AnnotationAction_ImplBase diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/DeleteRelationAnnotationAction.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/DeleteRelationAnnotationAction.java index 26cc76ddc64..94a8c8ad18a 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/DeleteRelationAnnotationAction.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/DeleteRelationAnnotationAction.java @@ -25,8 +25,8 @@ import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.actionbar.undo.PostAction; import de.tudarmstadt.ukp.inception.annotation.layer.relation.RelationEvent; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class DeleteRelationAnnotationAction extends CreateRelationAnnotationAction diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/DeleteSpanAnnotationAction.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/DeleteSpanAnnotationAction.java index e901008c969..ce6a8c7240b 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/DeleteSpanAnnotationAction.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/DeleteSpanAnnotationAction.java @@ -25,8 +25,8 @@ import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.actionbar.undo.PostAction; import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanEvent; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class DeleteSpanAnnotationAction extends CreateSpanAnnotationAction diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/MoveSpanAnnotationAction.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/MoveSpanAnnotationAction.java index 1f04114cb83..1b389678a6a 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/MoveSpanAnnotationAction.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/MoveSpanAnnotationAction.java @@ -31,8 +31,8 @@ import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanMovedEvent; import de.tudarmstadt.ukp.inception.rendering.model.Range; 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.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class MoveSpanAnnotationAction extends AnnotationAction_ImplBase diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/RedoableAnnotationAction.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/RedoableAnnotationAction.java index 15feab252f8..b68c586cfe3 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/RedoableAnnotationAction.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/RedoableAnnotationAction.java @@ -24,8 +24,8 @@ import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.actionbar.undo.PostAction; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public interface RedoableAnnotationAction { diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/UndoableAnnotationAction.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/UndoableAnnotationAction.java index bfb8455452c..4f946603252 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/UndoableAnnotationAction.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/UndoableAnnotationAction.java @@ -25,8 +25,8 @@ import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.actionbar.undo.PostAction; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public interface UndoableAnnotationAction extends Serializable diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/UpdateFeatureValueAnnotationAction.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/UpdateFeatureValueAnnotationAction.java index 7cbe3b7b9ad..40c43c96be7 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/UpdateFeatureValueAnnotationAction.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/UpdateFeatureValueAnnotationAction.java @@ -29,8 +29,8 @@ import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.actionbar.undo.PostActionScrollToAndSelect; import de.tudarmstadt.ukp.inception.annotation.events.FeatureValueUpdatedEvent; 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.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class UpdateFeatureValueAnnotationAction extends AnnotationAction_ImplBase 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 0e2c723cb77..9f5f932bcbf 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,7 +81,6 @@ 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; @@ -107,11 +106,12 @@ import de.tudarmstadt.ukp.inception.rendering.selection.Selection; import de.tudarmstadt.ukp.inception.rendering.selection.SelectionChangedEvent; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.AttachedAnnotation; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AttachedAnnotation; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; import wicket.contrib.input.events.key.KeyType; /** @@ -1057,7 +1057,7 @@ private void loadFeatureEditorModels(AjaxRequestTarget aTarget) // If we reset the layers while doing a relation, we won't be able to complete the // relation - so in this case, we leave the layers alone... if (!selection.isArc()) { - state.refreshSelectableLayers(annotationEditorProperties); + state.refreshSelectableLayers(annotationEditorProperties::isLayerBlocked); } if (selection.getAnnotation().isSet()) { @@ -1383,7 +1383,7 @@ public void reset(AjaxRequestTarget aTarget) state.getSelection().clear(); // Refresh the selectable layers dropdown - state.refreshSelectableLayers(annotationEditorProperties); + state.refreshSelectableLayers(annotationEditorProperties::isLayerBlocked); if (aTarget != null) { aTarget.add(layerSelectionPanel); } diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AnnotationTextPanel.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AnnotationTextPanel.java index cdf859d7750..5a548069855 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AnnotationTextPanel.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AnnotationTextPanel.java @@ -33,8 +33,8 @@ import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; 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.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class AnnotationTextPanel extends Panel 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 a013022760e..16156e3ac62 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 @@ -60,13 +60,13 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.selection.Selection; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -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.feature.TypeUtil; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AttachedAnnotation; +import de.tudarmstadt.ukp.inception.schema.api.AttachedAnnotation.Direction; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.feature.TypeUtil; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; public class AttachedAnnotationListPanel extends Panel diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/FeatureEditorListPanel.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/FeatureEditorListPanel.java index cbf1cf3289d..4a5961271b8 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/FeatureEditorListPanel.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/FeatureEditorListPanel.java @@ -54,11 +54,11 @@ import de.tudarmstadt.ukp.inception.annotation.feature.link.LinkFeatureEditor; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -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.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditorValueChangedEvent; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; public class FeatureEditorListPanel extends Panel 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 f8b35e2d9d1..84eec312cea 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,15 +36,15 @@ 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.editorstate.AnnotatorState; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; public class LayerSelectionPanel extends Panel diff --git a/inception/inception-ui-curation/pom.xml b/inception/inception-ui-curation/pom.xml index 4031ad602bd..0810216f6d9 100644 --- a/inception/inception-ui-curation/pom.xml +++ b/inception/inception-ui-curation/pom.xml @@ -80,10 +80,6 @@ de.tudarmstadt.ukp.inception.app inception-api-editor - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-security diff --git a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/actionbar/CuratorWorkflowActionBarItemGroup.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/actionbar/CuratorWorkflowActionBarItemGroup.java index d0bcef88cd3..2e77af204f9 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 @@ -55,7 +55,7 @@ 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 de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; import wicket.contrib.input.events.key.KeyType; public class CuratorWorkflowActionBarItemGroup 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 1e1acb1be02..bc1c74aa9f2 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,6 @@ import com.googlecode.wicket.jquery.ui.widget.menu.IMenuItem; -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; @@ -94,10 +93,11 @@ 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.feature.TypeUtil; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; +import de.tudarmstadt.ukp.inception.schema.api.feature.TypeUtil; /** * Panel with the annotator's annotations. 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 0a8b480b9b5..be2d036bcc7 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 @@ -84,7 +84,7 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequest; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public abstract class BratSuggestionVisualizer extends Panel 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 f9f891e596f..dbdaf8548c0 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,7 +28,6 @@ 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; @@ -38,7 +37,8 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequest; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; @Component public class CurationRendererImpl 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 d5742c9d1cc..4ea6e179e42 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 @@ -119,8 +119,8 @@ import de.tudarmstadt.ukp.inception.rendering.paging.Unit; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequestedEvent; import de.tudarmstadt.ukp.inception.rendering.selection.SelectionChangedEvent; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; import de.tudarmstadt.ukp.inception.workload.model.WorkloadManagementService; /** 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 92d4c1e7c16..1c268633ada 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 @@ -47,10 +47,10 @@ import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; 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.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.ui.curation.sidebar.config.CurationSidebarAutoConfiguration; import de.tudarmstadt.ukp.inception.ui.curation.sidebar.render.CurationVID; 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 008b7ec35fa..c99039f9f6d 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 @@ -85,7 +85,7 @@ import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class CurationSidebar extends AnnotationSidebar_ImplBase 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 431cbdee52c..a531ad29af3 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 @@ -31,9 +31,9 @@ import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.project.api.ProjectService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; import de.tudarmstadt.ukp.inception.ui.curation.sidebar.CurationEditorExtension; import de.tudarmstadt.ukp.inception.ui.curation.sidebar.CurationSidebarApplicationInitializer; import de.tudarmstadt.ukp.inception.ui.curation.sidebar.CurationSidebarFactory; 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 01bdb4c13bf..baae54032a3 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 @@ -63,9 +63,9 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.rendering.vmodel.VObject; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; import de.tudarmstadt.ukp.inception.ui.curation.sidebar.CurationSidebarService; import de.tudarmstadt.ukp.inception.ui.curation.sidebar.config.CurationSidebarAutoConfiguration; diff --git a/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/project/DocumentRepositoryEditorPanel.java b/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/project/DocumentRepositoryEditorPanel.java index c74fe651b69..96083f1b906 100644 --- a/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/project/DocumentRepositoryEditorPanel.java +++ b/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/project/DocumentRepositoryEditorPanel.java @@ -47,7 +47,7 @@ import de.tudarmstadt.ukp.inception.externalsearch.ExternalSearchProviderRegistry; import de.tudarmstadt.ukp.inception.externalsearch.ExternalSearchService; import de.tudarmstadt.ukp.inception.externalsearch.model.DocumentRepository; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class DocumentRepositoryEditorPanel extends Panel 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 cd0a7568555..e09050cfe3b 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 @@ -83,7 +83,7 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VMarker; import de.tudarmstadt.ukp.inception.rendering.vmodel.VRange; import de.tudarmstadt.ukp.inception.rendering.vmodel.VTextMarker; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.support.annotation.OffsetSpan; public class ExternalSearchAnnotationSidebar diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/config/KnowledgeBaseServiceUIAutoConfiguration.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/config/KnowledgeBaseServiceUIAutoConfiguration.java index 10856dee0fd..f68c2e6a588 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/config/KnowledgeBaseServiceUIAutoConfiguration.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/config/KnowledgeBaseServiceUIAutoConfiguration.java @@ -32,8 +32,8 @@ import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBaseProperties; import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBaseServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.ui.kb.KnowledgeBasePageMenuItem; import de.tudarmstadt.ukp.inception.ui.kb.feature.ConceptFeatureSupport; import de.tudarmstadt.ukp.inception.ui.kb.feature.ConceptLabelCache; diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/BrowseKnowledgeBaseDialogContentPanel.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/BrowseKnowledgeBaseDialogContentPanel.java index 502e89aeb28..ae5d3225799 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/BrowseKnowledgeBaseDialogContentPanel.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/BrowseKnowledgeBaseDialogContentPanel.java @@ -42,7 +42,7 @@ import de.tudarmstadt.ukp.inception.kb.graph.KBObject; import de.tudarmstadt.ukp.inception.kb.model.KnowledgeBase; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.ui.kb.event.AjaxConceptNavigateEvent; public class BrowseKnowledgeBaseDialogContentPanel diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureEditor.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureEditor.java index 1ae5ac9deb7..1ccb496d1c7 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureEditor.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureEditor.java @@ -64,9 +64,9 @@ import de.tudarmstadt.ukp.inception.kb.graph.KBObject; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -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.api.feature.FeatureEditorValueChangedEvent; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.ui.kb.IriInfoBadge; import de.tudarmstadt.ukp.inception.ui.kb.event.AjaxConceptSelectionEvent; import de.tudarmstadt.ukp.inception.ui.kb.event.AjaxInstanceSelectionEvent; diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureEditor_ImplBase.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureEditor_ImplBase.java index b8ffed94170..b48b79c19e2 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureEditor_ImplBase.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureEditor_ImplBase.java @@ -56,8 +56,8 @@ import de.tudarmstadt.ukp.inception.kb.graph.KBHandle; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; /** * Component for editing knowledge-base-related features on annotations. diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureSupport.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureSupport.java index 48c25fe4754..6f749131531 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureSupport.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureSupport.java @@ -45,9 +45,9 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetail; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetailGroup; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureType; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureType; import de.tudarmstadt.ukp.inception.ui.kb.config.KnowledgeBaseServiceUIAutoConfiguration; /** diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureTraitsEditor.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureTraitsEditor.java index bddcf70e6cd..682dd3783bf 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureTraitsEditor.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureTraitsEditor.java @@ -47,8 +47,8 @@ import de.tudarmstadt.ukp.inception.kb.KnowledgeBaseService; import de.tudarmstadt.ukp.inception.kb.graph.KBHandle; import de.tudarmstadt.ukp.inception.kb.model.KnowledgeBase; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; /** * Component for editing the traits of knowledge-base-related features in the feature detail editor diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/DisabledKBWarning.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/DisabledKBWarning.java index fb609cb2e1f..1532efdac63 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/DisabledKBWarning.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/DisabledKBWarning.java @@ -31,7 +31,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.inception.kb.KnowledgeBaseService; import de.tudarmstadt.ukp.inception.kb.model.KnowledgeBase; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; public class DisabledKBWarning extends Panel diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/MultiValueConceptFeatureEditor.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/MultiValueConceptFeatureEditor.java index 2aa7da576e3..1a765f4cbcd 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/MultiValueConceptFeatureEditor.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/MultiValueConceptFeatureEditor.java @@ -37,8 +37,8 @@ import de.tudarmstadt.ukp.inception.kb.graph.KBHandle; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.support.kendo.KendoStyleUtils; public class MultiValueConceptFeatureEditor diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/MultiValueConceptFeatureSupport.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/MultiValueConceptFeatureSupport.java index e759337033d..67d3117dfdc 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/MultiValueConceptFeatureSupport.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/MultiValueConceptFeatureSupport.java @@ -53,10 +53,10 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetail; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetailGroup; -import de.tudarmstadt.ukp.inception.schema.adapter.IllegalFeatureValueException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureType; +import de.tudarmstadt.ukp.inception.schema.api.adapter.IllegalFeatureValueException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureType; import de.tudarmstadt.ukp.inception.ui.kb.config.KnowledgeBaseServiceUIAutoConfiguration; /** diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/MultiValueConceptFeatureTraitsEditor.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/MultiValueConceptFeatureTraitsEditor.java index e154b8b8cac..9385655a380 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/MultiValueConceptFeatureTraitsEditor.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/MultiValueConceptFeatureTraitsEditor.java @@ -46,8 +46,8 @@ import de.tudarmstadt.ukp.inception.kb.MultiValueConceptFeatureTraits; import de.tudarmstadt.ukp.inception.kb.graph.KBHandle; import de.tudarmstadt.ukp.inception.kb.model.KnowledgeBase; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; /** * Component for editing the traits of knowledge-base-related features in the feature detail editor diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/initializers/NamedEntityIdentifierFeatureInitializer.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/initializers/NamedEntityIdentifierFeatureInitializer.java index 2d90ba63e68..cc5d2fea148 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/initializers/NamedEntityIdentifierFeatureInitializer.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/initializers/NamedEntityIdentifierFeatureInitializer.java @@ -35,7 +35,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TokenLayerInitializer; import de.tudarmstadt.ukp.dkpro.core.api.ner.type.NamedEntity; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.ui.kb.config.KnowledgeBaseServiceUIAutoConfiguration; /** diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/search/ConceptFeatureIndexingSupport.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/search/ConceptFeatureIndexingSupport.java index fdfdd1909b8..d6a4b3e4952 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/search/ConceptFeatureIndexingSupport.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/search/ConceptFeatureIndexingSupport.java @@ -32,8 +32,8 @@ import de.tudarmstadt.ukp.inception.kb.KnowledgeBaseService; import de.tudarmstadt.ukp.inception.kb.graph.KBHandle; import de.tudarmstadt.ukp.inception.kb.graph.KBObject; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupport; import de.tudarmstadt.ukp.inception.ui.kb.config.KnowledgeBaseServiceUIAutoConfiguration; diff --git a/inception/inception-ui-kb/src/test/java/de/tudarmstadt/ukp/inception/ui/kb/search/ConceptFeatureIndexingSupportTest.java b/inception/inception-ui-kb/src/test/java/de/tudarmstadt/ukp/inception/ui/kb/search/ConceptFeatureIndexingSupportTest.java index 53d6b0658a3..957f3e3edb6 100644 --- a/inception/inception-ui-kb/src/test/java/de/tudarmstadt/ukp/inception/ui/kb/search/ConceptFeatureIndexingSupportTest.java +++ b/inception/inception-ui-kb/src/test/java/de/tudarmstadt/ukp/inception/ui/kb/search/ConceptFeatureIndexingSupportTest.java @@ -51,7 +51,7 @@ import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBasePropertiesImpl; import de.tudarmstadt.ukp.inception.kb.graph.KBHandle; import de.tudarmstadt.ukp.inception.kb.model.KnowledgeBase; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.service.FeatureSupportRegistryImpl; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupportRegistryImpl; import de.tudarmstadt.ukp.inception.search.PrimitiveUimaIndexingSupport; diff --git a/inception/inception-ui-project/pom.xml b/inception/inception-ui-project/pom.xml index f3694103a27..d2a50460271 100644 --- a/inception/inception-ui-project/pom.xml +++ b/inception/inception-ui-project/pom.xml @@ -55,10 +55,6 @@ de.tudarmstadt.ukp.inception.app inception-io-text - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-project-api diff --git a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/detail/ProjectDetailPanel.java b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/detail/ProjectDetailPanel.java index 1e354f553f4..b6af7dac417 100644 --- a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/detail/ProjectDetailPanel.java +++ b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/detail/ProjectDetailPanel.java @@ -59,7 +59,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxFormComponentUpdatingBehavior; import de.tudarmstadt.ukp.clarin.webanno.ui.core.page.ProjectPageBase; import de.tudarmstadt.ukp.inception.project.api.ProjectService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class ProjectDetailPanel extends Panel 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 3a6959964b6..9eb56c3ac1e 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 @@ -55,7 +55,7 @@ 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; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class ImportDocumentsPanel extends Panel diff --git a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/DeleteLayerConfirmationDialogContentPanel.java b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/DeleteLayerConfirmationDialogContentPanel.java index 689b2918bad..026db410042 100644 --- a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/DeleteLayerConfirmationDialogContentPanel.java +++ b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/DeleteLayerConfirmationDialogContentPanel.java @@ -33,7 +33,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.support.dialog.ChallengeResponseDialogContentPanel_ImplBase; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class DeleteLayerConfirmationDialogContentPanel extends ChallengeResponseDialogContentPanel_ImplBase 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 c9b5b5e600a..8cc3331df5b 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 @@ -65,11 +65,11 @@ 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.event.LayerConfigurationChangedEvent; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureType; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.event.LayerConfigurationChangedEvent; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureType; public class FeatureDetailForm extends Form 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 a2b133b2aed..5ee4310b004 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 @@ -71,12 +71,12 @@ 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; -import de.tudarmstadt.ukp.inception.schema.event.LayerConfigurationChangedEvent; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerType; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.event.LayerConfigurationChangedEvent; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerType; import de.tudarmstadt.ukp.inception.support.help.DocLink; public class LayerDetailForm 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 a2611eb3d02..5066399f660 100644 --- a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/ProjectLayersPanel.java +++ b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/ProjectLayersPanel.java @@ -73,7 +73,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -94,10 +93,11 @@ import de.tudarmstadt.ukp.inception.export.LayerImportExportUtils; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.api.ProjectService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.event.LayerConfigurationChangedEvent; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; +import de.tudarmstadt.ukp.inception.schema.api.event.LayerConfigurationChangedEvent; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; import de.tudarmstadt.ukp.inception.support.help.DocLink; /** 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 f7b05fb806b..a2b6549cb51 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 @@ -111,8 +111,8 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.rendering.vmodel.VRange; import de.tudarmstadt.ukp.inception.rendering.vmodel.VTextMarker; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; import de.tudarmstadt.ukp.inception.search.ResultsGroup; import de.tudarmstadt.ukp.inception.search.SearchResult; import de.tudarmstadt.ukp.inception.search.SearchService; 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 24287a40ff8..446dae88379 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 @@ -65,7 +65,7 @@ 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; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.search.ExecutionException; import de.tudarmstadt.ukp.inception.search.Granularities; import de.tudarmstadt.ukp.inception.search.LayerStatistics; diff --git a/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagEditorPanel.java b/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagEditorPanel.java index 20874ff9b15..bd7c2007443 100644 --- a/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagEditorPanel.java +++ b/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagEditorPanel.java @@ -36,7 +36,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxButton; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxLink; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaPanel; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class TagEditorPanel extends LambdaPanel diff --git a/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSelectionPanel.java b/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSelectionPanel.java index c7bb212d816..71d56957dea 100644 --- a/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSelectionPanel.java +++ b/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSelectionPanel.java @@ -34,7 +34,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxLink; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.ListPanel_ImplBase; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.OverviewListChoice; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class TagSelectionPanel extends ListPanel_ImplBase diff --git a/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSetEditorPanel.java b/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSetEditorPanel.java index 87b1b75b1ef..e90ce0f2e0b 100644 --- a/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSetEditorPanel.java +++ b/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSetEditorPanel.java @@ -59,7 +59,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.wicket.AjaxDownloadLink; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.InputStreamResourceStream; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.WicketExceptionUtil; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class TagSetEditorPanel extends LambdaPanel diff --git a/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSetImportPanel.java b/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSetImportPanel.java index 58669fabf3e..a5fe79b2b6e 100644 --- a/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSetImportPanel.java +++ b/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSetImportPanel.java @@ -45,7 +45,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.wicket.WicketExceptionUtil; import de.tudarmstadt.ukp.clarin.webanno.ui.core.settings.ProjectSettingsPanelBase; import de.tudarmstadt.ukp.inception.export.TagsetImportExportUtils; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class TagSetImportPanel extends Panel diff --git a/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSetSelectionPanel.java b/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSetSelectionPanel.java index a0ff489b8a1..4e2f8a10da5 100644 --- a/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSetSelectionPanel.java +++ b/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSetSelectionPanel.java @@ -31,7 +31,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxLink; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.ListPanel_ImplBase; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.OverviewListChoice; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class TagSetSelectionPanel extends ListPanel_ImplBase diff --git a/inception/inception-versioning/pom.xml b/inception/inception-versioning/pom.xml index 75e5782ead9..a67cf46a901 100644 --- a/inception/inception-versioning/pom.xml +++ b/inception/inception-versioning/pom.xml @@ -206,11 +206,6 @@ inception-project test - - de.tudarmstadt.ukp.inception.app - inception-api - test - de.tudarmstadt.ukp.inception.app inception-documents diff --git a/inception/inception-versioning/src/main/java/de/tudarmstadt/ukp/inception/versioning/VersioningServiceImpl.java b/inception/inception-versioning/src/main/java/de/tudarmstadt/ukp/inception/versioning/VersioningServiceImpl.java index ac1243d60e3..304964b4f8a 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 @@ -63,7 +63,7 @@ import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.export.LayerImportExportUtils; import de.tudarmstadt.ukp.inception.project.api.event.BeforeProjectRemovedEvent; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.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 6dde9884a55..8b52e7f6aa4 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 @@ -29,7 +29,7 @@ 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.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.versioning.VersioningService; import de.tudarmstadt.ukp.inception.versioning.VersioningServiceImpl; import de.tudarmstadt.ukp.inception.versioning.ui.VersioningMenuItem; 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 fb241e23782..cf057505693 100644 --- a/inception/inception-versioning/src/test/java/de/tudarmstadt/ukp/inception/versioning/VersioningServiceImplTest.java +++ b/inception/inception-versioning/src/test/java/de/tudarmstadt/ukp/inception/versioning/VersioningServiceImplTest.java @@ -50,7 +50,6 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.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; @@ -85,7 +84,6 @@ "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-workload-dynamic/pom.xml b/inception/inception-workload-dynamic/pom.xml index f5a563d2402..bbe05cd9787 100644 --- a/inception/inception-workload-dynamic/pom.xml +++ b/inception/inception-workload-dynamic/pom.xml @@ -248,11 +248,6 @@ inception-documents test - - de.tudarmstadt.ukp.inception.app - inception-api - test - 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 7cbd416c5c1..894637fe0d8 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 @@ -56,7 +56,7 @@ import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; import de.tudarmstadt.ukp.inception.workload.dynamic.DynamicWorkloadExtension; import de.tudarmstadt.ukp.inception.workload.dynamic.trait.DynamicWorkloadTraits; import de.tudarmstadt.ukp.inception.workload.dynamic.workflow.WorkflowExtensionPoint; 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 28cb2e99b7c..7f1ab21e378 100644 --- a/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImpl2Test.java +++ b/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImpl2Test.java @@ -44,7 +44,6 @@ import org.springframework.security.core.session.SessionRegistry; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; @@ -63,7 +62,7 @@ import de.tudarmstadt.ukp.inception.documents.config.DocumentServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.scheduling.config.SchedulingServiceAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.workload.config.WorkloadManagementAutoConfiguration; import de.tudarmstadt.ukp.inception.workload.dynamic.config.DynamicWorkloadManagerAutoConfiguration; @@ -87,7 +86,6 @@ 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 d8945ad00c5..e81d2e2f652 100644 --- a/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImplTest.java +++ b/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImplTest.java @@ -47,7 +47,6 @@ import org.springframework.context.annotation.Import; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; @@ -65,7 +64,7 @@ import de.tudarmstadt.ukp.inception.documents.config.DocumentServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.scheduling.config.SchedulingServiceAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.workload.config.WorkloadManagementAutoConfiguration; import de.tudarmstadt.ukp.inception.workload.dynamic.config.DynamicWorkloadManagerAutoConfiguration; @@ -89,7 +88,6 @@ ProjectServiceAutoConfiguration.class, // CasStorageServiceAutoConfiguration.class, // RepositoryAutoConfiguration.class, // - AnnotationSchemaAutoConfiguration.class, // AnnotationSchemaServiceAutoConfiguration.class, // SecurityAutoConfiguration.class, // SchedulingServiceAutoConfiguration.class, // diff --git a/inception/inception-workload-matrix/pom.xml b/inception/inception-workload-matrix/pom.xml index 19fb7e68df2..a776be45fec 100644 --- a/inception/inception-workload-matrix/pom.xml +++ b/inception/inception-workload-matrix/pom.xml @@ -241,11 +241,6 @@ dkpro-core-api-ner-asl test - - de.tudarmstadt.ukp.inception.app - inception-api - test - 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 a2738fdcad9..d021a2c0591 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 @@ -63,7 +63,7 @@ import de.tudarmstadt.ukp.inception.preferences.PreferencesService; import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; import de.tudarmstadt.ukp.inception.workload.matrix.MatrixWorkloadExtension; import de.tudarmstadt.ukp.inception.workload.matrix.trait.MatrixWorkloadTraits; import de.tudarmstadt.ukp.inception.workload.model.WorkloadManagementService; 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 9305b998ee6..e29ef2f3b6b 100644 --- a/inception/inception-workload-matrix/src/test/java/de/tudarmstadt/ukp/inception/workload/matrix/MatrixWorkloadExtensionImplTest.java +++ b/inception/inception-workload-matrix/src/test/java/de/tudarmstadt/ukp/inception/workload/matrix/MatrixWorkloadExtensionImplTest.java @@ -40,7 +40,6 @@ import org.springframework.context.annotation.Import; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -58,7 +57,7 @@ import de.tudarmstadt.ukp.inception.documents.config.DocumentServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.scheduling.config.SchedulingServiceAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.workload.config.WorkloadManagementAutoConfiguration; import de.tudarmstadt.ukp.inception.workload.matrix.config.MatrixWorkloadManagerAutoConfiguration; @@ -81,7 +80,6 @@ CasStorageServiceAutoConfiguration.class, // RepositoryAutoConfiguration.class, // AnnotationSchemaServiceAutoConfiguration.class, // - AnnotationSchemaAutoConfiguration.class, // SecurityAutoConfiguration.class, // SchedulingServiceAutoConfiguration.class, // WorkloadManagementAutoConfiguration.class, // diff --git a/inception/installEclipseSettings.sh b/inception/installEclipseSettings.sh index 51ff795d97e..4c2b132d04e 100755 --- a/inception/installEclipseSettings.sh +++ b/inception/installEclipseSettings.sh @@ -15,7 +15,6 @@ function installPrefs { installPrefs inception-active-learning installPrefs inception-agreement installPrefs inception-annotation-storage -installPrefs inception-api installPrefs inception-api-annotation installPrefs inception-api-dao installPrefs inception-api-editor @@ -39,6 +38,7 @@ installPrefs inception-diam-word-alignment-editor installPrefs inception-doc installPrefs inception-docker installPrefs inception-documents +installPrefs inception-documents-api installPrefs inception-editor-api installPrefs inception-example-imls-data-majority installPrefs inception-experimental-editor diff --git a/inception/pom.xml b/inception/pom.xml index 4b9a5403ca1..af4c8ea32ec 100644 --- a/inception/pom.xml +++ b/inception/pom.xml @@ -171,7 +171,6 @@ inception-ui-core inception-log inception-scheduling - inception-api inception-js-api inception-annotation-storage inception-annotation-storage-api From 7dac01971f4cd5f37c4e8d098f4375a5d67d2cd9 Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Mon, 20 Nov 2023 22:19:05 +0100 Subject: [PATCH 30/53] #4316 - Dissolve generic API module - Rename module inception-api-schema to inception-schema-api --- inception/inception-active-learning/pom.xml | 2 +- inception/inception-agreement/pom.xml | 2 +- inception/inception-annotation-storage/pom.xml | 2 +- inception/inception-api-annotation/pom.xml | 2 +- inception/inception-api-editor/pom.xml | 2 +- inception/inception-bom/pom.xml | 2 +- inception/inception-brat-editor/pom.xml | 2 +- inception/inception-concept-linking/pom.xml | 2 +- inception/inception-curation-legacy/pom.xml | 2 +- inception/inception-curation/pom.xml | 2 +- inception/inception-diag/pom.xml | 2 +- inception/inception-diam-compactv2/pom.xml | 2 +- inception/inception-diam-editor/pom.xml | 2 +- inception/inception-diam/pom.xml | 2 +- inception/inception-documents/pom.xml | 2 +- inception/inception-export/pom.xml | 2 +- inception/inception-external-editor/pom.xml | 2 +- inception/inception-external-search-pubmed/pom.xml | 2 +- inception/inception-feature-lookup/pom.xml | 2 +- inception/inception-html-apache-annotator-editor/pom.xml | 2 +- inception/inception-html-editor/pom.xml | 2 +- inception/inception-html-recogito-editor/pom.xml | 2 +- inception/inception-image/pom.xml | 2 +- inception/inception-imls-stringmatch/pom.xml | 2 +- inception/inception-kb-fact-linking/pom.xml | 2 +- inception/inception-kb/pom.xml | 2 +- inception/inception-layer-docmetadata/pom.xml | 2 +- inception/inception-log/pom.xml | 2 +- inception/inception-pdf-editor/pom.xml | 2 +- inception/inception-pdf-editor2/pom.xml | 2 +- inception/inception-project-export/pom.xml | 2 +- inception/inception-project-initializers-basic/pom.xml | 2 +- .../inception-project-initializers-doclabeling/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- inception/inception-project-initializers/pom.xml | 2 +- inception/inception-recommendation-api/pom.xml | 2 +- inception/inception-recommendation/pom.xml | 2 +- inception/inception-review-editor/pom.xml | 2 +- .../LICENSE.txt | 0 .../marker-wicket-module | 0 .../pom.xml | 2 +- .../inception/editor/action/AnnotationActionHandler.java | 0 .../de/tudarmstadt/ukp/inception/rendering/Renderer.java | 0 .../ukp/inception/schema/api/AnnotationSchemaService.java | 0 .../ukp/inception/schema/api/AttachedAnnotation.java | 0 .../schema/api/adapter/AnnotationComparator.java | 0 .../schema/api/adapter/AnnotationComparisonUtils.java | 0 .../inception/schema/api/adapter/AnnotationException.java | 0 .../ukp/inception/schema/api/adapter/FeatureFilter.java | 0 .../schema/api/adapter/IllegalFeatureValueException.java | 0 .../ukp/inception/schema/api/adapter/TypeAdapter.java | 0 .../schema/api/config/AnnotationSchemaProperties.java | 0 .../schema/api/event/LayerConfigurationChangedEvent.java | 0 .../ukp/inception/schema/api/event/TagCreatedEvent.java | 0 .../ukp/inception/schema/api/event/TagDeletedEvent.java | 0 .../ukp/inception/schema/api/event/TagEvent.java | 0 .../ukp/inception/schema/api/event/TagUpdatedEvent.java | 0 .../ukp/inception/schema/api/feature/FeatureEditor.java | 0 .../inception/schema/api/feature/FeatureEditorEvent.java | 0 .../api/feature/FeatureEditorValueChangedEvent.java | 0 .../ukp/inception/schema/api/feature/FeatureSupport.java | 0 .../schema/api/feature/FeatureSupportRegistry.java | 0 .../ukp/inception/schema/api/feature/FeatureType.java | 0 .../ukp/inception/schema/api/feature/FeatureUtil.java | 0 .../inception/schema/api/feature/LinkWithRoleModel.java | 0 .../ukp/inception/schema/api/feature/TypeUtil.java | 0 .../ukp/inception/schema/api/layer/LayerSupport.java | 0 .../inception/schema/api/layer/LayerSupportRegistry.java | 0 .../inception/schema/api/layer/LayerSupport_ImplBase.java | 0 .../ukp/inception/schema/api/layer/LayerType.java | 0 .../inception/schema/api/validation/ValidationUtils.java | 0 inception/inception-schema/pom.xml | 2 +- inception/inception-search-core/pom.xml | 2 +- inception/inception-search-mtas/pom.xml | 2 +- .../ukp/inception/search/index/mtas/MtasUpgradeTest.java | 8 -------- inception/inception-testing/pom.xml | 2 +- inception/inception-ui-agreement/pom.xml | 2 +- inception/inception-ui-annotation/pom.xml | 2 +- inception/inception-ui-curation/pom.xml | 2 +- inception/inception-ui-external-search/pom.xml | 2 +- inception/inception-ui-kb/pom.xml | 2 +- inception/inception-ui-project/pom.xml | 2 +- inception/inception-ui-search/pom.xml | 2 +- inception/inception-ui-tagsets/pom.xml | 2 +- inception/inception-versioning/pom.xml | 2 +- inception/inception-workload-dynamic/pom.xml | 2 +- inception/inception-workload-matrix/pom.xml | 2 +- inception/pom.xml | 2 +- 89 files changed, 56 insertions(+), 64 deletions(-) rename inception/{inception-api-schema => inception-schema-api}/LICENSE.txt (100%) rename inception/{inception-api-schema => inception-schema-api}/marker-wicket-module (100%) rename inception/{inception-api-schema => inception-schema-api}/pom.xml (98%) rename inception/{inception-api-schema => inception-schema-api}/src/main/java/de/tudarmstadt/ukp/inception/editor/action/AnnotationActionHandler.java (100%) rename inception/{inception-api-schema => inception-schema-api}/src/main/java/de/tudarmstadt/ukp/inception/rendering/Renderer.java (100%) rename inception/{inception-api-schema => inception-schema-api}/src/main/java/de/tudarmstadt/ukp/inception/schema/api/AnnotationSchemaService.java (100%) rename inception/{inception-api-schema => inception-schema-api}/src/main/java/de/tudarmstadt/ukp/inception/schema/api/AttachedAnnotation.java (100%) rename inception/{inception-api-schema => inception-schema-api}/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationComparator.java (100%) rename inception/{inception-api-schema => inception-schema-api}/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationComparisonUtils.java (100%) rename inception/{inception-api-schema => inception-schema-api}/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationException.java (100%) rename inception/{inception-api-schema => inception-schema-api}/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/FeatureFilter.java (100%) rename inception/{inception-api-schema => inception-schema-api}/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/IllegalFeatureValueException.java (100%) rename inception/{inception-api-schema => inception-schema-api}/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/TypeAdapter.java (100%) rename inception/{inception-api-schema => inception-schema-api}/src/main/java/de/tudarmstadt/ukp/inception/schema/api/config/AnnotationSchemaProperties.java (100%) rename inception/{inception-api-schema => inception-schema-api}/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/LayerConfigurationChangedEvent.java (100%) rename inception/{inception-api-schema => inception-schema-api}/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagCreatedEvent.java (100%) rename inception/{inception-api-schema => inception-schema-api}/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagDeletedEvent.java (100%) rename inception/{inception-api-schema => inception-schema-api}/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagEvent.java (100%) rename inception/{inception-api-schema => inception-schema-api}/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagUpdatedEvent.java (100%) rename inception/{inception-api-schema => inception-schema-api}/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditor.java (100%) rename inception/{inception-api-schema => inception-schema-api}/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditorEvent.java (100%) rename inception/{inception-api-schema => inception-schema-api}/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditorValueChangedEvent.java (100%) rename inception/{inception-api-schema => inception-schema-api}/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureSupport.java (100%) rename inception/{inception-api-schema => inception-schema-api}/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureSupportRegistry.java (100%) rename inception/{inception-api-schema => inception-schema-api}/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureType.java (100%) rename inception/{inception-api-schema => inception-schema-api}/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureUtil.java (100%) rename inception/{inception-api-schema => inception-schema-api}/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/LinkWithRoleModel.java (100%) rename inception/{inception-api-schema => inception-schema-api}/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/TypeUtil.java (100%) rename inception/{inception-api-schema => inception-schema-api}/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupport.java (100%) rename inception/{inception-api-schema => inception-schema-api}/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupportRegistry.java (100%) rename inception/{inception-api-schema => inception-schema-api}/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupport_ImplBase.java (100%) rename inception/{inception-api-schema => inception-schema-api}/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerType.java (100%) rename inception/{inception-api-schema => inception-schema-api}/src/main/java/de/tudarmstadt/ukp/inception/schema/api/validation/ValidationUtils.java (100%) diff --git a/inception/inception-active-learning/pom.xml b/inception/inception-active-learning/pom.xml index 315e1f981b5..089ea9f8fab 100644 --- a/inception/inception-active-learning/pom.xml +++ b/inception/inception-active-learning/pom.xml @@ -44,7 +44,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-agreement/pom.xml b/inception/inception-agreement/pom.xml index 629caefb73a..8a8d3f61c11 100644 --- a/inception/inception-agreement/pom.xml +++ b/inception/inception-agreement/pom.xml @@ -66,7 +66,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-annotation-storage/pom.xml b/inception/inception-annotation-storage/pom.xml index 9bee0396646..f2d39be9ffc 100644 --- a/inception/inception-annotation-storage/pom.xml +++ b/inception/inception-annotation-storage/pom.xml @@ -68,7 +68,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-api-annotation/pom.xml b/inception/inception-api-annotation/pom.xml index d195a350c5b..3fa2be9d02c 100644 --- a/inception/inception-api-annotation/pom.xml +++ b/inception/inception-api-annotation/pom.xml @@ -57,7 +57,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-api-editor/pom.xml b/inception/inception-api-editor/pom.xml index e8f8353aa1d..02c326cee36 100644 --- a/inception/inception-api-editor/pom.xml +++ b/inception/inception-api-editor/pom.xml @@ -37,7 +37,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-bom/pom.xml b/inception/inception-bom/pom.xml index 2cd5204c47d..22427563a63 100644 --- a/inception/inception-bom/pom.xml +++ b/inception/inception-bom/pom.xml @@ -379,7 +379,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api 30.0-SNAPSHOT diff --git a/inception/inception-brat-editor/pom.xml b/inception/inception-brat-editor/pom.xml index b66a6a1adf6..41310c2658b 100644 --- a/inception/inception-brat-editor/pom.xml +++ b/inception/inception-brat-editor/pom.xml @@ -51,7 +51,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-concept-linking/pom.xml b/inception/inception-concept-linking/pom.xml index 32757ea9cd0..a7d15cb3779 100644 --- a/inception/inception-concept-linking/pom.xml +++ b/inception/inception-concept-linking/pom.xml @@ -91,7 +91,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-curation-legacy/pom.xml b/inception/inception-curation-legacy/pom.xml index cc222916f15..873c1420158 100644 --- a/inception/inception-curation-legacy/pom.xml +++ b/inception/inception-curation-legacy/pom.xml @@ -54,7 +54,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-curation/pom.xml b/inception/inception-curation/pom.xml index f0ac41c2167..7311efb1117 100644 --- a/inception/inception-curation/pom.xml +++ b/inception/inception-curation/pom.xml @@ -47,7 +47,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-diag/pom.xml b/inception/inception-diag/pom.xml index 0bd1812baec..d021c7eb3f1 100644 --- a/inception/inception-diag/pom.xml +++ b/inception/inception-diag/pom.xml @@ -66,7 +66,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api org.dkpro.core diff --git a/inception/inception-diam-compactv2/pom.xml b/inception/inception-diam-compactv2/pom.xml index 388b9f53d60..f6065a3ec83 100644 --- a/inception/inception-diam-compactv2/pom.xml +++ b/inception/inception-diam-compactv2/pom.xml @@ -36,7 +36,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-diam-editor/pom.xml b/inception/inception-diam-editor/pom.xml index a47b48306b7..1aa39fc8229 100644 --- a/inception/inception-diam-editor/pom.xml +++ b/inception/inception-diam-editor/pom.xml @@ -52,7 +52,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-diam/pom.xml b/inception/inception-diam/pom.xml index 143bdc13ff0..5814b6e2e16 100644 --- a/inception/inception-diam/pom.xml +++ b/inception/inception-diam/pom.xml @@ -60,7 +60,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-documents/pom.xml b/inception/inception-documents/pom.xml index 5b53bb883fa..5232125cbbe 100644 --- a/inception/inception-documents/pom.xml +++ b/inception/inception-documents/pom.xml @@ -136,7 +136,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api test diff --git a/inception/inception-export/pom.xml b/inception/inception-export/pom.xml index d692bf1095e..b8b21594057 100644 --- a/inception/inception-export/pom.xml +++ b/inception/inception-export/pom.xml @@ -55,7 +55,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-external-editor/pom.xml b/inception/inception-external-editor/pom.xml index b19643e2cda..29fe3daf8dc 100644 --- a/inception/inception-external-editor/pom.xml +++ b/inception/inception-external-editor/pom.xml @@ -51,7 +51,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-external-search-pubmed/pom.xml b/inception/inception-external-search-pubmed/pom.xml index 721523a7591..77a1facdfdc 100644 --- a/inception/inception-external-search-pubmed/pom.xml +++ b/inception/inception-external-search-pubmed/pom.xml @@ -44,7 +44,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-feature-lookup/pom.xml b/inception/inception-feature-lookup/pom.xml index 4455506ff25..ff9465b45a2 100644 --- a/inception/inception-feature-lookup/pom.xml +++ b/inception/inception-feature-lookup/pom.xml @@ -39,7 +39,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-html-apache-annotator-editor/pom.xml b/inception/inception-html-apache-annotator-editor/pom.xml index f68994f4dec..24ea42df675 100644 --- a/inception/inception-html-apache-annotator-editor/pom.xml +++ b/inception/inception-html-apache-annotator-editor/pom.xml @@ -47,7 +47,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-html-editor/pom.xml b/inception/inception-html-editor/pom.xml index 4d00dfff1f9..85a0197e7ca 100644 --- a/inception/inception-html-editor/pom.xml +++ b/inception/inception-html-editor/pom.xml @@ -48,7 +48,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-html-recogito-editor/pom.xml b/inception/inception-html-recogito-editor/pom.xml index 692cb9feddf..cb0bf5e5a4d 100644 --- a/inception/inception-html-recogito-editor/pom.xml +++ b/inception/inception-html-recogito-editor/pom.xml @@ -47,7 +47,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-image/pom.xml b/inception/inception-image/pom.xml index c18de615d0a..2513d4c6aec 100644 --- a/inception/inception-image/pom.xml +++ b/inception/inception-image/pom.xml @@ -39,7 +39,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-imls-stringmatch/pom.xml b/inception/inception-imls-stringmatch/pom.xml index c3abe86c094..2350acab22e 100644 --- a/inception/inception-imls-stringmatch/pom.xml +++ b/inception/inception-imls-stringmatch/pom.xml @@ -68,7 +68,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api diff --git a/inception/inception-kb-fact-linking/pom.xml b/inception/inception-kb-fact-linking/pom.xml index 436bce111ae..57b91e8504e 100644 --- a/inception/inception-kb-fact-linking/pom.xml +++ b/inception/inception-kb-fact-linking/pom.xml @@ -49,7 +49,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-kb/pom.xml b/inception/inception-kb/pom.xml index a539688c24e..b686501dfe0 100644 --- a/inception/inception-kb/pom.xml +++ b/inception/inception-kb/pom.xml @@ -36,7 +36,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-layer-docmetadata/pom.xml b/inception/inception-layer-docmetadata/pom.xml index 721865fccae..1e087d17fff 100644 --- a/inception/inception-layer-docmetadata/pom.xml +++ b/inception/inception-layer-docmetadata/pom.xml @@ -39,7 +39,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-log/pom.xml b/inception/inception-log/pom.xml index 9792a09873d..0a921c186c9 100644 --- a/inception/inception-log/pom.xml +++ b/inception/inception-log/pom.xml @@ -31,7 +31,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-pdf-editor/pom.xml b/inception/inception-pdf-editor/pom.xml index a61f5723f90..cc313a365bf 100644 --- a/inception/inception-pdf-editor/pom.xml +++ b/inception/inception-pdf-editor/pom.xml @@ -39,7 +39,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-pdf-editor2/pom.xml b/inception/inception-pdf-editor2/pom.xml index baba71fad51..d6a6d427754 100644 --- a/inception/inception-pdf-editor2/pom.xml +++ b/inception/inception-pdf-editor2/pom.xml @@ -43,7 +43,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-project-export/pom.xml b/inception/inception-project-export/pom.xml index a2ac1443134..0db5e2d3c19 100644 --- a/inception/inception-project-export/pom.xml +++ b/inception/inception-project-export/pom.xml @@ -64,7 +64,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-project-initializers-basic/pom.xml b/inception/inception-project-initializers-basic/pom.xml index beb0d3f9a54..0159174b777 100644 --- a/inception/inception-project-initializers-basic/pom.xml +++ b/inception/inception-project-initializers-basic/pom.xml @@ -35,7 +35,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-project-initializers-doclabeling/pom.xml b/inception/inception-project-initializers-doclabeling/pom.xml index f8684288586..7805b617d31 100644 --- a/inception/inception-project-initializers-doclabeling/pom.xml +++ b/inception/inception-project-initializers-doclabeling/pom.xml @@ -39,7 +39,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-project-initializers-sentencelabeling/pom.xml b/inception/inception-project-initializers-sentencelabeling/pom.xml index dab2ad32fd8..b8d669798e3 100644 --- a/inception/inception-project-initializers-sentencelabeling/pom.xml +++ b/inception/inception-project-initializers-sentencelabeling/pom.xml @@ -35,7 +35,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-project-initializers-wikidatalinking/pom.xml b/inception/inception-project-initializers-wikidatalinking/pom.xml index 3483982e111..4cb31786375 100644 --- a/inception/inception-project-initializers-wikidatalinking/pom.xml +++ b/inception/inception-project-initializers-wikidatalinking/pom.xml @@ -35,7 +35,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-project-initializers/pom.xml b/inception/inception-project-initializers/pom.xml index 2915c2e019c..8da82a413f5 100644 --- a/inception/inception-project-initializers/pom.xml +++ b/inception/inception-project-initializers/pom.xml @@ -39,7 +39,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-recommendation-api/pom.xml b/inception/inception-recommendation-api/pom.xml index cbd50a80271..419f4c53d93 100644 --- a/inception/inception-recommendation-api/pom.xml +++ b/inception/inception-recommendation-api/pom.xml @@ -36,7 +36,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-recommendation/pom.xml b/inception/inception-recommendation/pom.xml index 10d70d6171b..b11b900d086 100644 --- a/inception/inception-recommendation/pom.xml +++ b/inception/inception-recommendation/pom.xml @@ -51,7 +51,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-review-editor/pom.xml b/inception/inception-review-editor/pom.xml index 882cde9fdb6..6606a756658 100644 --- a/inception/inception-review-editor/pom.xml +++ b/inception/inception-review-editor/pom.xml @@ -47,7 +47,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-api-schema/LICENSE.txt b/inception/inception-schema-api/LICENSE.txt similarity index 100% rename from inception/inception-api-schema/LICENSE.txt rename to inception/inception-schema-api/LICENSE.txt diff --git a/inception/inception-api-schema/marker-wicket-module b/inception/inception-schema-api/marker-wicket-module similarity index 100% rename from inception/inception-api-schema/marker-wicket-module rename to inception/inception-schema-api/marker-wicket-module diff --git a/inception/inception-api-schema/pom.xml b/inception/inception-schema-api/pom.xml similarity index 98% rename from inception/inception-api-schema/pom.xml rename to inception/inception-schema-api/pom.xml index 186b07c2fe1..ebda7b138c3 100644 --- a/inception/inception-api-schema/pom.xml +++ b/inception/inception-schema-api/pom.xml @@ -22,7 +22,7 @@ inception-app 30.0-SNAPSHOT - inception-api-schema + inception-schema-api INCEpTION - Core - Annotation Schema API diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/editor/action/AnnotationActionHandler.java b/inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/editor/action/AnnotationActionHandler.java similarity index 100% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/editor/action/AnnotationActionHandler.java rename to inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/editor/action/AnnotationActionHandler.java diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/rendering/Renderer.java b/inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/rendering/Renderer.java similarity index 100% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/rendering/Renderer.java rename to inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/rendering/Renderer.java diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/AnnotationSchemaService.java b/inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/AnnotationSchemaService.java similarity index 100% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/AnnotationSchemaService.java rename to inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/AnnotationSchemaService.java diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/AttachedAnnotation.java b/inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/AttachedAnnotation.java similarity index 100% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/AttachedAnnotation.java rename to inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/AttachedAnnotation.java diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationComparator.java b/inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationComparator.java similarity index 100% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationComparator.java rename to inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationComparator.java diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationComparisonUtils.java b/inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationComparisonUtils.java similarity index 100% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationComparisonUtils.java rename to inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationComparisonUtils.java diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationException.java b/inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationException.java similarity index 100% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationException.java rename to inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationException.java diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/FeatureFilter.java b/inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/FeatureFilter.java similarity index 100% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/FeatureFilter.java rename to inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/FeatureFilter.java diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/IllegalFeatureValueException.java b/inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/IllegalFeatureValueException.java similarity index 100% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/IllegalFeatureValueException.java rename to inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/IllegalFeatureValueException.java diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/TypeAdapter.java b/inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/TypeAdapter.java similarity index 100% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/TypeAdapter.java rename to inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/TypeAdapter.java diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/config/AnnotationSchemaProperties.java b/inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/config/AnnotationSchemaProperties.java similarity index 100% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/config/AnnotationSchemaProperties.java rename to inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/config/AnnotationSchemaProperties.java diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/LayerConfigurationChangedEvent.java b/inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/LayerConfigurationChangedEvent.java similarity index 100% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/LayerConfigurationChangedEvent.java rename to inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/LayerConfigurationChangedEvent.java diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagCreatedEvent.java b/inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagCreatedEvent.java similarity index 100% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagCreatedEvent.java rename to inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagCreatedEvent.java diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagDeletedEvent.java b/inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagDeletedEvent.java similarity index 100% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagDeletedEvent.java rename to inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagDeletedEvent.java diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagEvent.java b/inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagEvent.java similarity index 100% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagEvent.java rename to inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagEvent.java diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagUpdatedEvent.java b/inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagUpdatedEvent.java similarity index 100% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagUpdatedEvent.java rename to inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagUpdatedEvent.java diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditor.java b/inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditor.java similarity index 100% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditor.java rename to inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditor.java diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditorEvent.java b/inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditorEvent.java similarity index 100% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditorEvent.java rename to inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditorEvent.java diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditorValueChangedEvent.java b/inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditorValueChangedEvent.java similarity index 100% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditorValueChangedEvent.java rename to inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditorValueChangedEvent.java diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureSupport.java b/inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureSupport.java similarity index 100% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureSupport.java rename to inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureSupport.java diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureSupportRegistry.java b/inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureSupportRegistry.java similarity index 100% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureSupportRegistry.java rename to inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureSupportRegistry.java diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureType.java b/inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureType.java similarity index 100% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureType.java rename to inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureType.java diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureUtil.java b/inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureUtil.java similarity index 100% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureUtil.java rename to inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureUtil.java diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/LinkWithRoleModel.java b/inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/LinkWithRoleModel.java similarity index 100% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/LinkWithRoleModel.java rename to inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/LinkWithRoleModel.java diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/TypeUtil.java b/inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/TypeUtil.java similarity index 100% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/TypeUtil.java rename to inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/TypeUtil.java diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupport.java b/inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupport.java similarity index 100% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupport.java rename to inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupport.java diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupportRegistry.java b/inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupportRegistry.java similarity index 100% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupportRegistry.java rename to inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupportRegistry.java diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupport_ImplBase.java b/inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupport_ImplBase.java similarity index 100% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupport_ImplBase.java rename to inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupport_ImplBase.java diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerType.java b/inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerType.java similarity index 100% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerType.java rename to inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerType.java diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/validation/ValidationUtils.java b/inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/validation/ValidationUtils.java similarity index 100% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/validation/ValidationUtils.java rename to inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/validation/ValidationUtils.java diff --git a/inception/inception-schema/pom.xml b/inception/inception-schema/pom.xml index 34bd0c0b7fb..42bff55a642 100644 --- a/inception/inception-schema/pom.xml +++ b/inception/inception-schema/pom.xml @@ -55,7 +55,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-search-core/pom.xml b/inception/inception-search-core/pom.xml index 534425d60e2..8a8c45f6e93 100644 --- a/inception/inception-search-core/pom.xml +++ b/inception/inception-search-core/pom.xml @@ -71,7 +71,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api diff --git a/inception/inception-search-mtas/pom.xml b/inception/inception-search-mtas/pom.xml index 199d690854c..28510d82295 100644 --- a/inception/inception-search-mtas/pom.xml +++ b/inception/inception-search-mtas/pom.xml @@ -39,7 +39,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app 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 d3d7443f14d..0ee02a30eaf 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 @@ -58,9 +58,7 @@ import de.tudarmstadt.ukp.inception.preferences.config.PreferencesServiceAutoConfig; import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.scheduling.config.SchedulingServiceAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaPropertiesImpl; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupportRegistry; import de.tudarmstadt.ukp.inception.search.config.SearchServiceAutoConfiguration; @@ -192,12 +190,6 @@ RepositoryProperties repositoryProperties() return props; } - @Bean - AnnotationSchemaProperties annotationSchemaProperties() - { - return new AnnotationSchemaPropertiesImpl(); - } - @Bean public XmiFormatSupport xmiFormatSupport() { diff --git a/inception/inception-testing/pom.xml b/inception/inception-testing/pom.xml index acfe9a91f69..ca3ff6dccf2 100644 --- a/inception/inception-testing/pom.xml +++ b/inception/inception-testing/pom.xml @@ -27,7 +27,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-ui-agreement/pom.xml b/inception/inception-ui-agreement/pom.xml index d5a14c1e4db..8dd1e2cd364 100644 --- a/inception/inception-ui-agreement/pom.xml +++ b/inception/inception-ui-agreement/pom.xml @@ -53,7 +53,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-ui-annotation/pom.xml b/inception/inception-ui-annotation/pom.xml index 2bb29a02f54..15fabced34f 100644 --- a/inception/inception-ui-annotation/pom.xml +++ b/inception/inception-ui-annotation/pom.xml @@ -46,7 +46,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-ui-curation/pom.xml b/inception/inception-ui-curation/pom.xml index 0810216f6d9..4907ab3d41c 100644 --- a/inception/inception-ui-curation/pom.xml +++ b/inception/inception-ui-curation/pom.xml @@ -94,7 +94,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-ui-external-search/pom.xml b/inception/inception-ui-external-search/pom.xml index 2ce62eb9674..42226bb7b01 100644 --- a/inception/inception-ui-external-search/pom.xml +++ b/inception/inception-ui-external-search/pom.xml @@ -59,7 +59,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-ui-kb/pom.xml b/inception/inception-ui-kb/pom.xml index 0b0fbec6027..3471c0a45b7 100644 --- a/inception/inception-ui-kb/pom.xml +++ b/inception/inception-ui-kb/pom.xml @@ -63,7 +63,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-ui-project/pom.xml b/inception/inception-ui-project/pom.xml index d2a50460271..10cc0c269a3 100644 --- a/inception/inception-ui-project/pom.xml +++ b/inception/inception-ui-project/pom.xml @@ -69,7 +69,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-ui-search/pom.xml b/inception/inception-ui-search/pom.xml index eeff7b0257f..db42e982a51 100644 --- a/inception/inception-ui-search/pom.xml +++ b/inception/inception-ui-search/pom.xml @@ -39,7 +39,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-ui-tagsets/pom.xml b/inception/inception-ui-tagsets/pom.xml index 0f57e22defb..f1ede83d717 100644 --- a/inception/inception-ui-tagsets/pom.xml +++ b/inception/inception-ui-tagsets/pom.xml @@ -52,7 +52,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api diff --git a/inception/inception-versioning/pom.xml b/inception/inception-versioning/pom.xml index a67cf46a901..061b640078f 100644 --- a/inception/inception-versioning/pom.xml +++ b/inception/inception-versioning/pom.xml @@ -63,7 +63,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-workload-dynamic/pom.xml b/inception/inception-workload-dynamic/pom.xml index bbe05cd9787..7ad0468f8ea 100644 --- a/inception/inception-workload-dynamic/pom.xml +++ b/inception/inception-workload-dynamic/pom.xml @@ -55,7 +55,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-workload-matrix/pom.xml b/inception/inception-workload-matrix/pom.xml index a776be45fec..656eae8d25d 100644 --- a/inception/inception-workload-matrix/pom.xml +++ b/inception/inception-workload-matrix/pom.xml @@ -44,7 +44,7 @@ de.tudarmstadt.ukp.inception.app - inception-api-schema + inception-schema-api de.tudarmstadt.ukp.inception.app diff --git a/inception/pom.xml b/inception/pom.xml index af4c8ea32ec..7b11830f1c3 100644 --- a/inception/pom.xml +++ b/inception/pom.xml @@ -180,7 +180,7 @@ inception-documents inception-api-editor inception-api-render - inception-api-schema + inception-schema-api inception-export inception-export-api inception-diag From 69a10fca255c4882d242a04b70924e3eea743533 Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Tue, 21 Nov 2023 12:31:00 +0100 Subject: [PATCH 31/53] #4289 - Ability to skip SSL certificate validation on external recommenders - Added tests - Disabling certificate checks for WebHooks also disables host name checking - Can currently not disable host name checking when using the Java 11 HTTP client --- .../v1/ExternalRecommenderSslTest.java | 211 ++++++++++++++++++ .../remoteapi/webhooks/WebhookService.java | 11 +- .../webhooks/WebhookServiceTest.java | 95 ++++++++ 3 files changed, 314 insertions(+), 3 deletions(-) create mode 100644 inception/inception-imls-external/src/test/java/de/tudarmstadt/ukp/inception/recommendation/imls/external/v1/ExternalRecommenderSslTest.java diff --git a/inception/inception-imls-external/src/test/java/de/tudarmstadt/ukp/inception/recommendation/imls/external/v1/ExternalRecommenderSslTest.java b/inception/inception-imls-external/src/test/java/de/tudarmstadt/ukp/inception/recommendation/imls/external/v1/ExternalRecommenderSslTest.java new file mode 100644 index 00000000000..1b2f95dc1fb --- /dev/null +++ b/inception/inception-imls-external/src/test/java/de/tudarmstadt/ukp/inception/recommendation/imls/external/v1/ExternalRecommenderSslTest.java @@ -0,0 +1,211 @@ +/* + * 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.recommendation.imls.external.v1; + +import static de.tudarmstadt.ukp.inception.annotation.storage.CasMetadataUtils.getInternalTypeSystem; +import static java.util.Arrays.asList; +import static org.apache.uima.fit.factory.TypeSystemDescriptionFactory.createTypeSystemDescription; +import static org.apache.uima.util.CasCreationUtils.mergeTypeSystems; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + +import java.util.Arrays; +import java.util.List; + +import org.apache.uima.cas.CAS; +import org.apache.uima.fit.factory.JCasFactory; +import org.apache.uima.jcas.JCas; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import de.tudarmstadt.ukp.clarin.webanno.api.type.CASMetadata; +import de.tudarmstadt.ukp.clarin.webanno.model.AnchoringMode; +import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; +import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; +import de.tudarmstadt.ukp.inception.annotation.storage.CasStorageSession; +import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender; +import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommendationException; +import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommenderContext; +import de.tudarmstadt.ukp.inception.recommendation.imls.external.v1.config.ExternalRecommenderPropertiesImpl; + +public class ExternalRecommenderSslTest +{ + private static final String TYPE = "de.tudarmstadt.ukp.dkpro.core.api.ner.type.NamedEntity"; + + private static final String USER_NAME = "test_user"; + private static final long PROJECT_ID = 42L; + private static final boolean CROSS_SENTENCE = true; + private static final AnchoringMode ANCHORING_MODE = AnchoringMode.TOKENS; + + private Recommender recommender; + private RecommenderContext context; + private ExternalRecommender sut; + private ExternalRecommenderTraits traits; + private CasStorageSession casStorageSession; + private List data; + + @BeforeEach + public void setUp() throws Exception + { + casStorageSession = CasStorageSession.open(); + recommender = buildRecommender(); + context = new RecommenderContext(); + + traits = new ExternalRecommenderTraits(); + + JCas jcas = JCasFactory.createJCas( + mergeTypeSystems(asList(createTypeSystemDescription(), getInternalTypeSystem()))); + addCasMetadata(jcas, 1l); + data = Arrays.asList(jcas.getCas()); + } + + @AfterEach + public void tearDown() throws Exception + { + casStorageSession.close(); + } + + @Test + void thatDisablingCertificateValidationWorks_expired() + { + traits.setRemoteUrl("https://expired.badssl.com/"); + + traits.setVerifyCertificates(true); + sut = new ExternalRecommender(new ExternalRecommenderPropertiesImpl(), recommender, traits); + assertThatExceptionOfType(RecommendationException.class) // + .isThrownBy(() -> sut.train(context, data)) // + .withMessageContaining("PKIX path validation failed"); + + traits.setVerifyCertificates(false); + sut = new ExternalRecommender(new ExternalRecommenderPropertiesImpl(), recommender, traits); + assertThatExceptionOfType(RecommendationException.class) // + .isThrownBy(() -> sut.train(context, data)) // + .withMessageContaining("404 Not Found"); + } + + @Test + void thatDisablingCertificateValidationWorks_wrongHost() + { + traits.setRemoteUrl("https://wrong.host.badssl.com/"); + + traits.setVerifyCertificates(true); + sut = new ExternalRecommender(new ExternalRecommenderPropertiesImpl(), recommender, traits); + assertThatExceptionOfType(RecommendationException.class) // + .isThrownBy(() -> sut.train(context, data)) // + .withMessageContaining("match any of the subject alternative names"); + + traits.setVerifyCertificates(false); + sut = new ExternalRecommender(new ExternalRecommenderPropertiesImpl(), recommender, traits); + assertThatExceptionOfType(RecommendationException.class) // + .isThrownBy(() -> sut.train(context, data)) // + .withMessageContaining("404 Not Found"); + } + + @Test + void thatDisablingCertificateValidationWorks_selfSigned() + { + traits.setRemoteUrl("https://self-signed.badssl.com/"); + + traits.setVerifyCertificates(true); + sut = new ExternalRecommender(new ExternalRecommenderPropertiesImpl(), recommender, traits); + assertThatExceptionOfType(RecommendationException.class) // + .isThrownBy(() -> sut.train(context, data)) // + .withMessageContaining("PKIX path building failed"); + + traits.setVerifyCertificates(false); + sut = new ExternalRecommender(new ExternalRecommenderPropertiesImpl(), recommender, traits); + assertThatExceptionOfType(RecommendationException.class) // + .isThrownBy(() -> sut.train(context, data)) // + .withMessageContaining("404 Not Found"); + } + + @Test + void thatDisablingCertificateValidationWorks_untrusted() + { + traits.setRemoteUrl("https://untrusted-root.badssl.com/"); + + traits.setVerifyCertificates(true); + sut = new ExternalRecommender(new ExternalRecommenderPropertiesImpl(), recommender, traits); + assertThatExceptionOfType(RecommendationException.class) // + .isThrownBy(() -> sut.train(context, data)) // + .withMessageContaining("PKIX path building failed"); + + traits.setVerifyCertificates(false); + sut = new ExternalRecommender(new ExternalRecommenderPropertiesImpl(), recommender, traits); + assertThatExceptionOfType(RecommendationException.class) // + .isThrownBy(() -> sut.train(context, data)) // + .withMessageContaining("404 Not Found"); + } + + @Test + void thatDisablingCertificateValidationWorks_revoked() + { + traits.setRemoteUrl("https://revoked.badssl.com/"); + + traits.setVerifyCertificates(true); + sut = new ExternalRecommender(new ExternalRecommenderPropertiesImpl(), recommender, traits); + assertThatExceptionOfType(RecommendationException.class) // + .isThrownBy(() -> sut.train(context, data)) // + .withMessageContaining("PKIX path validation failed"); + + traits.setVerifyCertificates(false); + sut = new ExternalRecommender(new ExternalRecommenderPropertiesImpl(), recommender, traits); + assertThatExceptionOfType(RecommendationException.class) // + .isThrownBy(() -> sut.train(context, data)) // + .withMessageContaining("404 Not Found"); + } + + @Test + void thatCertificateValidationWorks() + { + traits.setRemoteUrl("https://tls-v1-2.badssl.com:1012/"); + + traits.setVerifyCertificates(true); + sut = new ExternalRecommender(new ExternalRecommenderPropertiesImpl(), recommender, traits); + assertThatExceptionOfType(RecommendationException.class) // + .isThrownBy(() -> sut.train(context, data)) // + .withMessageContaining("404 Not Found"); + } + + private static Recommender buildRecommender() + { + AnnotationLayer layer = new AnnotationLayer(); + layer.setName(TYPE); + layer.setCrossSentence(CROSS_SENTENCE); + layer.setAnchoringMode(ANCHORING_MODE); + + AnnotationFeature feature = new AnnotationFeature(); + feature.setName("value"); + + Recommender recommender = new Recommender(); + recommender.setLayer(layer); + recommender.setFeature(feature); + recommender.setMaxRecommendations(3); + + return recommender; + } + + private void addCasMetadata(JCas aJCas, long aDocumentId) + { + CASMetadata cmd = new CASMetadata(aJCas); + cmd.setUsername(USER_NAME); + cmd.setProjectId(PROJECT_ID); + cmd.setSourceDocumentId(aDocumentId); + aJCas.addFsToIndexes(cmd); + } +} diff --git a/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/webhooks/WebhookService.java b/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/webhooks/WebhookService.java index 0570274de70..66025ea1aa5 100644 --- a/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/webhooks/WebhookService.java +++ b/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/webhooks/WebhookService.java @@ -30,7 +30,9 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; +import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLSession; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang3.tuple.Pair; @@ -101,13 +103,16 @@ public WebhookService(WebhooksConfiguration aConfiguration, restTemplateBuilder = aRestTemplateBuilder; TrustStrategy acceptingTrustStrategy = (X509Certificate[] chain, String authType) -> true; + HostnameVerifier verifier = (String aHostname, SSLSession aSession) -> true; SSLContext sslContext = org.apache.http.ssl.SSLContexts.custom() .loadTrustMaterial(null, acceptingTrustStrategy).build(); - SSLConnectionSocketFactory csf = new SSLConnectionSocketFactory(sslContext); + SSLConnectionSocketFactory csf = new SSLConnectionSocketFactory(sslContext, verifier); - CloseableHttpClient httpClient = HttpClients.custom().setSSLSocketFactory(csf).build(); + CloseableHttpClient httpClient = HttpClients.custom() // + .setSSLSocketFactory(csf) // + .build(); nonValidatingRequestFactory = new HttpComponentsClientHttpRequestFactory(); nonValidatingRequestFactory.setHttpClient(httpClient); @@ -209,7 +214,7 @@ private void dispatch(String topic, Object message) } } - private void sendNotification(String topic, Object message, Webhook hook) throws IOException + void sendNotification(String topic, Object message, Webhook hook) throws IOException { log.trace("Sending webhook message on topic [{}] to [{}]", topic, hook.getUrl()); diff --git a/inception/inception-remote/src/test/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/webhooks/WebhookServiceTest.java b/inception/inception-remote/src/test/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/webhooks/WebhookServiceTest.java index 54893dca225..78cecd039ba 100644 --- a/inception/inception-remote/src/test/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/webhooks/WebhookServiceTest.java +++ b/inception/inception-remote/src/test/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/webhooks/WebhookServiceTest.java @@ -23,6 +23,7 @@ import static de.tudarmstadt.ukp.clarin.webanno.webapp.remoteapi.webhooks.WebhookService.X_AERO_NOTIFICATION; import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; import java.lang.invoke.MethodHandles; @@ -55,6 +56,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.client.HttpClientErrorException; +import org.springframework.web.client.ResourceAccessException; import de.tudarmstadt.ukp.clarin.webanno.api.event.AnnotationStateChangeEvent; import de.tudarmstadt.ukp.clarin.webanno.api.event.DocumentStateChangedEvent; @@ -102,6 +105,7 @@ public class WebhookServiceTest private @Autowired ApplicationEventPublisher applicationEventPublisher; private @Autowired WebhooksConfiguration webhooksConfiguration; private @Autowired TestService testService; + private @Autowired WebhookService webhookService; private Project project; private SourceDocument doc; @@ -221,6 +225,97 @@ public void thatDeliveryIsRetried() .containsExactly(new AnnotationStateChangeMessage(event)); } + @Test + void thatDisablingCertificateValidationWorks_expired() + { + hook.setUrl("https://expired.badssl.com/"); + + hook.setVerifyCertificates(true); + assertThatExceptionOfType(ResourceAccessException.class) // + .isThrownBy(() -> webhookService.sendNotification("test", "test", hook)) // + .withMessageContaining("PKIX path validation failed"); + + hook.setVerifyCertificates(false); + assertThatExceptionOfType(HttpClientErrorException.class) // + .isThrownBy(() -> webhookService.sendNotification("test", "test", hook)) // + .withMessageContaining("405 Not Allowed"); + } + + @Test + void thatDisablingCertificateValidationWorks_wrongHost() + { + hook.setUrl("https://wrong.host.badssl.com/"); + + hook.setVerifyCertificates(true); + assertThatExceptionOfType(ResourceAccessException.class) // + .isThrownBy(() -> webhookService.sendNotification("test", "test", hook)) // + .withMessageContaining("match any of the subject alternative names"); + + hook.setVerifyCertificates(false); + assertThatExceptionOfType(HttpClientErrorException.class) // + .isThrownBy(() -> webhookService.sendNotification("test", "test", hook)) // + .withMessageContaining("405 Not Allowed"); + } + + @Test + void thatDisablingCertificateValidationWorks_selfSigned() + { + hook.setUrl("https://self-signed.badssl.com/"); + + hook.setVerifyCertificates(true); + assertThatExceptionOfType(ResourceAccessException.class) // + .isThrownBy(() -> webhookService.sendNotification("test", "test", hook)) // + .withMessageContaining("PKIX path building failed"); + + hook.setVerifyCertificates(false); + assertThatExceptionOfType(HttpClientErrorException.class) // + .isThrownBy(() -> webhookService.sendNotification("test", "test", hook)) // + .withMessageContaining("405 Not Allowed"); + } + + @Test + void thatDisablingCertificateValidationWorks_untrusted() + { + hook.setUrl("https://untrusted-root.badssl.com/"); + + hook.setVerifyCertificates(true); + assertThatExceptionOfType(ResourceAccessException.class) // + .isThrownBy(() -> webhookService.sendNotification("test", "test", hook)) // + .withMessageContaining("PKIX path building failed"); + + hook.setVerifyCertificates(false); + assertThatExceptionOfType(HttpClientErrorException.class) // + .isThrownBy(() -> webhookService.sendNotification("test", "test", hook)) // + .withMessageContaining("405 Not Allowed"); + } + + @Test + void thatDisablingCertificateValidationWorks_revoked() + { + hook.setUrl("https://revoked.badssl.com/"); + + hook.setVerifyCertificates(true); + assertThatExceptionOfType(ResourceAccessException.class) // + .isThrownBy(() -> webhookService.sendNotification("test", "test", hook)) // + .withMessageContaining("PKIX path validation failed"); + + hook.setVerifyCertificates(false); + assertThatExceptionOfType(HttpClientErrorException.class) // + .isThrownBy(() -> webhookService.sendNotification("test", "test", hook)) // + .withMessageContaining("405 Not Allowed"); + } + + @Test + void thatCertificateValidationWorks() + { + hook.setUrl("https://tls-v1-2.badssl.com:1012/"); + + hook.setVerifyCertificates(true); + assertThatExceptionOfType(HttpClientErrorException.class) // + .isThrownBy(() -> webhookService.sendNotification("test", "test", hook)) // + .withMessageContaining("405 Not Allowed"); + } + @RequestMapping("/test") @Controller public static class TestService From df2554fcd026b130d8dfc942927ea57ad2522aab Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Tue, 21 Nov 2023 19:08:36 +0100 Subject: [PATCH 32/53] #4289 - Ability to skip SSL certificate validation on external recommenders - Improve documentation --- .../projects_recommendation_external.adoc | 18 +++++++++++++++--- .../v1/ExternalRecommenderSslTest.java | 19 ++++++++++++------- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/inception/inception-imls-external/src/main/resources/META-INF/asciidoc/user-guide/projects_recommendation_external.adoc b/inception/inception-imls-external/src/main/resources/META-INF/asciidoc/user-guide/projects_recommendation_external.adoc index 6b92ecf8259..a45f12f0faa 100644 --- a/inception/inception-imls-external/src/main/resources/META-INF/asciidoc/user-guide/projects_recommendation_external.adoc +++ b/inception/inception-imls-external/src/main/resources/META-INF/asciidoc/user-guide/projects_recommendation_external.adoc @@ -16,6 +16,18 @@ == External Recommender -This recommender allows to use external web-services to generate predictions. For details on the -protocol used in the communication with the external services, please refer to the developer -documentation. +This recommender allows to use an external web-service to generate predictions. + +You can find an example implementation of several external recommenders in the link:https://github.com/inception-project/inception-external-recommender[INCEpTION External Recommender repository] on GitHub. + +For more details on the protocol used in the communication with the external services, please refer to the developer documentation. + +.HTTPS support +The remote recommender service can be accessed via an encrypted HTTPS connection. However, this will fail unless the certificate is either signed by a well-known certificate authority or has been imported into the certificate store of the Java virtual machine. + +NOTE: For testing purposes, the validation of the SSL certificate can be disabled in the + external recommender settings. However, the SSL certificate will still need to contain a host + name that matches the URL of the external recommender. If you also need to disable host name + verification, you need to start {application-name} with the system property + `jdk.internal.httpclient.disableHostnameVerification`. Note this needs to be specified **on the + command line** and not in the `settings.properties` file. diff --git a/inception/inception-imls-external/src/test/java/de/tudarmstadt/ukp/inception/recommendation/imls/external/v1/ExternalRecommenderSslTest.java b/inception/inception-imls-external/src/test/java/de/tudarmstadt/ukp/inception/recommendation/imls/external/v1/ExternalRecommenderSslTest.java index 1b2f95dc1fb..4e47c10fbb9 100644 --- a/inception/inception-imls-external/src/test/java/de/tudarmstadt/ukp/inception/recommendation/imls/external/v1/ExternalRecommenderSslTest.java +++ b/inception/inception-imls-external/src/test/java/de/tudarmstadt/ukp/inception/recommendation/imls/external/v1/ExternalRecommenderSslTest.java @@ -107,13 +107,18 @@ void thatDisablingCertificateValidationWorks_wrongHost() sut = new ExternalRecommender(new ExternalRecommenderPropertiesImpl(), recommender, traits); assertThatExceptionOfType(RecommendationException.class) // .isThrownBy(() -> sut.train(context, data)) // - .withMessageContaining("match any of the subject alternative names"); - - traits.setVerifyCertificates(false); - sut = new ExternalRecommender(new ExternalRecommenderPropertiesImpl(), recommender, traits); - assertThatExceptionOfType(RecommendationException.class) // - .isThrownBy(() -> sut.train(context, data)) // - .withMessageContaining("404 Not Found"); + .withMessageContaining("No subject alternative DNS name matching"); + + // Disabling certificate validation does not disable host checking for recommenders. + // Instead the VM would need to be started with {@code + // -Djdk.internal.httpclient.disableHostnameVerification} + // System.setProperty("", "true"); + // // traits.setVerifyCertificates(false); + // sut = new ExternalRecommender(new ExternalRecommenderPropertiesImpl(), recommender, + // traits); + // assertThatExceptionOfType(RecommendationException.class) // + // .isThrownBy(() -> sut.train(context, data)) // + // .withMessageContaining("404 Not Found"); } @Test From 39c02c63c10604e3647c23b1b0e10384f3cfd58b Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Wed, 22 Nov 2023 19:38:23 +0100 Subject: [PATCH 33/53] #4229 - Better project template selection - Added remaining project template thumbnails --- .../pom.xml | 4 + .../basic/BasicProjectInitializer.java | 2 + .../project/initializers/basic/thumbnail.svg | 4 +- .../pom.xml | 4 + ...sicDocumentLabelingProjectInitializer.java | 2 + .../pom.xml | 4 + .../SentenceLabelingProjectInitializer.java | 2 + .../inception-project-initializers-ud/pom.xml | 14 +- ...iversalDependenciesProjectInitializer.java | 15 + .../project/initializers/ud/thumbnail.svg | 1110 ++++++++++++++ .../pom.xml | 9 + .../EntityLinkingProjectInitializer.java | 14 + .../wikidatalinking/thumbnail.svg | 1198 +++++++++++++++ .../StandardProjectInitializer.java | 14 + .../empty/EmptyProjectInitializer.java | 15 + .../project/initializers/empty/thumbnail.svg | 1294 +++++++++++++++++ .../webanno/project/initializers/webanno.png | Bin 0 -> 32359 bytes .../ProjectTemplateSelectionDialogPanel.html | 11 +- .../ProjectTemplateSelectionDialogPanel.java | 4 +- 19 files changed, 3712 insertions(+), 8 deletions(-) create mode 100644 inception/inception-project-initializers-ud/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/ud/thumbnail.svg create mode 100644 inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/thumbnail.svg create mode 100644 inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/empty/thumbnail.svg create mode 100644 inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/webanno.png diff --git a/inception/inception-project-initializers-basic/pom.xml b/inception/inception-project-initializers-basic/pom.xml index 0159174b777..cf20de3b453 100644 --- a/inception/inception-project-initializers-basic/pom.xml +++ b/inception/inception-project-initializers-basic/pom.xml @@ -64,6 +64,10 @@ + + org.springframework + spring-core + org.springframework spring-context diff --git a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicProjectInitializer.java b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicProjectInitializer.java index 58c5125a12f..02cefbcf718 100644 --- a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicProjectInitializer.java +++ b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicProjectInitializer.java @@ -26,6 +26,7 @@ import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; import org.springframework.context.ApplicationContext; +import org.springframework.core.annotation.Order; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.QuickProjectInitializer; @@ -38,6 +39,7 @@ * {@link InceptionBasicProjectInitializersAutoConfiguration#basicProjectInitializer}. *

*/ +@Order(1000) public class BasicProjectInitializer implements QuickProjectInitializer { diff --git a/inception/inception-project-initializers-basic/src/main/resources/de/tudarmstadt/ukp/inception/project/initializers/basic/thumbnail.svg b/inception/inception-project-initializers-basic/src/main/resources/de/tudarmstadt/ukp/inception/project/initializers/basic/thumbnail.svg index 8c41ffaa4eb..d6659d8cf31 100644 --- a/inception/inception-project-initializers-basic/src/main/resources/de/tudarmstadt/ukp/inception/project/initializers/basic/thumbnail.svg +++ b/inception/inception-project-initializers-basic/src/main/resources/de/tudarmstadt/ukp/inception/project/initializers/basic/thumbnail.svg @@ -43,7 +43,7 @@ inkscape:document-units="mm" showgrid="true" inkscape:zoom="2.8284271" - inkscape:cx="224.85996" + inkscape:cx="225.03674" inkscape:cy="113.49064" inkscape:window-width="1680" inkscape:window-height="931" @@ -620,7 +620,7 @@ inkscape:path-effect="#path-effect9" inkscape:original-d="m 32.687567,52.608504 c -0.197209,-0.172558 -0.394417,-0.345115 -0.591626,-0.517673 -0.246515,-0.07395 -0.493021,-0.147906 -0.739532,-0.221859 -0.271167,0.07395 -0.542323,0.147906 -0.813485,0.221859 -0.271167,0.221864 -0.542323,0.443719 -0.813485,0.665579 -0.135583,0.246515 -0.271162,0.493021 -0.406742,0.739532 0.03698,0.382099 0.07395,0.764183 0.110929,1.146274 0.123258,0.271167 0.246511,0.542324 0.369766,0.813485 0.23419,0.32047 0.46837,0.640928 0.702556,0.961392 0.32047,0.271167 0.640927,0.542323 0.961391,0.813485 0.271167,0.258841 0.542323,0.517672 0.813485,0.776508 0.06163,0.0493 0.123255,0.0986 0.184883,0.147907 0.23419,-0.135584 0.46837,-0.271162 0.702556,-0.406743 0.283492,-0.221864 0.566974,-0.443719 0.850461,-0.665579 0.23419,-0.221864 0.46837,-0.443719 0.702555,-0.665578 0.221864,-0.23419 0.44372,-0.46837 0.665579,-0.702555 0.160235,-0.258842 0.320464,-0.517673 0.480696,-0.776509 0.07395,-0.209538 0.147906,-0.419068 0.221859,-0.628602 0,-0.258841 0,-0.517672 0,-0.776509 -0.06163,-0.234189 -0.123255,-0.46837 -0.184883,-0.702555 -0.184886,-0.197212 -0.369766,-0.394417 -0.554649,-0.591625 -0.221864,-0.110932 -0.443719,-0.22186 -0.665578,-0.33279 -0.221864,0.02465 -0.443719,0.0493 -0.665579,0.07395 -0.184887,0.07396 -0.369766,0.147907 -0.554649,0.22186 -0.258841,0.135584 -0.517672,0.271162 -0.776508,0.406743 z" transform="translate(-3.1805074,-3.6482291)" /> + + org.springframework + spring-core + org.springframework spring-context diff --git a/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelingProjectInitializer.java b/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelingProjectInitializer.java index 3a928168ed6..c3d74e46d43 100644 --- a/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelingProjectInitializer.java +++ b/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelingProjectInitializer.java @@ -27,6 +27,7 @@ import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; +import org.springframework.core.annotation.Order; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.QuickProjectInitializer; @@ -47,6 +48,7 @@ * {@link InceptionDocumentLabelingProjectInitializersAutoConfiguration#basicDocumentLabelingProjectInitializer}. *

*/ +@Order(3000) public class BasicDocumentLabelingProjectInitializer implements QuickProjectInitializer { diff --git a/inception/inception-project-initializers-sentencelabeling/pom.xml b/inception/inception-project-initializers-sentencelabeling/pom.xml index b8d669798e3..6030d3884af 100644 --- a/inception/inception-project-initializers-sentencelabeling/pom.xml +++ b/inception/inception-project-initializers-sentencelabeling/pom.xml @@ -59,6 +59,10 @@ + + org.springframework + spring-core + org.springframework spring-context diff --git a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelingProjectInitializer.java b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelingProjectInitializer.java index 7430bea3288..341f95f31d4 100644 --- a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelingProjectInitializer.java +++ b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelingProjectInitializer.java @@ -29,6 +29,7 @@ import org.apache.commons.io.IOUtils; import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; +import org.springframework.core.annotation.Order; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.QuickProjectInitializer; @@ -42,6 +43,7 @@ * {@link InceptionSentenceLabelingProjectInitializersAutoConfiguration#sentenceLabelingProjectInitializer}. *

*/ +@Order(2000) public class SentenceLabelingProjectInitializer implements QuickProjectInitializer { diff --git a/inception/inception-project-initializers-ud/pom.xml b/inception/inception-project-initializers-ud/pom.xml index d5cdbadf1d0..fddd3d0a870 100644 --- a/inception/inception-project-initializers-ud/pom.xml +++ b/inception/inception-project-initializers-ud/pom.xml @@ -15,7 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 de.tudarmstadt.ukp.inception.app @@ -38,9 +40,19 @@ inception-project-initializers + + org.springframework + spring-core + org.springframework spring-context + + + org.apache.wicket + wicket-core + + diff --git a/inception/inception-project-initializers-ud/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/ud/UniversalDependenciesProjectInitializer.java b/inception/inception-project-initializers-ud/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/ud/UniversalDependenciesProjectInitializer.java index fcbb3901810..e503c6258e9 100644 --- a/inception/inception-project-initializers-ud/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/ud/UniversalDependenciesProjectInitializer.java +++ b/inception/inception-project-initializers-ud/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/ud/UniversalDependenciesProjectInitializer.java @@ -20,9 +20,14 @@ import static java.util.Arrays.asList; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.util.List; import java.util.Optional; +import org.apache.wicket.request.resource.PackageResourceReference; +import org.apache.wicket.request.resource.ResourceReference; +import org.springframework.core.annotation.Order; + import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.DependencyLayerInitializer; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.LemmaLayerInitializer; @@ -40,15 +45,25 @@ * {@link ProjectInitializersAutoConfiguration#standardProjectInitializer}. *

*/ +@Order(6000) public class UniversalDependenciesProjectInitializer implements QuickProjectInitializer { + private static final PackageResourceReference THUMBNAIL = new PackageResourceReference( + MethodHandles.lookup().lookupClass(), "thumbnail.svg"); + @Override public String getName() { return "Universal Dependencies"; } + @Override + public Optional getThumbnail() + { + return Optional.of(THUMBNAIL); + } + @Override public boolean alreadyApplied(Project aProject) { diff --git a/inception/inception-project-initializers-ud/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/ud/thumbnail.svg b/inception/inception-project-initializers-ud/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/ud/thumbnail.svg new file mode 100644 index 00000000000..227d7285ba6 --- /dev/null +++ b/inception/inception-project-initializers-ud/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/ud/thumbnail.svg @@ -0,0 +1,1110 @@ + + + + + + diff --git a/inception/inception-project-initializers-wikidatalinking/pom.xml b/inception/inception-project-initializers-wikidatalinking/pom.xml index 4cb31786375..42abfafa46c 100644 --- a/inception/inception-project-initializers-wikidatalinking/pom.xml +++ b/inception/inception-project-initializers-wikidatalinking/pom.xml @@ -62,7 +62,16 @@ inception-recommendation-api + + org.apache.wicket + wicket-core + + + + org.springframework + spring-core + org.springframework spring-context diff --git a/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/EntityLinkingProjectInitializer.java b/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/EntityLinkingProjectInitializer.java index 1c2198c95db..3ebcca6019c 100644 --- a/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/EntityLinkingProjectInitializer.java +++ b/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/EntityLinkingProjectInitializer.java @@ -18,11 +18,15 @@ package de.tudarmstadt.ukp.inception.project.initializers.wikidatalinking; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.List; import java.util.Optional; +import org.apache.wicket.request.resource.PackageResourceReference; +import org.apache.wicket.request.resource.ResourceReference; import org.springframework.context.ApplicationContext; +import org.springframework.core.annotation.Order; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; @@ -41,9 +45,13 @@ * {@link WikiDataLinkingProjectInitializersAutoConfiguration#entityLinkingProjectInitializer}. *

*/ +@Order(5000) public class EntityLinkingProjectInitializer implements QuickProjectInitializer { + private static final PackageResourceReference THUMBNAIL = new PackageResourceReference( + MethodHandles.lookup().lookupClass(), "thumbnail.svg"); + private final AnnotationSchemaService annotationService; private final ApplicationContext context; @@ -60,6 +68,12 @@ public String getName() return "Entity linking (Wikidata)"; } + @Override + public Optional getThumbnail() + { + return Optional.of(THUMBNAIL); + } + @Override public boolean alreadyApplied(Project aProject) { diff --git a/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/thumbnail.svg b/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/thumbnail.svg new file mode 100644 index 00000000000..9cbe90ad870 --- /dev/null +++ b/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/thumbnail.svg @@ -0,0 +1,1198 @@ + + + + + + diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/StandardProjectInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/StandardProjectInitializer.java index 4d9865f7582..598d209ac65 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/StandardProjectInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/StandardProjectInitializer.java @@ -18,12 +18,16 @@ package de.tudarmstadt.ukp.clarin.webanno.project.initializers; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; +import org.apache.wicket.request.resource.PackageResourceReference; +import org.apache.wicket.request.resource.ResourceReference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; +import org.springframework.core.annotation.Order; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; @@ -36,9 +40,13 @@ * {@link ProjectInitializersAutoConfiguration#standardProjectInitializer}. *

*/ +@Order(100000) public class StandardProjectInitializer implements QuickProjectInitializer { + private static final PackageResourceReference THUMBNAIL = new PackageResourceReference( + MethodHandles.lookup().lookupClass(), "webanno.png"); + private final ProjectService projectService; @Autowired @@ -53,6 +61,12 @@ public String getName() return "Classic linguistic project"; } + @Override + public Optional getThumbnail() + { + return Optional.of(THUMBNAIL); + } + @Override public boolean alreadyApplied(Project aProject) { diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/empty/EmptyProjectInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/empty/EmptyProjectInitializer.java index 0ee8fbbc4f2..15747937c2e 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/empty/EmptyProjectInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/empty/EmptyProjectInitializer.java @@ -20,9 +20,14 @@ import static java.util.Arrays.asList; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.util.List; import java.util.Optional; +import org.apache.wicket.request.resource.PackageResourceReference; +import org.apache.wicket.request.resource.ResourceReference; +import org.springframework.core.annotation.Order; + import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.QuickProjectInitializer; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.SentenceLayerInitializer; @@ -36,15 +41,25 @@ * {@link ProjectInitializersAutoConfiguration#emptyProjectInitializer}. *

*/ +@Order(4000) public class EmptyProjectInitializer implements QuickProjectInitializer { + private static final PackageResourceReference THUMBNAIL = new PackageResourceReference( + MethodHandles.lookup().lookupClass(), "thumbnail.svg"); + @Override public String getName() { return "Blank project (no layers)"; } + @Override + public Optional getThumbnail() + { + return Optional.of(THUMBNAIL); + } + @Override public boolean alreadyApplied(Project aProject) { diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/empty/thumbnail.svg b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/empty/thumbnail.svg new file mode 100644 index 00000000000..d94472a5691 --- /dev/null +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/empty/thumbnail.svg @@ -0,0 +1,1294 @@ + + + + + +MusicDentistPharmacyE=m.c2A b c ...100100011 diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/webanno.png b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/webanno.png new file mode 100644 index 0000000000000000000000000000000000000000..c2755029367b320f48af8619c93ee1ce0f6980ca GIT binary patch literal 32359 zcmcG$1y>tw+cgY@Lh%B{tz5VSTA*m~0>z8F6?ZSe3lu2D3KS^rg<`=qxVw9Ty9f8Y z;aThc{=v6qO=gnJB$GK0+xysOB0j6g;bBu^qoAPR$$$E&j)H>PfZShug@Jr*0%i*$ zH>mFFa#ASeqttuICm$_!<*k&JQP`3DuTW6KZBfvl4?(V!$Q1bYB$wOCo592vfneDVL^!W1Ww6@S6tkw?Z@;j-45Boj&6 zxRqoudbu~n(wf9&wBK-dbwpL@8&o!K(ZSdr7>>Yofv@+xH>|RVIG6)x9jvs8zuWy6 z9Bo@&LG>g!!b9|OZKI1o+(D8;rgx;QVf|+%J;$qqppjttZwQLDmg{AA002SPD zI>`B`2)y@cwId`gx}{z9mqadl4NFuGm8cINVkLWyh^h9_GEBU)N?YRiCBx zeo4?Xw)3WNg3WiW#xh6TJppS%O;Wf<_3tQf4eNi@-bTm{2?55$5fB5%+L?8Rxsfr~ z)pwt=`LSH~y>`cQD&sc9N0;5^lS`DpT6SS$lsho!O9#Gl0=M23n`4FVL`c0NVogJT z=ayb-u}8zu7btc(l<4^T{GJ%sur*2{wButIuXPL+zk}`rbG*7Imk0Bw_D>SBF0O}; zJQ|F4OV@N0nN~kW3oQS*X3}lK>MiRIp=r`)LZzs)x%@96h1Wd?o1RgDBgk}BL8Ru0 z#$4*0R(|=eV!yZ~%uBv5lDRvH5Uawjqay*6&hK47q1`*Tq26{(w0hhqcfOPjhAAZ% zF>xZPU+q=QsM?&``nF60Uk`P?5Rcb=nb0cc5X;K8j`l>qX(7!{jwnIE06KwU0u$Zo zc#9_1X|z<*j`wzgK;}CE^*CusHpbVuhHPQ)8;Pme&1~Z%3*?zWNDmz1?SOmt-Yr=gw{!YdGdh@^h?1pSkZ5F?%Gqs|_`mf3IDA3Y1I@>apZ+1X z%F>{<&L$hn`VUHIO~CP^cOdYmwZP6JA%|20=g?Y8iRwzmQzhp=*92b5(7otr#M$ldCJeg%t|x%->}Qe8zKnD+NSB3wfa zJUR0}9lnvRy)tul=Dm_rg}URD+6(p49L2^<%H=eGr~d2-7+A zfr;0?7;W;n3*Vgu?3%vhS1|BlZjY<`rQ)(zTdHr){n}7r(;V53uWgwhu1CqG$qK;X zw!NkDW*}8>$>o+NFCcK?i1*8mI=Qg60LTdDe+}FDtDHv4trvE!HT&Sjiu>iAODIM0 zBE{os2!a0m$DL|=`_f8Tptn8Ph*}AE2_YMHRD;{a4_WzGe=rV%)=AezCDH0cCavW@ z)&=E3*&mn0@xJHSz>?F5yW~iLTjeQUA-;!?Y3iX9X<_B0UHmqU6HbNn&5f}HkAJAd zU6iIz)YRH^-1F|h>q!SwO@=M+7Snti9mUTIY*f$ouB~N;8U>mITYWvJPnaV7O#*NK z9p}GC99}DRb2)rw+Uv`TXe*!_227nPsTp?l(XRam5E$^}~6-o!-dYPNY zzwta`J|@G_{&EiZBYJpYh*med+`c+EwunsTEKA;2?LViIjx-N_!nV`3Avo=F?YWbi z0OZ`d-eu38MwU+cI^jdxHgj3U*YGM?Yff9e^-<6k@VX^AAa%D=nYyNI$#GX@!fijs z>7Jg>6)oui${Pz6tl{!rrUqOZr|s^QiP(r-hg6!l`+_0vdCdz97Z)%=e6yCvt0kud zW&V!#(38H)9~Zvmai*(2Dzl=KL}OQ+x)tp$H|vq`LYKiS{c;vE;Lerrw$1hKec;L4 zv6e6z3P9dt@{&ctrO0p359Z73UQk<5q`PWt5}&nB+=l7k-bUbY4DE+J_O`f)9dW+_ zn$zKAsQ7XV1Z{x^Bd|B4su%7Qo@3z2dSHhkdl@_jc3bh@3xrkEK_`Ns^d)`^k6$|3 zoO)V0JXr0wad8c6CfBw{GY)72Zp;Kc_oqPx=Bw>Nk}Uk^?Jt*;9I-z7Izv7;GWjs6 zDSB8_9u+3Dr1M_KC!u=9I=Ol^72AVZVjR3ppEg7%C%hwNFK>cuY$=VSUp&`V>b?6psyij$Fw&b}Q0>NB4qPS&& z&!#|ZBC0|Q9(H9bwq^~SqjzxKtruo#bFL*{D08AFvE=#JC&|(I*K93VXE}PGv|J1G zUZ<6hibSqB-a<9{JU*8ih@btV<#lNN{LaH9<+1BWVXKy3^wZq$q_l0=TAmmCP*pAWgI?;eINu zt%zO3wKl6^i64@0ki<|zsUUyq0FCYSpMlkNWH=3fQ|8bGbNb95-E{LGm+pF)>vTrq z>@6lm<<14 zBBv=EG()K)v=@WInZz_eP(_+}U;xnTk2L*nxfjS3WX-vuy5=Gr6`9OV_BdncPTIQv zSFBZaW_hgtiK?kh^{(*#se!vWz~2WU`f^F8ke4pSEn&&}W*k4Ud=yB~o@mYmrs zn?maX9h|SB;a=LsrIXHRUPnIl4ZO_hhZq2Xiue_SxEYKnkHD2xsq2gnqd#`M~@i;E&KLI;im;T^}5rav@T0he+h` z9w8NSo3@6L5QEEk+``A8V~_A!4!bWO1{z#>F1QaeHe_YTz#r^y=6?a8;sQ7BGwP0N zQPg44iTK+DEU|izZ)v53p7Xs>@B7T(P=6lDlnN!NRa((?%l(g~+lUaTYjx`eX?@Kx z$=!Nj;2x&a;zpL2YJiJqc^bNCbC>d)w$0|(#21D>n5nz-v<_+arxSjpvx_Xo98gV9Wl|kOZwh?=L z(YWH)=6{JGVnWR91ZrMJEqx8ScGW4pK2Q;_NuU2DU>)GIrP`#(yk1*N)fkd>pBqU_ z|H<*TL2spe(VZjSRip5oTfI^f@T^KeGwJ@wUffLw;_A=j$bk58FLFF75J*Coe>4#A`j8jtr+C&qU`wy>k&|IdF1}7#Qp^P`X%_-}1EY@_bD<;RSkmPXy-!a0rz}}^@$D|cadg7TDNr1f^T=~z^?-NAnE_)qJgFAe(3wGr8Zq3LqxzNmzj_Oeny(>29E(3JPYu2| zk0Hn}Zxsl1gMlnQDu+>xfkm4O{qv}4jgc&wdv{m1fxqUH$e3CUE;`0TbZ$?un*;qG z>thNArc7+Fzuc6L>Dl{(gEgl6cTr24hFG3j_tmg2LkY%>FYZjBDOQj<+J@RR{+jDd z`N6A5~|m8+;xnKEJ;oYHW*H)?R_P%eRSjK}imtmdl`le?H^j zwF&+8&vG;yqMAs?8g)%>xx81%Y85=&Eq0#P!p0_Fua(ilXAN{F1S$rxk zN3;B!C7{RTTThb2JC`2XHYqnms2Zl$O~Cs_FN5{v@_Z5@`%ZA$ddb3iVTsGpR$pUA zc-{5=h0bV^umwCT@A|}!SXm44X9BYcP5TLq4-~Z$bMICj&SAJd`Zkq7A^e?bKEW}( zuE_*x&z@~jzL1xI=2usOXhL`aZu4KApx*!*l`;C4_Q$7j_XSC0wX5?J;o7=cZ605l zT2Fp-LHE&QwI(ei9(;~Yn%Ov%RF6iZ5((T7)vm0@sR<92jir{NlaZGmoot)^hXHlj z4CGP6m-wd6(DnKzv{T+vW^BoO{>tg0y-e6+V_q%Xqn|^%_iPByO{d&9hKgGB?$?{t zBNut1SbFgMvysnlBoF#muf);Pax2%0<0{F?UZibuanBnls$;&*LFsz>XV$EhnEg;s zcNbR-;bCINr960Y&baF0+h59;6lo~KaL%=emEM-C9*d(TQ^2Ca#VG$CqL7^GuNsuh zd?Hrrv$9tevD5Scqf~p6(DrCncqkUUztR*k3sy*eUwM9d1e?=F*lNwiIQ<9yK;BfG z!>08gd4oEhwY~LEH!q*geS}`zlj`h4beix*UZRH{12JYacz>}0)x2cVQrXYz5S}j-MaaPqZz zIBQ)Sl6#kEIZ)g5r+JxihuIk_^Iwin+_R6z$#I8zQ3%0OW?Kxscf>P9?DVlOd#w;B zKGM*yybL`}yWG)C=^q{KE_$P?#}wIZN1BhUc3PL8-ueiC*-`A3OAUa=Vl+G{Cb>u6 zb9ovVc^A5S87_GT*G@yuzwQKhsqt?|Wu&JGh)@+q7C<`0>hDR(4ylWNa?{9B&QjV~gklB35ZOvNJvy%V~N zk;6|hV7i*>AVJxo@~0vC*OzQHD=eEB6wk!QwjsNf;2@5@{v|BKNv<%bmsse?#X{jN zkogx|<`=TTeot#|u^*Y$O&bHd9b2f|Hr|LJr^J~gcjCU*g9q{XhgS$=I`K}*CIyrF zV;>wtkL)&S(0b;sYq`v$QDA+IdR^yufYYJijx7FDMf@Bru4jU`Yi@a(+b7<>VaaFi z)@eBVLXIFa7Swv(^W-!g#sK|#;OYcx49|niDT|W=4iE0Y4G;tO&i@3QW?n`d3Mj4+ zr|_m^P|S_?ckxl=O1@|$I=xhN3jOvOh-JFFACM*=4SVS77^U%dU+QX36m}eJ8nf}5 z>GFqVCKwn0HvIF0dqZ$I!*|HVtG~}m>vTt)vSs0?mrtWiB4qZHeFj>VMWb!Vd9k+G+En4ZbY}k-w;upqysfh*l9d4rq$T%lb}QNKOJu*XaUD)gguj*Pa9na zi-LV=gobInHYL2;jqTq0(B5}1IPD8C3lFP!g?A8U$p=-DJS}`L+g>%r|1{9T+1|QX~=g!hGj7P^a@rgB4R|+ zoiHNZ3RB6U5^(FH+nkYCE%0VF1mM0i`hT!YpOnjRzRF{7^5!SAtK%BCPHjyo)lo|z zXA`NV$$*Mv)}uGILZw^1$vUbI=e@*> zE_YFm-rJ8)?^X20^_SfME1B#M699q{I>Ve4?ZWNWl9j9l(dL!kDnIX{qK@|rY}-Pp zd7p5iDd#x7r-#QP9sP5}-M2L_Ga4&E@bx4D@rQ~nnAeJ<_eQjUzSU^@g4^TeTz$Il zaU-1i3zz4$AKrzp?2DuNPSGi2n}Rf^*CX2sI6vq`)!5u= z6kk~$jdgQn;(n61x7(NJX!5)R6u)8na=(^)jiNfI6Re-q@G=tPRT=i8aLdd!d)OqA z5%rw@R@|(g=maQTEoGaf<;elHkz@>SZa{4W?iDa+E6y+4BcP1Ukob!hY|Zv8{rB(%Dn#bX0saYr={*8>>j4Nc?9 zj=Q6be{Yj&DMIQcx9H^JtH&g-rIaTph~jjoYYoqsk>7?*{l<>5lj9_(>aq9!nUkS? z`SpG3Ql{!8<9GKqxI(TOX6=E$v-9VT<&@TX4f&WE@$!rWIky9>Mymnif{PX7L4pdu z=P~p%*VhY<`%i-`@hY+TEOd?nbV+9HlGVhe|HIEZqIsXRny-FB|9D8gZ;vkHWHdHr zR3}s{0eYV-nsUQQEq6`;^Di>6-^D)8(8Ga_OvuZGYLrv`X_zZG`#QhBweYmmdM*Ds z?8tM;{BhRpxKAVfey}TU?slo?7&9(s>;21Sp!X`*z*udq#vb|7mjkn7xJYu-C1%SG z$=BMGnJ}a7J>RZqL)ZqplW?bpw@3HL(7=AlBf;hb)>cnEGQx4rf@X%xGHUqoQPb*N z+e){4zjR+iwRE_Pc$_fPfwL{369)n2pz%%aXmYZf^)b&L*saXyNPdu79MjOVHhtV! z6!M<#O1opxRfT;saKJ(*_`iCyg}K_4DA(k#M_Fc6fzYj@ePd*s;1oc=BK@FEicY}p zatr!Ha&IV%m>F>Lx0FonNBMoGyVH4Xo`8Q1WakQTXH(y2S>6@@*S+gM^VvDarcSDf zfMpZ`4^733t5_WXPR7rYG0pPAl>=4h55uQ^9ggO((Ks?Mc)fw1;A#UZmn8|0EV(c! zg6d61=4KfngyDv6;wdjOy)KXYN7PO1iq}{sbmjb0^Zd0oCKtcO*}OxWnZh-BcQesG zozBjFvfLx};uDdM{_CIo#(_9Fvb+j!K`tYL>_(gN#9HI=4BSUmpvztsCCb%V6Atw| zDj7uwdq6~#!4ifcC4KeJ1#UO}(I-i&^_j6oaTc*%*h-mzWsZTkaF3v6UTB=_P)^ol z`O5X1nuo)g^n0l#2DBZMs(Dc=@4PYsFYxYFR;J%)#>m~?1FOWZEhl%}MF_nz&wr)I zuF6gT1KI)4c(=!=t3TB7f3UnoxscVIkKv~1O1Ahwb0}Kgys$JPk9RSdJ@AGlBkh`1 z=ET+E?>oS{5WbH10khL0>5AEh>$n*cJH`BOPc+fz3Bo$nW+noRYYRei7XGSxdf|tu zy|uh&yW{FRJbVHcH^OpE({|ce$QEEJ!<0;?|bgKV;o(+ljU~I5-#XvQv;O$(-hb?yfva- z`r>gr#(r#2+Fi0jA|AK&tJDiKf^uRh`zv<&1Rd|i5L->UeNSlBsn`9N?isBKl9sNs z2YZ&Lk?Zone_*x8;)v0AJ25v9cY%5emMbiRo13KpEe@3>$jxJV#3!m~_ckFX?JsK8 z*0ZAJOv!T9v2#_OCa0?k!jn8U!TW!+v|CM$8&AheO_G`hCx^_~du6EDz^0*1}hwJ|N#<*A;L7IGb zf_6&qlliJn^d2?!MCvd5_GysSR$f4Pt}oNckw6m0qtnL~z{qQ7u4hMS?9DTS_G=Ko zF-ucPh5k-3Ir!Hk9dH6gwU(R46f0onF=Gz6a0VVd?xMo`X?6uFJT>e-dkpgU3^=_p z9?D-z>|_+0R&bt)m7_b002xCVg-L`?Q>N`6wcU>gi%bUAM!FAWuZ%Xz;mQsbI4PGg z$RIyKadr0*v03ntHDZ6z#Iu~SMnAnL`aHJ2RVQ^xDebA<{F!svza`3gl`rn_G)wva zgo_uc_|(=e{$y(WRR#C4xoLRJ)$5)a&QbFp**ABNv8OaSTb&NfUawP8&jb*_zbL%5 zoXG!^fo16RTSAn$o)#Jd2u*(*^t^1xOC+p#@h4aO?8fUIq~u&DAy6LrMaZZNbYWkM zW+lyd!|4aQ4k_lEe_9OIm9;p1xM8l#&xRMwJYM<6v4)%H)z0pcj@k;MnEm=wHB z*#8ds@|-rm#F`jEdE+cMi~jIc4j43@4VH7i@@r+j9Y!zc!C}yrKdcs>th)Pi)zUY} zCZ0%2UfybD)wYp|XVlkNpR1E8118{5-fe>zG=1^FX1`PAI7M6`t^@QNP)VP0K1m?1 zyKg&s`Ps0WU5%fGef_3aebd%*d+5QfDM`#to&V>?LA!OA##X0+*(HlyE|>-HoZHq$ zTzo9;XM2xdF(2^Vw!USZwW~qYj^rMl7Fd0FJydkv);ygW)ZAFx=;VtQ0JUQ$LEnb>md z*W=mgIM$R3jRI(!t^PVV_^-!H7DThEdiWbovX|7@f~qX#JrZ`=#wO4A-Yo}IJgEP@ z6Eprq_W#`vQ<5<8ln)Cp0q?i;iW*e=W*NAERQ2AZCbz+LoNSq4*5{7ULP-i8Ov_z{ zR1cz-e4s{w0>ISXye9q=HCZ#ys;}5EIDsdA{~=%IU>yr z2>(M&lcLM2f(X~O#)9k6{h>aSwh*R?&%T$_^0|4Hl^6So;i@`7 z)T6D9P>=sn&b4G;r4-Fx>DjKanvAm(yZqJ``ph>usHy5Xopc%`hL@;kIHMZeNro=x z320qZYdi(i+=$^t%B4&eOD|$1;w;^4dAbmUn*_&w{pbjsOO_C5~wm@0?K=PfbKMuN~n zzk-*EC(?=c<9!L(buEm* zEmTKCzTbr&-?rkA6x0^Qkb)|oS%KiUON@!4dgJz!0IX?VekhdF7$Vp@@UMUtLE;p4 zCj+*UZ(`ezS)S?C$y+P{EYZS8hht^o#Je6~^x&Wa?RJ{!? zNSTMzF|-k>XUV_Avbk@2?M_}tFCEqp#~|1Hnn9-yf%{nLU+*sC_Ns#V+4`wB=6@N# zoA_`$^*i;Aw7$1Axh+Z@Q0%dl9ro>SbLjUQ;tMKz6G`(Q&vgF%aWm|2p&AxWSJ!&9 zuwERqij;ytZ{Qm+Ik7WB0h{r+0xqTpk&;xR%lqNki}j!VzRE4tWxVEozFdxldAB(y zk{1e6KRZu~d-9ZQv-eqJ-Oe0Rfx#{Y8b@uUbA6STM<4XBaS}0D%9Pi1ZEV@g?ETMBS=Ech?krS)Ji-)GO?)_a63 z)6ymv`u278Ou~bhs>x?BIFp|*dk!=^LuEq9sCDJ~;Gs^lWx2Lk^%94)TkCT_zlq1^ zDiA5F1e<;dZs^XOr93`3)X%81c6>6toGVfqS{O^O+u&jrT4$n?v6XDnDy8ZX%JRxs zy`TMh$U)zA6DyX^?=(od*N{`P80t*?fK)5>45gg3-j{E@pj%)$8o2d%s42+OVg}N& zaF_W=&^wBz}KH+^Lnh=7lI~xqDZIsAbAT$CSu|7c9dueUgj$<_0KR;1BbPz zyScXB%#Vm&j%;#9DOv)SOi=Fq?O0%@Y+by#6I9R(*~#oxpq3ex>CX$?jFW4MWeLH+Alta_tAmVoU>E_wgXdA(Il@oY8R~18hJ+r84{_Dm(}EGNMd^)ZqLop!h^Q| zzDSAu${vJ4_5%TN?YGzVi_A1NZuxBNhvfkjF@6vOoQw9SwXZDGBUQi+$UDT~w zy94~O;F>peyRUw>Bk2js6A`uyOmN$i&-J1`xTp8kO9KC_zXd^SKF5ta4%*>2!V|s# zq0RTs%aD29iU*d|_L>s3oT#YM${YgpB^8W+a(y*e^cIWSMOLz(Znki+; zBxCyo9#g>pjr&fmls`m7?%OFEg1tzlXaOkEgT!Pzhz`T2G z@GgRWP?M{lmg*kJI#qMpO|05IWQDY}Oat43MD{_Qd)I&#{bUxcSSE!eBAqBPFc0X| zw7wIYqubZD|DzvvG6aa$2fx$O)+_kJsYSLsr01wh-J`WVr{+znNz=h;m>9&-6_&$L zrYI<;l&ebXridf&IqBlqYGbE_4v1O*{m<}M)o2}{36&Jtgbv{t)twpsm(h*{eUrAy zD<}#uQ5gnZcaZV@AW|$C>uX#*D8dr~$H3JP%%bYf?g(O< zSUywewMdK>8O7Wb?Y^->uE*ZUo^P&y!q7x`zSPj)^=C4{5_OD) z!gw|*iM>k$=pJgu&}`}YRF{PJ>qj)weZDhNCt?Y-pUETd-C4A)3@Vf7h>9H*=A7!z z%vcG7rA=a_V^=TI)sBw=R}qLS0L4L?`((ORY3e*AEWkS4|5N) zCI1FEHfuJ$*&)9-m2?Lvx_bHOCk_D8-GTBSfo(Ba7<65|d#antbjyC{BR3c9{$!$W zEg58^emD!uMpJI-+F7j-_R})@%Ua#h&DVYG+rD*0Uaf&&Evjb4%}*R`%s;=ahom75 z&#AV-Jh@*eAyJ;o^5de4X$cAu7T-IKBkaF%VTCg~Ca|)`?bPEH#FH0gY8q1OU@d)&c9h(RCO0;y~_L%+$hyC)Uda9;bQ@=o31kz z<( zjrTheA?WA(*aSr&m>?8NXm{M((N8dtj*6yFDW5n)@YeAh zLg$M6>LgtA8-dYg1b3nr$(Pl4Rv;IU6UgkeBlHkdjdix+ioJ+Y6(vt61RGR-CBRPQ zSQBRu_;^W^N%Jri;>g!_d8On34_PyD|9y^n+YK{49}-eg4jo@6^a^5_mXy`GB^&$L zQYt_^de;b(I%>YNhRU@4*g0x*YL9W@=4N8Gz;O68p2m6d)Asu@b? z-ZN4EW}SJ`{BSk|TY0(?=vyOEabIlbSw$XupxX;Gj}?XfX4ClMLyku=DjUNgi_d_O zF6>#nWSMLP-A;3+rQ(41@G!F&cn6%O+Lyal=YdI9_a?}$4ndnQq@$n3wjK}jp<6m0 zK9u{27mTm2_~>$4GM_6#QHC93`<|@!{HfnLvGyrRsPKcki{GQUmU~2GBaU?oz1;i1 z0=84Ep1tXH#d27kNuC^0&NkhtUtpD;Q8+u4GS~ArY<29EDZ55hUoUsp}}P(b99Ml z-C8P4N&1UV23EaCp0Fp#negUx^PRDw9JT95$celOsDM&{u3trfzCV@82BIdFTB##a zM=+>i62Do*vt}jP7C`F6%F&7*@5~Xo0=8_zR97boo>WIyxZlbzK=Iq1tL1xxsjfOc zsbOII%Ll}ExMcAXUo2bDbIo#`78U%0;TP#V)du}BUxBjd)!OGtpKbgtB`R$1p@e4< zAtWl?Z0d{=Lq!s@?Ak|DNhtJqF~u95wy)REa~MUz3$5&o)wEj_(Ed0n+fpxUC_e|Fn-En8U{lAZ_QRp!(`1r zzKUwZhb*s&i*xCwn`alkF`wU~y&+!u8$s+~48U9PDbCV~6=vnYm0XTYp1NAg?zm@H zyRbEDxtxs@<$%PLwu_~UDzh;tQ2BYj<(PjIfRr$v91U`Sqmm^}eD(@B)f?&0;Y`1}%Qar3%+b;`RTbjP6XEGYuP-nh_ltm?Q__&+n7D>#1S` zg8U2!X6t+G!%Nd|HBm(YmH^exzI^$FFKB%M>e}t+-}oJ~f0gl!p0Caab`{x1s4Iro zU}ha6XgtOx-@`a*?Eo7j=HYY!phNmSnd#a78D6dg7S*r!CvAac$}H>e!&ovr;+MWI zIhx;^ZN75?ErVP^X&~3{jLSazZQHzA-I1}xlRXK~Is&TdR3VkLnn6q}BR&h)#5(U{ z=b_&^1o>iv0B1UUbMs_2wQcp?dJ9Nqq?e*wQ>>-*)u|vnnRGHUe4|=8oog5yRlV$EN&iqv`pv?i;eK-vl_mB?5 zjfkcmN(3!aXT}lMDJEVaK2q@?^(9Ph&iF*M?#_!bZ7rO==FUX#q)%9n*5m3kN-3J| z8UGRXHkwFBcuz$nx>El@BEh-HjJhg`^1VxX!?YXOg;4RR*T&?FdtY*D8~1rs?qj5y zQ2C=Ay?H-KIvny5S8Ms)85yJWA$=?-(RCKkRrt+D?3h0qw(l>ELY3(2Hc%a|Gf9Xq zvfX1fYq{Wlcd-YjGP6lgbW=UFz)K-l5!)RcP%%yj1A;b&Q8B4kd*#NOEkoD3!ux!` zuiTD$t&6?Y=>1Wk>BLpKMn*Hl?OH%}YeKACOJUl`^cvU@9|P8U{j*S#;{_Wr9d@{1 zVnpVk-={{rfW;)jLh8JBwvN(vxJR>Gn1GAoW{c%Sa?nN!rwU5Ip*h`<-G5I>=}Bx` zcv}F~^_EJYJY7Q#5X*!*V69|RFNmp=SVfRttf)hs1yj4pdV)STvO%gIHg0^hWRm&71k64jrm-%|mw|LKS7-Qt zc3%#GSekZ;*M@n=hV8flU?jfoAOS;=B9L)}*Mhn-{OY>(x`muO`ZWeQLpRS`UnBh{ z0wF8RM;k4(l- zjV%f=wR!*FX;{$42ot#wgxSVTH$?CjGQfDC*YP|}f?xO$*5TD+487gSqNAeTlu7H4 z@t;7>!4Ne5uO~rMT<v(64sUrUm$$WT1=kVEb zcF=WDXOdT_>&Bu}^HEjmkL$IXxjrhTsuvgvjy8yBKL25n^jvO&3iMAa?`=47;(K=` z34X|hq7E){np`?8#zw|u(M|qOnx%A{!0e;`a?Lg#hk0!gI8*Ii z+dC6R&=?}uF?-i8fU!%5xRJA~9-o?|$5bkXuT6>Q1^Ej`u{v&22#O+@3Gla6#b2e% z4r7ylIDL<&0i8TCd!z7NquA zJ2(LSfxfHwokpgs&oqvCV@9Cr_b0U6)* zi9rXaMc<{H1LC?x!)L~A{q-UYclme6T4>F;+`fZ2ukWbz%2X1|4RKbhH3XPk1h$1Q ze~S-!^SDUVO48tWTfD@@(8+tj)1eq2R5H`=D)_SXy$!P9wI%1nP2;+gH8f@xV4$YX zQPCe)Ok&$<%jUonXUh^s@BNQs`rKqFmw0fHKB(fOUW{w$h1Ab)xNJmQAHJL!q~?~? zu`AWcJh+KF9xU+uCLeOqQ*@o)3UW3Eray-`>+f+4Sn4KnIT;bW}9{&oKE|c(STC~6#N!e&iI=-UtZ0~T|HF2;HmG3sU5lASlvU? z)t8Q$CUTa8*Et0=>s#>>m*QYUe*-JuJS>No5}C&V5d!R=BBZ$^%CoGex~KLN+ImP0 zEPPZz#_6O=IILz-vA6`EGZPoL7@2+wkGwwhZvdVsVBkxeihjK7d-<4&OU{1R)nlwv z79`Di8tFRyMB^6!9!)A1NFiWqjL2ruL&4%N1JPzt^3GhtWejflmDBHRJJ$cMeScV& z&$hNUhHq*J#}xG2r;K;Pb4ai)uX2@cNVx&!O?9;1tjbqwRWE1_XX!CjPI7AA3v>Q6 zTg{IuIGi^h^pSpb?_#JYdG9>l*FW&17+>*^D9yBZ@6w=PB*6`ORvLzJ)bJ#?akho5 zQ8eDg42EKoUJfY%X%jk~eiIUW_tb-sSXP7Ta#l5u>MTtMNjBIoSMKpxr;h*kkd;8S{~$9Gt)BMyQ(Dr@rjfiE+I!ilnNXtyVj5WsXaVwb8{}4b3iA(iTZU8xElay zYt7oOVZexy!`&4qWcU7#%1|gFlJAL4^i-8OlxMsw7{s7=`>QJd7c+4rM~W`R&(ynvNbGCh%Vc9K9hwPy{*OuDeS zqfc|w$DqsEpDAhb$^HJ!#=NOFC8D(?$63A$oKhBG%CXosV?F(} z*^+ap_LGNN^Do{cXJ~NWvQ|rwfNwj?h2`o4KS)scz`&FGppZ)zJ%oz^Gf+?Rj1>Q7 zKOqXAMeuyLNbHxF$C>2|{Fv1aSD!a%a&)&Rr?Y?h=mLRPgQuIIA$jd=e8qui?EPwj zsog0rmzPtgQUOBGJq4k@+QE=&VhF8eq0f&`*fQ%1d3nNOnxbbiih}It^p2tO znBo@D8bnyU_G^NCJ*!QLAsR1e&Uz|6()6}+Mc-n?yrnQ(t$N|>xB6xNor~dkRhata z0-eZCy8C(;FS$;Xprg7887-4H`P&J#N1&j2FRoV)iB31B^6BO(-bUnHFCI$oPcq>R zE$Kicpcr5rpr^@XQflg`AUO)`h`|$#&+B0+7Z!U%dz;HdZNN-9h=Wvg*kr-C4wiUe zdHRVjq~eL*W@>VmLANz@ByYtug?@c?XjH~gT~3_5lt^N+^!R+nYP5ZkM zp}c0vs$eL0DKQkr}IP>n;|I(vV&2`I`lq9tHrd_ZW3D`eM=9R$T7BF zgu9!(ROPcS=3n4Xd52P*m6cpK)@JtO9XgNGbnQ`GEMc)gg>%^2_tvZCY)cYez6FAz za}Tb@&3KT|Yw)LDr7(?OJj)l(XtLpbOrY>hB)#i?y|nVgFSZ_AZ+UNXu-Vgg4?F2S zNzWIhUAIah0y}=aFcl3~6(ku5Ir39}%Wdd?Ia3LZLv`kx5aBGFAj}HRmDf)`6GoE} zz?0Ij%*dhJ=X-97JckP+>((!<`{>&-frG!u&UEkK?f~5c5^ulsL4gfKAk!gMOFZj=SfAVc<{X=EkO zLQhN{_jNv8XZf=>d;GCpoyH&fT}vr=)0v%JItBT7iOGadz>@9~yfG!_9V=Qv*QcfW zEekoJQDB+s;P8ym&+Lc8>ICZ5=00BF-Bi|k8WFB|7-4K`_J~)zLuqMDq&#;4F*5tm5VRV&95|C7Kb;8?vp7 z)sO^LD)JwYYxUrg_B|Ok`&xR-vajE9y3N;uTp*O|(fC=n!`AC)+!sg{C}&MVPr_K& zT-(#-aQLGCLk%CnNS50mTcr{leZkj!41eQa8Y+e0#IIq_VfJd!Wp@r%D_#7VU-~bu z%x9`>`H!WW155FGaPcQ$Hq|Y?@!3mTij{{>L#)m3E< zKxGK-`xY;k;>H9BkMOERbxc|YZI>jqKT&zSXEbb$%OltiUte8i`m(uNLWmmDyQc^- zOhSN?Vp=}p;vA_N+pl&r`iAN`I}POZME)ZXy%+}(5Hf_RN&f{(j1n;fJ*#2038PJ2@baW#nZ!%c=MS5u{)fI)4ykaz0q|F z6-;h=$9+;oyOB1X`NSahro30eHoHfwF&mjd-JXrjEy{ePrGgj=&W|wW(DaW~&0Gna z{H+&if54WhnI#Njt^F>az^sK!{qv2CqW^?ya4wE9AQtCaIDM$t|7-0nxZ3QZEnM6o zMOuPGaSc#DG`K@?T8evt;vU?sxI>`?mr`7c6?aO}7A=GXDB6Y~#kt{(bMCl5;Ew!& zWW0IzUVF{;%(*q_6cwcOm)l9t<0P{T@O5IT!O)P4l|Q_eR~kL#JdE!mjuJghQ0NJY z4_XJ+b5Rpy4)!%=;u=Y_@;M|$PS|1w{r&3S^DXb3Olxk}`VVU=cphC?JWp70&d5Pt z-|~b`WY|^65Q%fj7Fn9FXB$x{1dowv`+82g`@--(aV{#;13ri}Fd>XqyTY^VQU?b42u0G*?J&W{)(Kp|s(%z-YpVz$qicGl^jvmCR6FTxET?(aoaju8=cmk$?5G0;XuBhH zAp>ZY!@d%vn6pmO&x%KOznF4R8x|=F6~Eoa{n2*&!vvJ-#|5f?T*ZHu?Y)XbJL|BJ zgw-h?IQ)#_>Q}Jp-jRQv>PwLhPQ~C(-FYAtoXhWqxph^wq)bV#8fK~^-!t0_!FbPE z?251aP4WA?v7c2WF{Dhbs!}+KWe_u~&|yl~1;+Cd+!?U0R>3=JR(yt&B%$Op1%d24JA__7HckqSmKN|?W|n(*S@U_`_u z4YNYtDYo*l)nk~qRe6DHAN_8~4mFnxk zIK~?bK2ka(IvJ`I)DOl{qAnmd&C@l3bFNJJvLaF#&yz9TmX`!tV7`F3S&rG>$W5}V zGX^tcM}{4l>tzIpq&2DFT!5Rp;a$};t_>V^(3F^cPR_{rl#4W6v@Q@c=YPGnywcXq zYgP;DlqNf`)x&dh+FKKr-a8y70OYfcO(wC4bckN7s9p_L$mC{mL*ARNE*hBlM!*u= zwTR;aFDU9~;*dY^(wM9L!huiBXIXSG5haq_bJSaD4cCKJNx=eiV;(jh;XoF2jlmP+ zt)>r+U#MRV=Y-28(Yx+FcU{x{Xi_p`U?R;lQ#m3vYw?V8cy;Gzw1u3hMX@Y#&n$iovol;L&N|Y`WvISXD{j5O zB;oAaeXZl-qX`7X@#}Bf?fnsA=P|ua!Q%ro$LaE!iE>g9IUp%m_*hXvu~m?5cxR<1 zS#Jo?;r7&kloUxsp5zCEm`GGMd>GNjB?E;9YdhGQMzu-S7N zY@r{JdDee35jCVcwWRaICz0FJ)ui$s^H}1@7#8c!G{i-qcl?1OHLIMIsMQk*uECfR z_!ImfOPoo9#jOl-7BXoPW|jBYoULW;a1B@4;JSjb=hcc2;H?FhgfQBBF z#yY5NdK&Ba9ep?)@L@Pe_%bAi{`R(Lo4fVL*T>OB(9RlSae<>26=YH)qJV)+@n_x0 zWES7H715n6_x&*xwJNV}04?sI5({XJQmqih8KDzb#{?(QSx)817n9|#8kn_?8x=Xi zrKdkieL?L~paxDrsI3BG#j%Rwi>%R`AuAhkA-DFvLG>u`zu2mOgT$cWB8FhAS)_Ie zYj1q5tW#^(3uwEquY**CpZ8;B+y%zPdX*6JE$hNbIbtam^%-tgi$$Ky5ZSAzW&9k# zot(gqj1p#d1EEk@mwcTGq0f3DO|EuZ26zH@BhH8jUj=Cuw)!V`)nRgA0TK>(u{qT9 ztJ$Zn%pq7N63gPP>723eYhPeS$+84C(gA=H^Og{W*R#8&4@mj^%}|F`65mLi=0_1P z$49|98;7&>9e-vqH(n1uD7;}C#L4UCOT#cJ_kgCi2oHa=cr=q#lFPV;?^!-x`R zirsC0HfsTk{ zRSw4eL2UygorIkdtw~aXqe-3$Q(VKp!@sE?w zsg~~+WvD=i`>}+b-C?36eC12P^?udku<==t$WPwp4la*l(sYncl#%Lw7GnTBc}J0< ztC&F`GF!fIYscEoUOWTxn!!UUS2TfGKZlBItaczT%66YupgQ!8q-Bc# zSOtb_641_X?5eINBx$AmMR7ir_1b)kXY+r+I4)|vCz>qNB1y}tM}_n%Fh=FNbYR_vDopCd-NW4qYw6~oU0J@@qr)0Xhma5>@U|DVREn_b5xv~>6x4~Lu zJ9v1C6TK}>id8ZM4iD#`8(-`Mb!|0$s>v^D9S2Vu{;Ssd5yODC zyZA4JGdL45o{?g1JU)?`UZ$33K)S;KR@Ov1&ehQ2f?}l768!DRE6Y2i=PQ9nh_mzY z@97+EnWy9E5U|%UCRh!IZ!ggXo6Q;aT2V;%2x*hsz;u@(ToAs;P6#3OP%b%%Xpsp1 zN;@*at)Tt9`QPvh3od>zGnJq##uoO7Mt)YSV}dGk>;NqmN)5ZS8ozx83<3iFPrm-pIb%S?(~xh4 z^<3l~A(t*#T$|#+V?v<&NWX$_Vb7&&zw#va3p8Li9|HJ`#_Ccw%~CyQGZ-gRML)-- ztLR+yTI=>EMb1CdQ0D>FJwO80Hwq3g&ynpYC1S^b*~9k!AxCQ~K{lXTF-c0DqFHW5 zRmUn8K6d{!et_`h?8vxYtQj}Lh9te)Rr3~mV4&YRYd}xh%7npGmX|E~NhA*H@rf5j z6TJ~o&KT=zU@M1YSUuyf{hV>I>XjuOqzu8}QlpX$2v+X;iA2+O8y|h<)temp<)2;z z=$6jvnR3}+-R>#KPw}3vmCD$k8x#1lHirShG1tRF%H zXc-CsAD>KeM_fDjNbKl#SvU>W+P<_2N(ZF8BG`6nzDa9tg)N*Pu6mIG@HxaU07}Mg z9b2)!AwOtsf3YZ)V>~9c!xcN!!UQoVox+1^_NY}Vs(d3Y`%2{H>_(>o7OHErW5i?c7S?w zd%|i??A&0sid1F*mB#VH)aZ7tM`eV+;n#|G*(IruBqv&sUyGDg29vK3jYZT!p+u?E`p%^7)jT0W>T}I0nufD$RKx10nQv%(5G9Cj?vPtxo>7$pP zt7+jGaWcWPqC}G1{c%*HJM94d;q8@sIpPnZn>mVOlQZsXIeGv^YwUn`rdKi{s2JNR zyFwR<<0#t`C8H++35=Ir;|mpF<~vT^R38($_A>ze9Oe>ALB^?=DHxn>8k|_>r8x!H zufK?=w?IElNShp4!OIUK z6Q0XBwi5{&IXo*+g{|f!yw(9RFSr5G>R(ykimU-lOBGUgJxuxl>z}#`shW(Xlf{a? zuA8V&!d4Dg=Yn3dMy9h7I&Jw%MjeYw_9uo$!GswN!if#y#~LZy>{~oKy1pTMxi?OU ze{;D>4cFmu|L@36F*WZS7wZ5Sfh)}~iG3jw;PZ8i{Ktkf_t`*4*p&Qxxh z+dy_+4Km3iY}S&AC9f0<4y4j9vcIzuZo-J5BJw@l{5{~ntf*Q|C*p*EhPtxB%Ld1B zeu0lE8|R;Uy1%xyq8EY2Xq;fVWSby9X`eQQIg|r0GDNrsjUk-8`}xL}^a~o4{W0(I z{JTZa@lGf*ifK6ZeT5EKJgG2*lU0Slo>W%IuF)rI(bOAk9x@VB))LAa)NQgTO%0jL$acCew|)?PFTLOHQ49TT_+2o--7g1bsc5UnU;vXrdllI}!@j zw+e-B;mZh0>PVj(nk~`tuH_xPe+B_cG6%&Kxc7FNI@h(?G?25#l-Ltql*BQ<|N816 zGtSdtlU%~;NXQ4x2t)vL`0B=#7}_`;1D>Z|3{Zw;c`xs71pQ4;7G>lR2g}L0t#>RN zFiQEkyu@4azB*SoEwgu8sEj-yG`dB?UEDN~^XVWlY@mOR!;+b|mRJC4dpQ#q+VyO; zeNnq^7L{Y9+978i;Hwbue=0_%w^Vus80Q7ApCSt$DPoAaQx64D}79F0GA0@wY+hg%9`$LF?RWo2Sq4pJo4fy(^4`xo}$Ps{s<5_+lR zk{8{Gp51jQl1Z@rQOx+w-s1ob`DqT>ipgFm0*VS8|2ny48co*3!@o?lynWtVjNKsG z80SC6;6FT?&_2+2wOjB@;&&keJ!h}i2y;0u)C8K1k%zjg0F6P(bb zuUe2;d;uC#lpxaV?3V>39O%Uy6aidiO%We_RHL&`+QG}>uAyko(f{VCMd!$==^ufP za7XJ5dzs=dktjtbGMP)OFK7k6lUSgmm;-?)?dFC2hSud&{U^DrhBZf$&^AiE>zT;4 z_%v0WoycUz7qgCxkAr8h?VM|&nmXZX?9niX8wlyrd0gJfCQ6_Q)jnnE&mSrH&pC zQF=wTKQJ{RH0cW;zvWLR^tQbF{HLk2+k&c6B^t>OJ<_r%6hhn7C;HtjouC#JGUDyB zpPX65KWT!ay&fT5uVjZ;=t6!ReSt94wRpAD9&B0^TNTJd%?6e7P9nWg1Ts<4;VU-h zTp(Y*aWm*&w#U85M{}U9CmYo>`s~Lm?DEcXF7%--Sfj_Ki2`1$Lz9DAyiuw>va5r| z6XVuNLU3V0IBzo96#$Hs>nWd1R&>BFVq>J5>Kw0m#+n%1chT0+`8W8tlu)R{TKhS$ zsw_ov(md$6EjvUizLp_iR2V-_fxpZ-0)k1uiUDP=;?Cl zfS)E6QWLdSVyA9cV{ao_wYHhUKAQep0J zHZFRhQlDo^o}ToUahkft^t0oq(P%%YsfkS&{5|iY&-3lZiNM1;YF;O*3r)~hs-R?` zcx}fBNGaYF$Vm|@zVR2I5!7*gP>aBR#`Ts&i60Y@f*Aqo;i{cINgFnx<)7S#GKm`w zt(jk1Y@n%b#8*`&PVT!eeRuqo_)I8xn#8f%MStJz4(MdVm?Bwad(QuY*H|X|B^v-T z(GA0-r!!QwKS=d3{Ig^b5I&MCC$4OKEA;Y6ezja{ikcj4rUDtQDsZcybm1s{NDv_- zJrVCrkga7rHVHl1+=L{g6E(^E3k`Of>UFi7kDS0CYya}H6}V#=eIQITh$_YJy{_tN z8$^RZvmrNYn<=@3b%Wc7Kfpdk|17jfz<^L&pA&sS9Ei(Qi-l z4}A`CvcC=Zh7tPt^Hx;rC2L&=a{$rgX~|^BD%vfNrbQXi#yY_^{Fjbe2ZrT%&z9SD zH;(=yKhxZ}b9rjBcx}t@jt40=S?B3?6?zS`+SUm3BHvOn7FD|DsH~JJ%pEoosw|=M zlzD4NKyT6HvNup7i9L9qMzn{FL=c~&8EZ0Yhyyu@+W-u$INW+<3cVhQ%v%hJyWJJp zqB?}UKUsSrx_EbP2**AJNFAn)j`6Y4ProWP~@{UxGB zZNxt5#RJ2rR#5dPwyStq`N>yr(QR{HbZ!o(B<8dK6=Ec(J2`?VqPebQsNBqEV{K0j z@d3EF2{zjpxJ9I+WJCQ;7oYpn{k5Okd=rd@Jm+#rVo=$+K5R(ce>*q(!V|)F^x#>V z!7d(z!*G8<+IRh<0Up|qe`{q0(G4m~7JdJf4Tanj?~rF|j@)R*O4;TxCVKm$%H?3O z=EUpyC~j0_iL!+pm{R}_`4(V785=D$FD`ExywxTgYm7M*BQ!LN`blw_*7T}SggTWP zd1Ut5O8xZFopm&l07^y!Z1d04!19){P7t{KSr%C%_)!l8+Zz9%)bi4@V0z86l;7B@ zY{aI9z-6)!ipThiKH^ylRx&Xy{#y{`W^9AyB?^hPs zFbZ-(tk8AVZ5>J~y38!I7$GzlO0F4d9I>MmnO&CU|5`fR6T3fxmLCECy6=n&G=VHC z=Yv&#{43e!)1koxm%xa1h;A1(YAD4txfx)dhw#EfFK^fENDjp|R5f`*2*h(9cz5270jMN0Mr`S}+2^^h`*m9QxyaB2*vd^p)Cp<)Ss zi9HS^O0_6%n@MyaYG~ZpojH-ZFDWivFOSPHi8z*22PZ1_ceLjMajp;-*Y0O#_Ls6x zk04wi(s=<3`dI8DJGHbIS2(M%=gE2#M6_Za!}zG(a9s;a!82rp{E$HzKMBaI*!6_P z0!AKsDw8?vopg)eaS0dzl+>I|Y=BG4T25E}dcQc9IWfkX$ki%13CUAb$15YdiSmlSqzKfu-cWjtqc z18QK3SRG|`i^7T}#g5}^Mtk%6DOFMmqI<&EJB?u)t5H+6P(uL;LXNHI9+Vo|RF&hv zSBn5YP1xM7AqBo}RSWf{Bn(d{;LSGMKpFRdw;aNrgX%mpg9e@PukoK~V^HDmK&Cr;wPZMOg2FG4Jumn(6S-Tixfa zNw{7}j?3qC#ZG^Ycn)9Jo@Z#K75)w#bGXlDW(wl2@8TQT#og4c0Y!cSeTZE5u*2P+ z%&0=*{$OHKAf~57tJJdmW;?tLRsn3Yoh!yg_qp|)^rg&~na^UFE7E>A{bK$`%jfRNLGTzVm|jH=?)HFKvEGtKV7 zx)^FE|6rd&Sx_T7)TiE3wpIY(<$$YQGpX2iXGmu(m`II|I}g$1{2MU97piFN{fOM{ z(&uV>k3=g6I6HB=2UO+6>JsSFMz%A$Hi}HtNKsix$7%9?{1ealbp^*FfK9%+rplaK zm07-#kyfVOj%P3Tcf~86C&6%YQu^wNZux+V6$iva!M%4YZ|8d^`4hztxgZDJkJZY( z>Qhi-w2R%b03#JnxnVr|)0W5hT+z7cQM_y#t>tiQyWQo@DW4ovkA!KmJoz%Y4nJhZ zpQ&n6nkXUBot zEUoqGXr3Q;gqH=&_Z30$X8NLsmH^FzXi}wNa%dTHEKDn-GpkFd13rlkLbKh?gpRN3b3apI)im5e0qb8x|d70zh@3Osn{? zZ$~t{#)X|@!5xT<&@KiPyhVIcTMXlNlHjQk=8Dq+C%}>DQ1k%6pXz!A0up}W&ZQ7 zN+2ADjrR-XcT(jo5{cG>iC_IuOvHB0!X70ZDrrA03K=TsIvJ(2jTw}G!Z^5FVx3dj zEZ_lI{_wj&H*m=!$knBTPbai6NJoh1x?p3r!zpj^FhZy;ZHd1~`sA_{H*EMg zY;&HnsIIJI7xzi%O0HI!ty3(di7hQ8(fo5S-@>}EMCVx}zyJJ8Gb-%NJYhHv{I$>% z9bz6zoS9J}NA%SI56PLHAsImPLrM~kPb3JImAkbmSk>IRI_NWoZjPMSH+F5s499Y@HS`_B`9_dvYwYjH4QBs zYan;@Ky~HU>H%%@#~S9Vx*-$LCYWMHuqfvt`~2;aKnD!#ANo23>HB_eD7lSJBKsCv z_F%qWB)15%Ks!(w;OIL9WMT6K`hrb%A=YAtB@j?vub&1nyF@Y=+ z|06&3N%w-@S-c=wbf+qA(Vv7rp_#fci1sSNhd6pF7?l%UblrfG++SO}L@hfa+dsE> zI&@9`ekNq!jhqMrH>5^`227>?Tlsm*=#-UYlKxZG=st}&<@eZX{^ zNA{pe+6PRZ;W9^#3RfD>`<4rMSbtdj1D1E3U&boMM~p=F2#;?4&nFr?IqC_*HW@Zt zNVg6_f|rgQePIcCP)lc%sTd$1zs{fLDS^%gYj~y@lDL6OFl36vc5KdP-mGx=40IhU zWCtaqCwcCJ>b=miJa+Iw-o7bSk~#ZQgduZlT7BI%`w3U|EQ9%6S<#bt0is!Ie_CvP z_$le(X^{Q&c+#TT2b6FT-*w9?VQx5cr=>v|Jw;^ zqm#UD`6;y{`D%_i%q{{|!l)3gqE_k;RpJVHsZr z%W4qUcmhg^;y&6;pBYH+N%cNxOgQd_zj}FLrEq-H`0QDACKX>@IjXfsBye3^$O2dx zMJCA=y8ZkwCbCuZ_7)v20Ny|#Dq~KzWFs8DYmq)+JFm}QMpg0~Jh++)yL}**+r`66 z0W1qUI41G}#d$kz#?W!e7niR(QmJ&AxSw}5^a)b9az&EV@RQGOG+a!8Xe4Zw{p?LT~Z@&7tELvKb9R!%=?9oESbiasJ_qx6P~ zPr~|V_hZNYjJ&VknI7f-a?8U{Pa``2-gf;>0E{D{eb07{o=Bh&$HD_hmQNLo!GH6! z-&!v38^rU-Nq1CPF5UVlt6k(EL9>LwYY&kcc59nG|8L(M%>sLNL#!e0KpseTr2K@{ zXV^54+1|2{RDdci1Zlb=G ziBmWfLYf_dGf?$!oHf<(-Hkn!2lHFB@SgmYIIHnO{}rJQO~AxjnwjArMaG{h-)G?& zMj&twK}fy<$5p)QC|)O}V`eIPnr96Djh3WlPGTvv7b|g-meA=G$B^!CkNvZZN6X*? zC2LjU1Kz0Noo1PlvkYFc4930`FB!dnHPZze#TKx z5_&{j_yS~hjj|lrar!6_RA{o!1}zVSehALOUP7zF26{#MJo+i007^AmgdSC7Y@~g& z;k}UupR_8ts~Wfzz;b_XCAh+c9wu}`^;b+=E=vici&i7a@bFpjdUKljWIQhw2MmmE z(;7sTGJDt2hWtm^xccan5I-2VuMb9$nrnE<$6`B1{X}q->n)^=;b8TS8%41ArKhG2 zt;cc7tV{}pIX1f!Nk?Ap%3}Q$_L7W`GVFq$3`QUZe5NG8&UmckI!-(&drFNNJDJnIRHslbWO86348sv^!Qb0|8zqS|N5Q6Jzeo<9 ztpu!|R?Kuc#$DqaRP!T`mBW+`T$lZ9v3&1mMX4W@?*T}q!ltc0VRTl)Y}hK` z@o0)yZ-y||LmR%S*cfvdhdBTh!^&yTt!;P(DxOzlu`})!pXnX6#?1G3IL(an=xN4X z=)PZ+U!hPPNDzaRgq$!tIz7Q>q75D+mV~6~H*<;9x608Sw5(#A#JC*3cSy?E=8931 zUL6}B0t7cMvAYYaljSfH{k-@ne4S)AuF6gMnLaHyDe~HSDuI`Y_Fby@BtV zJ(1?Ve^~1-V-Ry=BpKTKc*Io9`8A{TU)aV%u~<_dbfTBL>>K2Ze8ls1g7HN)Hf253 z*xd3)MP{;#Gr}NYxTj7&G|d*8)C6x6`~CxbCbpY3Cv&I%{qmP%w#UuU@#*iGvHj`5 z?B%QW{if$=+}XB{bM|s4$Ic?6QcNJtM*|s~lN7EVZhKJAX=FKoc=E<#oJ&qg58oty zdKIgvraqZ341>fn!u%}#WI|L0ovP~^{;A!i=!6FU&IplFAaiPDrYD+I%k0gN4DB?qv~{2E@!xX`EF`#1=1F}~RRtyVz`V$agZp4A zg)riqnXzIBNqk*RNlDDbz!%456aUq(x%o650cDH8&JD5^v$)uE#x~P-iO9Wo*>U!>vwAA%Inxk$|k1~g{@;Jb1HXTHJX$T0i zGfbN_W(v=)GGYqid1Zq$=cZLAl2hJLrS_pCjl}KqnCQ6b{|ME%r+m+w4!!S4x#4W+ z6&kk?*_r;Rg~%MJ3iaE2cA62VI`6Rg?PVB)&TXMdvg#;(^Ge4^Nk_AuboZsk>hgz) zY1RoM*}ESU&=nKt)fw|m?R3bUx2hFq2Q=tT`)eQOG3blbPopYPtLG(9HZPY>)pgH~!m~F*n2A1!c!u?*Ki_#(HBFJ5JZVP}AOW@@s^y zyE7xxad`iIcx4_p`&&d)R1%^KYxwUKi}hRQ)v}qKPIY>tVQA1|58~$tV@K%`d+KlE zk1N_aVY|%ah;wRy0>sK~Y%i)t`O(^-o%;;i%kln@1b=L2-59@{N-!_v!f=tzS zAG+`GbRv&WkZUHvhe(m0Ls?fGzsMV>+&{et3|z=}HdV#Q6EpzmA-@5mM7C))N@8bW zB=VI4Iy5}4GxM)QyD%J|7njSXeME40k4CsuG%Xj|7Oh}?4%SLJu6Hn%akk~mcPW}^ ze$^-WT+F_$sUqzats>O(cbjPW$Is#wirPUtiQBnCEtH%E;9mW^iM=Yi|6)(-pp=fi zFFVhgUj&4BI>IVxe?5grR}NBsZIH7B*?b=@It;@tX*p5oRkdAQH-zu!q5&Yzn^xz(G?uxU}$r$ zr6}x!VOlIJ?|uE>aRv6U?x}~@WR--U>$axHN;fTQh}S-TySRyKWA?Yj2F5~bS%U(U1V5VPbtfvgx{%OV=Zjsw<1$sPV?ON`dbYNMZgP+{Ax8^@P!xTRadF~ktf z3@85;SVE{*iTk&P50^cc(>tkLN^vH}=%a)EEN)PEjdijzD(&TklTj_?$vpBJ=4T(} z;(vHBzF&7edG3s$!%8_UoR`4Kp+-IRGHRaC?aP?(5h}|JmRucXToSckJpFp%QV$Mt z;pVls+&pt=n@ahw$@2O(t1j5N@TlU!;^AzJd#cwbqs$!yBigK-KD#uuah8R#iy!iL zo~(rtBaJiz`3@#xn|f56zg!`d(Mw^>biw_tPq(IYs3>hN}jq;Is|2#HqbR(oOxWdmQB#97N}-u|2~uv z&kBXH%fert#hVt`e7q7I`#i(=(=u|XJL0r;Q08oh){+bL1!QSqk&;>bXwoY9(=<2LCqbGVWs;7!!wsyeEpZk>jOD^FE2TNEc7GFt<@<988Z<2T6{11WORtqb8Bnz||N4NSQj%5v`HN5Geh6SB7S4*Px~P-XbVU$S#0u2&bnxa;|8d$*wNf}rn6 z^Dl0Y)dE7*ssV*)I60viBE_(X&|$_GFLVr#7wg`{Q^#VY#0;0C0=QuHhR2bfyJYc! zLvh$Joq}V#X0Y0t0C`VLd2zkY)1iw!XVBydQjg{`5i!3rd;e9l<5@+A=9arp54xd2 zEH5-eMqSJh>HCs2Jwj)%pm#0Wl>svssXzBMwWq@lrcbW6yhT#)hnL!H+_TNV!iAQC zHqLF%Olq$w%Fk;=W->lp9I%TMwyOROrGWj$0D(ZNgFcGv11r1~f2SM%imeu|*UKtB zE{}No;4q4fS((&R2%aD}ff@#ldtjd)HbpoQ@Y}Wuhp`nRFw!7=lq1b+NkGpc{bYG2 z_clRC8qsXI`MEFRhmn*)gCvH}r|kxzhOY5?6GaCL9bb(p{kN*d{_*~`} zO;>eTc5?ANfEnRq;3HDlqb5j^`d@yQ)_PIn-}kuqm}>q>HU|Oq_Ct0q%W>R#iZPk8T2rM+3*A@hp>}jh6XnL=q_wO+5$r7 z$P{@DN>j`y=7dS><>4>87pQ0R%PlRvuA7C{DpO|SE7y+@fHbn;2-{PFrw#6_ObR@mws2nRIg|Rj zpL$8P0}8l@jZV6GUAlN1*k~nHg{&H)lUf^P-Bwr%(*k=i>2@YERnlytQ#lWpP5q@?IwWs?~WW%w>#c}K9w&;Ke&g8 zm)6$z3AOzP5+2cJsHoNcNjiCu*!yq1$Xnl*byD`!Iy31W&R_3yq{-PXqjuCb1E+!V|f9l_z$izE1Sm!Xa zGw21=d-m`ew-=w{(68Kq2$^>cz|130srsQ;M0V`wcIFPO0j@`g>T>;u$%&1Ys)l=U zx|X8pQ6K5U^93PBlXLSW6(i4Nu{fU=vCea-kLdkTgSO7#`}ryA!;-Y7)YVM44~2jB zG+i?Cq)mh~m$NSFr9(1*P1MQB(meS2%dBieL%KFD*(I1O)zmPs!yzPW@)*DeZ&Da0 zEz>qO^iN&{VZgOrcsAU`rvHH$o~V?Jim}A($Q)3W1E;x$vP=1KFt>0DY-1g@1hiC{ ztx&qRS2i4N`}RIgnhvf%c~AR^ z!=E5MwX`W}LO4i-!$;M1x}B-iv_pN&dS+RJl+POq!*(MzS|bF5f_JGKvlbghpHO>R zK^fRL+gSXlM5R_38NTH1=Zc0VI9#B(O|K(@16LCIF#pZz#NLSE~@vh1YGrD-6eE-69^m)s*{Of{FAZy4iqcP~dqHnTggyVhfLO$W2mtp6& zZPVXr@}d7J_+VXJzvHkL6$`qq`O9mfVf}Z>o1wqlLAip-*K)ru!ss zG_F;5zH3gPG}yw7WXDZ6gR%tjU)=Hj+RbA$kC9F|JXX3mKeIGdPhQvB4Sm~38~jC9 z3+Dna;6uf|KSv;T59j598G}a%`C3y9C$-BC;wo<)< HRpkEzS)l^k literal 0 HcmV?d00001 diff --git a/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/projectlist/ProjectTemplateSelectionDialogPanel.html b/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/projectlist/ProjectTemplateSelectionDialogPanel.html index 74027686e11..1036ede5ac1 100644 --- a/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/projectlist/ProjectTemplateSelectionDialogPanel.html +++ b/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/projectlist/ProjectTemplateSelectionDialogPanel.html @@ -20,9 +20,14 @@