Merged in DSC-725-orchestrator-addon (pull request DSpace#1930)

DSC-725 orchestrator addon Approved-by: Andrea Bollini
4Science · Mar 26, 2024 · 872e4fd · 872e4fd
2 parents f4ca922 + 424cba7
commit 872e4fd
Show file tree

Hide file tree

Showing 5 changed files with 81 additions and 1 deletion.
diff --git a/dspace-api/src/main/java/org/dspace/scripts/DSpaceRunnable.java b/dspace-api/src/main/java/org/dspace/scripts/DSpaceRunnable.java
@@ -64,6 +64,10 @@ private void setHandler(DSpaceRunnableHandler dSpaceRunnableHandler) {
         this.handler = dSpaceRunnableHandler;
     }
 
+    public DSpaceRunnableHandler getHandler() {
+        return this.handler;
+    }
+
     /**
      * This method sets the appropriate DSpaceRunnableHandler depending on where it was ran from and it parses
      * the arguments given to the script

diff --git a/dspace-server-webapp/pom.xml b/dspace-server-webapp/pom.xml
@@ -367,6 +367,26 @@
                 </dependency>
 			</dependencies>
 		</profile>
+
+        <!-- Builds Orchestrator addon for DSpace -->
+        <profile>
+            <id>addon-orchestrator</id>
+            <activation>
+                <property>
+                    <name>orchestrator.on</name>
+                </property>
+            </activation>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>it.4science.dspace</groupId>
+                        <artifactId>addon-orchestrator</artifactId>
+                        <version>${addon-orchestrator.version}</version>
+                        <type>jar</type>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
     </profiles>
 
 

diff --git a/...app/src/main/java/org/dspace/app/rest/scripts/handler/impl/RestDSpaceRunnableHandler.java b/...app/src/main/java/org/dspace/app/rest/scripts/handler/impl/RestDSpaceRunnableHandler.java
@@ -44,6 +44,8 @@
 import org.dspace.scripts.factory.ScriptServiceFactory;
 import org.dspace.scripts.handler.DSpaceRunnableHandler;
 import org.dspace.scripts.service.ProcessService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.utils.DSpace;
 import org.springframework.core.task.TaskExecutor;
 
@@ -54,6 +56,7 @@ public class RestDSpaceRunnableHandler implements DSpaceRunnableHandler {
     private static final Logger log = org.apache.logging.log4j.LogManager
         .getLogger(RestDSpaceRunnableHandler.class);
 
+    private ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
     private BitstreamService bitstreamService = ContentServiceFactory.getInstance().getBitstreamService();
     private ProcessService processService = ScriptServiceFactory.getInstance().getProcessService();
     private EPersonService ePersonService = EPersonServiceFactory.getInstance().getEPersonService();
@@ -298,8 +301,10 @@ public Process getProcess(Context context) {
      * @param script    The script to be ran
      */
     public void schedule(DSpaceRunnable script) {
+        String taskExecutorBeanName = configurationService.getProperty("dspace.task.executor",
+                                                                  "dspaceRunnableThreadExecutor");
         TaskExecutor taskExecutor = new DSpace().getServiceManager()
-                                                .getServiceByName("dspaceRunnableThreadExecutor", TaskExecutor.class);
+                                                .getServiceByName(taskExecutorBeanName, TaskExecutor.class);
         Context context = new Context();
         try {
             Process process = processService.find(context, processId);
@@ -360,4 +365,17 @@ public List<UUID> getSpecialGroups() {
     public Locale getLocale() {
         return this.locale;
     }
+
+    public Integer getProcessId() {
+        return processId;
+    }
+
+    public String getScriptName() {
+        return scriptName;
+    }
+
+    public UUID getePersonId() {
+        return ePersonId;
+    }
+
 }
diff --git a/dspace/modules/additions/pom.xml b/dspace/modules/additions/pom.xml
@@ -283,6 +283,25 @@
          </dependencies>
       </profile>
 
+      <!-- Builds Orchestrator addon for DSpace -->
+      <profile>
+         <id>addon-orchestrator</id>
+         <activation>
+            <property>
+               <name>orchestrator.on</name>
+            </property>
+         </activation>
+         <dependencyManagement>
+            <dependencies>
+               <dependency>
+                  <groupId>it.4science.dspace</groupId>
+                  <artifactId>addon-orchestrator</artifactId>
+                  <version>${addon-orchestrator.version}</version>
+                  <type>jar</type>
+               </dependency>
+            </dependencies>
+         </dependencyManagement>
+      </profile>
    </profiles>
 
    <!--

diff --git a/pom.xml b/pom.xml
@@ -66,6 +66,7 @@
         <addon-docviewer.version>[CRIS-7.0-SNAPSHOT,CRIS-8.0-SNAPSHOT)</addon-docviewer.version>
         <addon-analytics.version>[CRIS-7.0-SNAPSHOT,CRIS-8.0-SNAPSHOT)</addon-analytics.version>
         <addon-dataquality.version>[CRIS-2023.02-SNAPSHOT,CRIS-2023.03-SNAPSHOT)</addon-dataquality.version>
+        <addon-orchestrator.version>[CRIS-2023.02-SNAPSHOT,CRIS-2023.03-SNAPSHOT)</addon-orchestrator.version>
 
         <!--=== MAVEN SETTINGS ===-->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -960,6 +961,24 @@
             </dependencyManagement>
         </profile>
 
+        <!-- Builds Orchestrator addon for DSpace -->
+        <profile>
+            <id>addon-orchestrator</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>it.4science.dspace</groupId>
+                        <artifactId>addon-orchestrator</artifactId>
+                        <version>${addon-orchestrator.version}</version>
+                        <type>jar</type>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
+
        <!-- REST Jersey (Deprecated REST API from DSpace 6.x or below) -->
        <!-- As this module is deprecated, it only builds if you activate it via -Pdspace-rest -->
        <profile>