Merge branch 'main' into integration/experimental-ui

* main: (27 commits) #2312 - Add support for new external recommender v2 #2574 - Pull project export code out of api-dao module #2562 - Project name no longer unique #2286 - Upgrade dependencies #2286 - Upgrade dependencies (21.0) #2286 - Upgrade dependencies (21.0) #2286 - Upgrade dependencies (21.0) #2571 - Email validation kicks in even if it is turned off #2475 - Upgrade to Bootstrap 5 #2475 - Upgrade to Bootstrap 5 #2562 - Project name no longer unique #2562 - Project name no longer unique #2562 - Project name no longer unique #2562 - Project name no longer unique #2562 - Project name no longer unique #2562 - Project name no longer unique #2562 - Project name no longer unique #2562 - Project name no longer unique #2562 - Project name no longer unique #2560 - Error importing re-zipped project containing curated documents ...
inception-project · Aug 31, 2021 · 04f849d · 04f849d
2 parents 86d7997 + 37348fe
commit 04f849d
Show file tree

Hide file tree

Showing 140 changed files with 1,493 additions and 726 deletions.
diff --git a/...main/java/de/tudarmstadt/ukp/inception/active/learning/sidebar/ActiveLearningSidebar.html b/...main/java/de/tudarmstadt/ukp/inception/active/learning/sidebar/ActiveLearningSidebar.html
@@ -29,14 +29,12 @@
         <form wicket:id="sessionControlForm">
           <div class="input-group">
             <select class="form-select flex-content" wicket:id="selectLayer" data-container="body"/>
-            <span class="input-group-append">
-              <a wicket:id="startSession" class="btn btn-primary">
-                <i class="fa fa-play" aria-hidden="true"></i>
-              </a>
-              <a wicket:id="stopSession" class="btn btn-secondary">
-                <i class="fa fa-stop" aria-hidden="true"></i>
-              </a>
-            </span>
+            <a wicket:id="startSession" class="btn btn-primary">
+              <i class="fa fa-play" aria-hidden="true"></i>
+            </a>
+            <a wicket:id="stopSession" class="btn btn-secondary">
+              <i class="fa fa-stop" aria-hidden="true"></i>
+            </a>
           </div>
         </form>
 

diff --git a/...darmstadt/ukp/clarin/webanno/api/annotation/coloring/ColoringRulesConfigurationPanel.html b/...darmstadt/ukp/clarin/webanno/api/annotation/coloring/ColoringRulesConfigurationPanel.html
@@ -21,19 +21,21 @@
 <wicket:panel>
   <form wicket:id="coloringRulesForm">
     <div wicket:id="coloringRulesContainer">
-      <div class="flex-h-container flex-gutter flex-only-internal-gutter">
-        <input wicket:id="pattern" class="form-control" placeholder="Label regex..."/>
-        <input wicket:id="color" class="form-control" placeholder="#rrggbb..."/>
-        <span class="flex-h-container flex-centered" style="white-space:nowrap;">
-          <button wicket:id="addColoringRule" class="btn btn-sm btn-primary pull-right">
+      <div class="d-flex flex-column">
+        <div class="form-row">
+          <input wicket:id="pattern" class="form-control" placeholder="Label regex..."/>
+        </div>
+        <div class="input-group">
+          <input wicket:id="color" class="form-control" placeholder="#rrbbgg"/>
+          <button wicket:id="addColoringRule" class="btn btn-sm btn-primary">
             <i class="fas fa-plus" aria-hidden="true"></i>
           </button>
-        </span>
+        </div>
       </div>
       <div class="flex-v-container flex-gutter">
         <div wicket:id="coloringRules" class="flex-h-container flex-gutter flex-only-internal-gutter">
           <div class="flex-content">
-            <span class="badge font-weight-normal font-size-normal" style="font-size: inherit;" wicket:id="pattern"/>
+            <span class="badge fw-normal" style="font-size: inherit;" wicket:id="pattern"/>
           </div>
           <div class="flex-h-container flex-centered" style="white-space:nowrap;">
             <a wicket:id="removeColoringRule" class="btn-sm btn-danger pull-right">

diff --git a/...armstadt/ukp/clarin/webanno/api/annotation/keybindings/KeyBindingsConfigurationPanel.html b/...armstadt/ukp/clarin/webanno/api/annotation/keybindings/KeyBindingsConfigurationPanel.html
@@ -21,12 +21,16 @@
 <wicket:panel>
   <form wicket:id="keyBindingForm">
     <div wicket:id="keyBindingsContainer">
-      <div class="flex-h-container flex-gutter flex-only-internal-gutter flex-centered">
-        <div wicket:id="value" class="flex-content"/>
-        <input wicket:id="keyCombo" class="flex-content form-control" placeholder="Key combo..."/>
-        <button wicket:id="addKeyBinding" class="btn btn-sm btn-primary pull-right">
-          <i class="fas fa-plus" aria-hidden="true"></i>
-        </button>
+      <div class="d-flex flex-wrap">
+        <div wicket:id="value" class="flex-fill"/>
+        <div class="form-row ms-2">
+          <div class="input-group">
+            <input wicket:id="keyCombo" class="form-control" placeholder="Key combo..."/>
+            <button wicket:id="addKeyBinding" class="btn btn-sm btn-primary pull-right">
+              <i class="fas fa-plus" aria-hidden="true"></i>
+            </button>
+          </div>
+        </div>
       </div>
       <div class="flex-v-container flex-gutter">
         <div wicket:id="keyBindings" class="flex-h-container flex-gutter flex-only-internal-gutter">

diff --git a/...ava/de/tudarmstadt/ukp/clarin/webanno/api/annotation/layer/LayerBehaviorRegistryImpl.java b/...ava/de/tudarmstadt/ukp/clarin/webanno/api/annotation/layer/LayerBehaviorRegistryImpl.java
@@ -37,7 +37,7 @@
 /**
  * <p>
  * This class is exposed as a Spring Component via
- * {@code AnnotationServiceAutoConfiguration#layerBehaviorRegistry}.
+ * {@code AnnotationSchemaServiceAutoConfiguration#layerBehaviorRegistry}.
  * </p>
  */
 public class LayerBehaviorRegistryImpl

diff --git a/...adt/ukp/clarin/webanno/api/annotation/preferences/AnnotationPreferencesDialogContent.html b/...adt/ukp/clarin/webanno/api/annotation/preferences/AnnotationPreferencesDialogContent.html
@@ -38,9 +38,7 @@
               <div class="col-sm-8">
                 <div class="input-group">
                   <input wicket:id="sidebarSizeLeft" type="number" class="form-control text-end"></input>
-                  <div class="input-group-append">
-                    <span class="input-group-text">%</span>
-                  </div>
+                  <span class="input-group-text">%</span>
                 </div>
               </div>
             </div>
@@ -49,9 +47,7 @@
               <div class="col-sm-8">
                 <div class="input-group">
                   <input wicket:id="sidebarSizeRight" type="number" class="form-control text-end"></input>
-                  <div class="input-group-append">
-                    <span class="input-group-text">%</span>
-                  </div>
+                  <span class="input-group-text">%</span>
                 </div>
               </div>
             </div>
@@ -60,9 +56,7 @@
               <div class="col-sm-8">
                 <div class="input-group">
                   <input wicket:id="fontZoom" type="number" class="form-control text-end"></input>
-                  <div class="input-group-append">
-                    <span class="input-group-text">%</span>
-                  </div>
+                  <span class="input-group-text">%</span>
                 </div>
               </div>
             </div>
@@ -71,9 +65,7 @@
               <div class="col-sm-8">
                 <div class="input-group">
                   <input wicket:id="windowSize" type="number" class="form-control text-end"></input>
-                  <div class="input-group-append">
-                    <span class="input-group-text">rows</span>
-                  </div>
+                  <span class="input-group-text">rows</span>
                 </div>
               </div>
             </div>

diff --git a/inception/inception-api-dao/pom.xml b/inception/inception-api-dao/pom.xml
@@ -41,10 +41,6 @@
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-collections4</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-pool2</artifactId>
@@ -58,10 +54,6 @@
       <groupId>de.tudarmstadt.ukp.inception.app</groupId>
       <artifactId>inception-model</artifactId>
     </dependency>
-    <dependency>
-      <groupId>de.tudarmstadt.ukp.inception.app</groupId>
-      <artifactId>inception-model-export</artifactId>
-    </dependency>
     <dependency>
       <groupId>de.tudarmstadt.ukp.inception.app</groupId>
       <artifactId>inception-api</artifactId>
@@ -70,10 +62,6 @@
       <groupId>de.tudarmstadt.ukp.inception.app</groupId>
       <artifactId>inception-api-annotation</artifactId>
     </dependency>
-    <dependency>
-      <groupId>de.tudarmstadt.ukp.inception.app</groupId>
-      <artifactId>inception-api-formats</artifactId>
-    </dependency>
     <dependency>
       <groupId>de.tudarmstadt.ukp.inception.app</groupId>
       <artifactId>inception-support</artifactId>
@@ -82,10 +70,6 @@
       <groupId>de.tudarmstadt.ukp.inception.app</groupId>
       <artifactId>inception-security</artifactId>
     </dependency>
-    <dependency>
-      <groupId>de.tudarmstadt.ukp.inception.app</groupId>
-      <artifactId>inception-io-webanno-tsv</artifactId>
-    </dependency>
 
     <!-- Spring dependencies -->
 
@@ -143,13 +127,6 @@
       <artifactId>uimafit-core</artifactId>
     </dependency>
 
-    <!-- Jackson dependencies -->
-
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-    </dependency>
-
     <!-- DKPro Core dependencies -->
 
     <dependency>

diff --git a/inception/inception-api-dao/src/main/resources/META-INF/spring.factories b/inception/inception-api-dao/src/main/resources/META-INF/spring.factories
@@ -1,5 +1,4 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 de.tudarmstadt.ukp.clarin.webanno.api.dao.casstorage.config.CasStorageServiceAutoConfiguration,\
 de.tudarmstadt.ukp.clarin.webanno.api.dao.annotationservice.config.AnnotationSchemaServiceAutoConfiguration,\
-de.tudarmstadt.ukp.clarin.webanno.api.dao.documentservice.config.DocumentServiceAutoConfiguration, \
-de.tudarmstadt.ukp.clarin.webanno.api.dao.export.config.ProjectExportServiceAutoConfiguration
+de.tudarmstadt.ukp.clarin.webanno.api.dao.documentservice.config.DocumentServiceAutoConfiguration