Merge pull request 'Release v24.07' (#20) from release_24.07 into master

README.md

@@ -1,45 +1,39 @@
-Goobi workflow Plugin: goobi-plugin-dashboard-entity
-===========================================================================
-
-<img src="https://goobi.io/wp-content/uploads/logo_goobi_plugin.png" align="right" style="margin:0 0 20px 20px;" alt="Plugin for Goobi workflow" width="175" height="109">
-
-This is a dashboard plugin for Goobi workflow to allow indexing of interconnected entities like persons, corporates, awards etc. (aka Artist Dictionary)
-
-This is a plugin for Goobi workflow, the open source workflow tracking software for digitisation projects. More information about Goobi workflow is available under https://goobi.io. If you want to get in touch with the user community simply go to https://community.goobi.io.
-
-
-Plugin details
----------------------------------------------------------------------------
-
-More information about the functionality of this plugin and the complete documentation can be found in the central documentation area at https://docs.goobi.io
-
-Detail                      | Description
---------------------------- | -------------------------------
-**Plugin identifier**       | intranda_dashboard_entity
-**Plugin type**             | Dashboard Plugin
-**Licence**                 | GPL 2.0 or newer
-**Documentation (German)**  | - no documentation available - 
-**Documentation (English)** | - no documentation available -
-
-
-Goobi details
----------------------------------------------------------------------------
-Goobi workflow is an open source web application to manage small and large digitisation projects mostly in cultural heritage institutions all around the world. More information about Goobi can be found here:
-
-Detail              | Description
-------------------- | --------------------------
-**Goobi web site**  | https://www.goobi.io
-**Twitter**         | https://twitter.com/goobi
-**Goobi community** | https://community.goobi.io
-
-
-Development
----------------------------------------------------------------------------
-This plugin was developed by intranda. If you have any issues, feedback, question or if you are looking for more information about Goobi workflow, Goobi viewer and all our other developments that are used in digitisation projects please get in touch with us.  
-
-Contact           | Details
------------------ | ----------------------------------------------------
-**Company name**  | intranda GmbH
-**Address**       | Bertha-von-Suttner-Str. 9, 37085 Göttingen, Germany
-**Web site**      | https://www.intranda.com
-**Twitter**       | https://twitter.com/intranda
+# Goobi workflow Plugin: goobi-plugin-dashboard-entity
+
+<img src="https://goobi.io/wp-content/uploads/logo_goobi_plugin.png" align="right" style="margin:0 0 20px 20px;" alt="Plugin for Goobi workflow" width="175" height="109">
+
+This Dashboard plugin for Goobi workflow allows indexing of interconnected entities like persons, corporates, awards etc. (aka Artist Dictionary)
+
+This is a plugin for Goobi workflow, the open source workflow tracking software for digitisation projects. More information about Goobi workflow is available under https://goobi.io. If you want to get in touch with the user community simply go to https://community.goobi.io.
+
+## Plugin details
+
+More information about the functionality of this plugin and the complete documentation can be found in the central documentation area at https://docs.goobi.io
+
+Detail                      | Description
+--------------------------- | ----------------------
+**Plugin identifier**       | -
+**Plugin type**             | dashboard
+**Licence**                 | GPL 2.0 or newer
+**Documentation (German)**  | This plugin is not yet documented.
+**Documentation (English)** | This plugin is not yet documented.
+
+## Goobi details
+
+Goobi workflow is an open source web application to manage small and large digitisation projects mostly in cultural heritage institutions all around the world. More information about Goobi can be found here:
+
+Detail                      | Description
+--------------------------- | ---------------------------
+**Goobi web site**          | https://www.goobi.io
+**Goobi community**         | https://community.goobi.io
+**Goobi documentation**     | https://docs.goobi.io
+
+## Development
+
+This plugin was developed by intranda. If you have any issues, feedback, question or if you are looking for more information about Goobi workflow, Goobi viewer and all our other developments that are used in digitisation projects please get in touch with us.  
+
+Contact                     | Details
+--------------------------- | ----------------------------------------------------
+**Company name**            | intranda GmbH
+**Address**                 | Bertha-von-Suttner-Str. 9, 37085 Göttingen, Germany
+**Web site**                | https://www.intranda.com

module-base/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.goobi.workflow.plugin</groupId>
     <artifactId>plugin-dashboard-entity</artifactId>
-    <version>24.06</version>
+    <version>24.07</version>
   </parent>
   <artifactId>plugin-dashboard-entity-base</artifactId>
   <packaging>jar</packaging>
@@ -19,4 +19,4 @@
             <version>2.3.9</version>
         </dependency>
   </dependencies>
-</project>
+</project>

module-gui/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.goobi.workflow.plugin</groupId>
     <artifactId>plugin-dashboard-entity</artifactId>
-    <version>24.06</version>
+    <version>24.07</version>
   </parent>
   <artifactId>plugin-dashboard-entity-gui</artifactId>
   <packaging>jar</packaging>
@@ -15,4 +15,4 @@
       </resource>
     </resources>
   </build>
-</project>
+</project>

module-lib/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.goobi.workflow.plugin</groupId>
     <artifactId>plugin-dashboard-entity</artifactId>
-    <version>24.06</version>
+    <version>24.07</version>
   </parent>
   <artifactId>plugin-dashboard-entity-lib</artifactId>
   <packaging>jar</packaging>
@@ -14,4 +14,4 @@
       <version>${project.version}</version>
     </dependency>
   </dependencies>
-</project>
+</project>

module-lib/src/main/java/de/intranda/beans/EntityDatabaseBean.java

@@ -1,21 +1,21 @@
 package de.intranda.beans;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
-
-import org.apache.commons.configuration.XMLConfiguration;
-import org.apache.commons.configuration.tree.xpath.XPathExpressionEngine;
-import org.apache.commons.lang.StringUtils;
-
 import de.intranda.goobi.plugins.model.EntityConfig;
 import de.intranda.goobi.plugins.model.EntityType;
 import de.sub.goobi.config.ConfigPlugins;
+import de.sub.goobi.helper.Helper;
 import de.sub.goobi.persistence.managers.ProcessManager;
 import lombok.Getter;
+import org.apache.commons.configuration.XMLConfiguration;
+import org.apache.commons.configuration.tree.xpath.XPathExpressionEngine;
+import org.apache.commons.lang.StringUtils;
+
+import javax.enterprise.context.SessionScoped;
+import javax.inject.Named;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 @Named
 @SessionScoped
@@ -35,12 +35,16 @@ private void loadConfiguration() {
     }
 
     public List<EntityType> getAllEntityTypes() {
-
-        if (configuration == null) {
-            loadConfiguration();
+        try {
+            if (configuration == null) {
+                loadConfiguration();
+            }
+
+            return configuration.getAllTypes();
+        } catch (RuntimeException e) {
+            Helper.setFehlerMeldung(e.getMessage());
+            return Collections.emptyList();
         }
-
-        return configuration.getAllTypes();
     }
 
     public List<RowEntry> getEntityData(EntityType type) {

pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.goobi.workflow</groupId>
     <artifactId>workflow-base</artifactId>
-    <version>24.06</version>
+    <version>24.07</version>
     <relativePath />
   </parent>
   <groupId>io.goobi.workflow.plugin</groupId>
@@ -28,4 +28,4 @@
       <classifier>classes</classifier>
     </dependency>
   </dependencies>
-</project>
+</project>