diff --git a/inception/inception-doc/src/main/resources/META-INF/asciidoc/user-guide.adoc b/inception/inception-doc/src/main/resources/META-INF/asciidoc/user-guide.adoc index d610ddb3494..e9a63b9530a 100644 --- a/inception/inception-doc/src/main/resources/META-INF/asciidoc/user-guide.adoc +++ b/inception/inception-doc/src/main/resources/META-INF/asciidoc/user-guide.adoc @@ -290,7 +290,7 @@ include::{include-dir}formats-webannotsv3.adoc[leveloffset=+2] include::{include-dir}formats-xml.adoc[leveloffset=+2] -include::{include-dir}formats-xml-custom.adoc.adoc[leveloffset=+2] +include::{include-dir}formats-xml-custom.adoc[leveloffset=+2] <<< diff --git a/inception/inception-docker/src/main/docker/Dockerfile b/inception/inception-docker/src/main/docker/Dockerfile index 5d37afa4727..5445a8cc2f9 100644 --- a/inception/inception-docker/src/main/docker/Dockerfile +++ b/inception/inception-docker/src/main/docker/Dockerfile @@ -50,5 +50,5 @@ VOLUME /tmp VOLUME /var/log # Launch application -ENV JAVA_OPTS="-Xmx750m" +ENV JAVA_OPTS="-XX:MaxRAMPercentage=80" CMD /opt/inception/launch.sh java ${JAVA_OPTS} -Djava.awt.headless=true -Dinception.home=/export -jar inception-app-standalone.jar 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/java/de/tudarmstadt/ukp/inception/project/initializers/basic/thumbnail.svg similarity index 99% rename from inception/inception-project-initializers-basic/src/main/resources/de/tudarmstadt/ukp/inception/project/initializers/basic/thumbnail.svg rename to inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/thumbnail.svg index d6659d8cf31..b62d7cc20b7 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/java/de/tudarmstadt/ukp/inception/project/initializers/basic/thumbnail.svg @@ -26,7 +26,7 @@ version="1.1" id="svg1" inkscape:version="1.3 (0e150ed, 2023-07-21)" - sodipodi:docname="thumbnail1E.svg" + sodipodi:docname="thumbnail1EOK.svg" xml:space="preserve" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" @@ -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)" /> 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 489bc949b50..71128297cae 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 @@ -38,10 +38,10 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.SemPredArgLayerInitializer; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.SentenceLayerInitializer; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.SofaChangeOperationTagSetInitializer; -import de.tudarmstadt.ukp.clarin.webanno.project.initializers.StandardProjectInitializer; 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.clarin.webanno.project.initializers.webanno.StandardProjectInitializer; import de.tudarmstadt.ukp.inception.project.api.ProjectService; 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/empty/thumbnail.svg b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/empty/thumbnail.svg index d94472a5691..3f03001a3b2 100644 --- 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 @@ -26,7 +26,7 @@ version="1.1" id="svg1" inkscape:version="1.3 (0e150ed, 2023-07-21)" - sodipodi:docname="thumbnailBP2.svg" + sodipodi:docname="thumbnailBP2OK.svg" xml:space="preserve" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" @@ -44,11 +44,11 @@ inkscape:document-units="mm" showgrid="true" inkscape:zoom="2" - inkscape:cx="212.5" + inkscape:cx="212.75" inkscape:cy="145" inkscape:window-width="1680" inkscape:window-height="931" - inkscape:window-x="13" + inkscape:window-x="0" inkscape:window-y="25" inkscape:window-maximized="0" inkscape:current-layer="layer1" @@ -885,7 +885,7 @@ cx="108.95661" cy="21.819098" r="0.018564327" />A b c A b c ...... + + + + +PRPVBPRBWebAnno