Merge pull request #4319 from inception-project/feature/4229-Better-p…

…roject-template-selection #4229 - Better project template selection
inception-project · Nov 22, 2023 · e70064a · e70064a
2 parents b7d928f + 39c02c6
commit e70064a
Show file tree

Hide file tree

Showing 19 changed files with 3,712 additions and 8 deletions.
diff --git a/inception/inception-project-initializers-basic/pom.xml b/inception/inception-project-initializers-basic/pom.xml
@@ -64,6 +64,10 @@
     </dependency>
 
     <!-- Spring dependencies -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>

diff --git a/...java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicProjectInitializer.java b/...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}.
  * </p>
  */
+@Order(1000)
 public class BasicProjectInitializer
     implements QuickProjectInitializer
 {

diff --git a/...resources/de/tudarmstadt/ukp/inception/project/initializers/basic/thumbnail.svg b/...resources/de/tudarmstadt/ukp/inception/project/initializers/basic/thumbnail.svg
diff --git a/inception/inception-project-initializers-doclabeling/pom.xml b/inception/inception-project-initializers-doclabeling/pom.xml
@@ -63,6 +63,10 @@
     </dependency>
 
     <!-- Spring dependencies -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>

diff --git a/...p/inception/project/initializers/doclabeling/BasicDocumentLabelingProjectInitializer.java b/...p/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}.
  * </p>
  */
+@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
@@ -59,6 +59,10 @@
     </dependency>
 
     <!-- Spring dependencies -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>

diff --git a/...p/inception/project/initializers/sentencelabeling/SentenceLabelingProjectInitializer.java b/...p/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}.
  * </p>
  */
+@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
@@ -15,7 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>de.tudarmstadt.ukp.inception.app</groupId>
@@ -38,9 +40,19 @@
       <artifactId>inception-project-initializers</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
     </dependency>
+
+    <dependency>
+      <groupId>org.apache.wicket</groupId>
+      <artifactId>wicket-core</artifactId>
+    </dependency>
+
   </dependencies>
 </project>
diff --git a/...mstadt/ukp/inception/project/initializers/ud/UniversalDependenciesProjectInitializer.java b/...mstadt/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}.
  * </p>
  */
+@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<ResourceReference> getThumbnail()
+    {
+        return Optional.of(THUMBNAIL);
+    }
+
     @Override
     public boolean alreadyApplied(Project aProject)
     {