From 61a63b9d8aa2b39b078e3c2b4c5c0bdc49f440d5 Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Fri, 9 Jun 2023 18:23:14 +0200 Subject: [PATCH] #4032 - Allow using externalized strings from backend code - Remove props-to-constants-generator annotation processor since it does not work properly in Eclipse (cf. https://stackoverflow.com/a/76356911/2511197) --- inception/inception-diam/pom.xml | 2 +- .../diam/editor/wicket-package.properties | 16 ++++++++++++ .../AnnotatorJsHtmlAnnotationEditor.java | 3 --- inception/pom.xml | 26 ------------------- 4 files changed, 17 insertions(+), 30 deletions(-) create mode 100644 inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/wicket-package.properties diff --git a/inception/inception-diam/pom.xml b/inception/inception-diam/pom.xml index 7ddd6facc5e..73e511d1d73 100644 --- a/inception/inception-diam/pom.xml +++ b/inception/inception-diam/pom.xml @@ -294,7 +294,7 @@ test - + diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/wicket-package.properties b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/wicket-package.properties new file mode 100644 index 00000000000..b46cfa5c3f3 --- /dev/null +++ b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/wicket-package.properties @@ -0,0 +1,16 @@ +# 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. +diam.span-annotation.create.error=Unable to create span annotation \ No newline at end of file diff --git a/inception/inception-html-editor/src/main/java/de/tudarmstadt/ukp/inception/annotatorjs/AnnotatorJsHtmlAnnotationEditor.java b/inception/inception-html-editor/src/main/java/de/tudarmstadt/ukp/inception/annotatorjs/AnnotatorJsHtmlAnnotationEditor.java index 722867393a6..9e1aee4d59a 100644 --- a/inception/inception-html-editor/src/main/java/de/tudarmstadt/ukp/inception/annotatorjs/AnnotatorJsHtmlAnnotationEditor.java +++ b/inception/inception-html-editor/src/main/java/de/tudarmstadt/ukp/inception/annotatorjs/AnnotatorJsHtmlAnnotationEditor.java @@ -27,8 +27,6 @@ import org.apache.wicket.model.Model; import org.apache.wicket.spring.injection.annot.SpringBean; -import com.github.kklisura.java.processing.annotations.PropertySourceConstants; - import de.tudarmstadt.ukp.clarin.webanno.api.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; import de.tudarmstadt.ukp.inception.annotatorjs.resources.AnnotatorJsCssResourceReference; @@ -39,7 +37,6 @@ import de.tudarmstadt.ukp.inception.externaleditor.xhtml.XHtmlXmlDocumentIFrameViewFactory; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; -@PropertySourceConstants(resourceName = "de/tudarmstadt/ukp/inception/annotatorjs/wicket-package.properties", className = "Messages_") public class AnnotatorJsHtmlAnnotationEditor extends ExternalAnnotationEditorBase { diff --git a/inception/pom.xml b/inception/pom.xml index 93b65c6c5e6..9137be370ee 100644 --- a/inception/pom.xml +++ b/inception/pom.xml @@ -130,8 +130,6 @@ - 1.0.0 - 2.2.3 2.5.8 2.2.7 @@ -336,14 +334,6 @@ true - - - com.github.kklisura.java.processing - props-to-constants-generator - true - - - javax.xml.bind @@ -2305,12 +2295,6 @@ ivy 2.5.1 - - - com.github.kklisura.java.processing - props-to-constants-generator - ${props-to-constants-generator.version} - @@ -2476,16 +2460,6 @@ maven-compiler-plugin - - com.github.kklisura.java.processing - props-to-constants-generator - ${props-to-constants-generator.version} - - - org.hibernate - hibernate-jpamodelgen - ${hibernate.version} - org.hibernate hibernate-jpamodelgen