Merge pull request 'Release v25.05' (#24) from release_25.05 into master

Author: dominickleppich

module-base/pom.xml

@@ -1,10 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
 <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>io.goobi.workflow.plugin</groupId>
     <artifactId>plugin-step-xmp-header</artifactId>
-    <version>25.04</version>
+    <version>25.05</version>
   </parent>
   <artifactId>plugin-step-xmp-header-base</artifactId>
   <packaging>jar</packaging>
-</project>
+</project>

module-base/src/main/java/de/intranda/goobi/plugins/step/xmp/XmpPlugin.java

@@ -15,13 +15,11 @@
 import org.apache.commons.configuration.reloading.FileChangedReloadingStrategy;
 import org.apache.commons.configuration.tree.xpath.XPathExpressionEngine;
 import org.apache.commons.lang.StringUtils;
-import org.goobi.beans.Masterpiece;
-import org.goobi.beans.Masterpieceproperty;
+import org.goobi.beans.GoobiProperty;
 import org.goobi.beans.Process;
 import org.goobi.beans.Processproperty;
 import org.goobi.beans.Step;
-import org.goobi.beans.Template;
-import org.goobi.beans.Templateproperty;
+
 import org.goobi.production.enums.LogType;
 import org.goobi.production.enums.PluginGuiType;
 import org.goobi.production.enums.PluginReturnValue;
@@ -645,12 +643,12 @@ private void getProcessPropertyConfiguration(ImageMetadataField xmpFieldConfigur
         ProcesspropertyField field = (ProcesspropertyField) configuredField;
 
         StringBuilder subValue = new StringBuilder();
-        for (Processproperty prop : process.getEigenschaften()) {
-            if (prop.getTitel().equals(field.getName())) {
+        for (GoobiProperty prop : process.getEigenschaften()) {
+            if (prop.getPropertyName().equals(field.getName())) {
                 if (subValue.length() > 0) {
                     subValue.append(field.getSeparator());
                 }
-                subValue.append(prop.getWert());
+                subValue.append(prop.getPropertyValue());
                 if (field.isUseFirst()) {
                     break;
                 }
@@ -668,56 +666,52 @@ private void getTemplatePropertyConfiguration(ImageMetadataField xmpFieldConfigu
             IMetadataField configuredField) {
         TemplatepropertyField field = (TemplatepropertyField) configuredField;
         StringBuilder subValue = new StringBuilder();
-        if (process.getVorlagen() != null) {
-            for (Template template : process.getVorlagen()) {
-                for (Templateproperty prop : template.getEigenschaften()) {
-                    if (prop.getTitel().equals(field.getName())) {
+
+                for (GoobiProperty prop : process.getEigenschaften()) {
+                    if (prop.getPropertyName().equals(field.getName())) {
                         if (subValue.length() > 0) {
                             subValue.append(field.getSeparator());
                         }
-                        subValue.append(prop.getWert());
+                        subValue.append(prop.getPropertyValue());
                         if (field.isUseFirst()) {
                             break;
                         }
                     }
-
-                }
             }
             if (subValue.length() > 0) {
                 if (completeValue.length() > 0) {
                     completeValue.append(xmpFieldConfiguration.getSeparator());
                 }
                 completeValue.append(subValue.toString());
             }
-        }
+        
     }
 
     private void getWorkpiecePropertyConfiguration(ImageMetadataField xmpFieldConfiguration, StringBuilder completeValue,
             IMetadataField configuredField) {
         WorkpiecepropertyField field = (WorkpiecepropertyField) configuredField;
         StringBuilder subValue = new StringBuilder();
-        if (process.getWerkstuecke() != null) {
-            for (Masterpiece workpiece : process.getWerkstuecke()) {
-                for (Masterpieceproperty prop : workpiece.getEigenschaften()) {
-                    if (prop.getTitel().equals(field.getName())) {
+      
+                for (GoobiProperty prop : process.getEigenschaften()) {
+                    if (prop.getPropertyName().equals(field.getName())) {
                         if (subValue.length() > 0) {
                             subValue.append(field.getSeparator());
                         }
-                        subValue.append(prop.getWert());
+                        subValue.append(prop.getPropertyValue());
                         if (field.isUseFirst()) {
                             break;
                         }
-                    }
+                    
 
-                }
+                    }
             }
             if (subValue.length() > 0) {
                 if (completeValue.length() > 0) {
                     completeValue.append(xmpFieldConfiguration.getSeparator());
                 }
                 completeValue.append(subValue.toString());
             }
-        }
+        
     }
 
     private void getVariableFieldConfiguration(ImageMetadataField xmpFieldConfiguration, StringBuilder completeValue,

pom.xml

@@ -1,10 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
 <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>io.goobi.workflow</groupId>
     <artifactId>workflow-base</artifactId>
-    <version>25.04</version>
-    <relativePath />
+    <version>25.05</version>
+    <relativePath/>
   </parent>
   <groupId>io.goobi.workflow.plugin</groupId>
   <artifactId>plugin-step-xmp-header</artifactId>
@@ -22,8 +23,8 @@
     <dependency>
       <groupId>io.goobi.workflow</groupId>
       <artifactId>workflow-core</artifactId>
-      <version>${project.version}</version>
+      <version>25.05</version>
       <classifier>classes</classifier>
     </dependency>
   </dependencies>
-</project>
+</project>