Revert "Revert "Merge branch 'develop' into wg-update-web-modeler""

This reverts commit 7356fb9.

.github/workflows/camunda.yml

@@ -33,10 +33,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: maven
 
@@ -163,10 +163,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: maven
 

.github/workflows/ldap.yml

@@ -33,10 +33,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: maven
 

README.md

@@ -17,6 +17,12 @@ See the [wiki](https://github.com/NASA-AMMOS/common-workflow-service/wiki) for m
 
 ## Prerequisites
 
+- [**Java 17 JDK**](https://formulae.brew.sh/formula/openjdk@17): CWS only runs on JDK 17. (NOTE: Cannot use JRE)
+  - For Homebrew users:
+    - Install OpenJDK 17 using: `brew install openjdk@17`
+    - Check the exact version installed using `/usr/libexec/java_home -V`
+    - Add to your Shell startup (e.g. .zprofile): `export JAVA_HOME=$(/usr/libexec/java_home -v X.X.X)`
+      - Replace the X.X.X version above with the OpenJDK 17 output from the `/usr/libexec/java_home -V` command.
 - [**Maven**](https://maven.apache.org/download.cgi): Used to dynamically download libraries and other required project dependencies.
   - For Home-brew users:
     - Install Maven using: `brew install maven`
@@ -39,15 +45,9 @@ See the [wiki](https://github.com/NASA-AMMOS/common-workflow-service/wiki) for m
     - You will need to add your own truststore file to this path: `install/tomcat_lib/cws_truststore.jks`
     - See: https://tomcat.apache.org/tomcat-9.0-doc/ssl-howto.html
 - **Store Your Keystore Password**: You will need to add your own creds file, which carries the keystore password, to this path: `~/.cws/creds`
-    - Set the permissions for the **~/.cws/** directory and **creds** file as Owner-Only.
-      - **~/.cws/** directory: `chmod 700 ~/.cws/`
-      - **~/.cws/creds** file: `chmod 600 ~/.cws/creds`
-- **Java 11 JDK**: CWS only runs on JDK 11 now, but planning for JDK 17 soon.
-  - For Homebrew users:
-    - Install OpenJDK 11 using: `brew install openjdk@11`
-    - Check the exact version installed using `/usr/libexec/java_home -V`
-    - Add to your Shell startup (e.g. .zprofile): `export JAVA_HOME=$(/usr/libexec/java_home -v X.X.X)`
-      - Replace the X.X.X version above with the OpenJDK 11 output from the `/usr/libexec/java_home -V` command.
+  - Set the permissions for the **~/.cws/** directory and **creds** file as Owner-Only.
+    - **~/.cws/** directory: `chmod 700 ~/.cws/`
+    - **~/.cws/creds** file: `chmod 600 ~/.cws/creds`
 
 
 ### **Development Environment Configuration**

cws-adaptation-engine/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
 		<artifactId>common-workflow-service</artifactId>
-		<version>2.5.0</version><!-- update this each CWS release -->
+		<version>2.6.0-pre.1</version><!-- update this each CWS release -->
 	</parent>
 	<artifactId>cws-adaptation-engine</artifactId>
 

cws-adaptation/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
 		<artifactId>common-workflow-service</artifactId>
-		<version>2.5.0</version><!-- update this each CWS release -->
+		<version>2.6.0-pre.1</version><!-- update this each CWS release -->
 	</parent>
 	<artifactId>cws-adaptation</artifactId>
 

cws-core/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
 		<artifactId>common-workflow-service</artifactId>
-		<version>2.5.0</version><!-- update this each CWS release -->
+		<version>2.6.0-pre.1</version><!-- update this each CWS release -->
 	</parent>
 	<artifactId>cws-core</artifactId>
 

cws-engine-service/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
 		<artifactId>common-workflow-service</artifactId>
-		<version>2.5.0</version><!-- update this each CWS release -->
+		<version>2.6.0-pre.1</version><!-- update this each CWS release -->
 	</parent>
 	<artifactId>cws-engine-service</artifactId>
 
@@ -123,6 +123,19 @@
 			<artifactId>junit</artifactId>
 		</dependency>
 
+		<dependency>
+			 <groupId>org.graalvm.js</groupId>
+			 <artifactId>js</artifactId>
+			 <version>23.0.2</version>
+			<scope>runtime</scope>
+		</dependency>
+		 <dependency>
+		        <groupId>org.graalvm.js</groupId>
+		        <artifactId>js-scriptengine</artifactId>
+		        <version>23.0.2</version>
+			<scope>runtime</scope>
+		</dependency>
+
 		<!--  IS THIS NEEDED?? -->
 		<dependency>
 			<groupId>org.apache.tomcat</groupId>

cws-engine-service/src/main/java/jpl/cws/engine/WorkerService.java

@@ -902,7 +902,8 @@ public boolean syncCounters(String reason) {
 	public void setJobExecutorMaxPoolSize(Integer executorServiceMaxPoolSize, boolean doDbUpdate) {
 		if (executorServiceMaxPoolSize != null) {
 			try {
-
+				// we are getting errors if we go beyond 10?
+				executorServiceMaxPoolSize = Math.min(10, executorServiceMaxPoolSize);
 				// Log information about JMX remote interface
 				if (System.getProperty("com.sun.management.jmxremote") == null) {
 					log.warn("JMX remote appears to be disabled");

cws-engine/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
 		<artifactId>common-workflow-service</artifactId>
-		<version>2.5.0</version><!-- update this each CWS release -->
+		<version>2.6.0-pre.1</version><!-- update this each CWS release -->
 	</parent>
 	<artifactId>cws-engine</artifactId>
 
@@ -24,6 +24,18 @@
 					<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
 					<artifactId>cws-adaptation-engine</artifactId>
 				</dependency>
+				<dependency>
+				        <groupId>org.graalvm.js</groupId>
+				        <artifactId>js</artifactId>
+				        <version>23.0.2</version>
+					<scope>runtime</scope>
+				</dependency>
+		        	<dependency>
+			        	<groupId>org.graalvm.js</groupId>
+			        	<artifactId>js-scriptengine</artifactId>
+			        	<version>23.0.2</version>
+					<scope>runtime</scope>
+		      		</dependency>
 			</dependencies>
 		</profile>
 	</profiles>

cws-installer/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
 		<artifactId>common-workflow-service</artifactId>
-		<version>2.5.0</version><!-- update this each CWS release -->
+		<version>2.6.0-pre.1</version><!-- update this each CWS release -->
 	</parent>
 	<artifactId>cws-installer</artifactId>
 

cws-installer/src/main/java/jpl/cws/task/CwsInstaller.java

@@ -2504,9 +2504,6 @@ private static int validateKeystoreTruststore() {
 					print("               Days Until expiration: " + numDays + " days");
 					print("");
 					return 0;
-				} else {
-					print("   [OK]");
-					print("");
 				}
 			}
 		} catch (Exception e) {
@@ -2517,7 +2514,9 @@ private static int validateKeystoreTruststore() {
 			log.error("Keystore Storepass ERROR: " + e.getMessage());
 			return 1;
 		}
-		return 0; // OK
+		print("   [OK]");
+		print("");
+		return 0; // no warnings
 	}
 
 	/**

cws-service/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
 		<artifactId>common-workflow-service</artifactId>
-		<version>2.5.0</version><!-- update this each CWS release -->
+		<version>2.6.0-pre.1</version><!-- update this each CWS release -->
 	</parent>
 	<artifactId>cws-service</artifactId>
 

cws-service/src/main/java/jpl/cws/scheduler/Scheduler.java

@@ -3,9 +3,7 @@
 import static jpl.cws.core.db.SchedulerDbService.FAILED_TO_SCHEDULE;
 import static jpl.cws.core.db.SchedulerDbService.PENDING;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
+import java.io.*;
 import java.net.URLDecoder;
 import java.sql.Timestamp;
 import java.util.HashMap;
@@ -129,8 +127,8 @@ public SchedulerJob scheduleProcess(String procDefKey,
 			String procBusinessKey, String initiationKey,
 			int priority) throws Exception {
 
-		log.trace("Scheduling process definition '" + procDefKey + "' ...");
-		log.trace("  with variables=" + processVariables);
+		log.info("Scheduling process definition '" + procDefKey + "' ...");
+		log.info("  with variables=" + processVariables);
 
 		String schedulerJobUuid = null;
 		boolean rowCreated = false;

cws-tasks/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
 		<artifactId>common-workflow-service</artifactId>
-		<version>2.5.0</version><!-- update this each CWS release -->
+		<version>2.6.0-pre.1</version><!-- update this each CWS release -->
 	</parent>
 	<artifactId>cws-tasks</artifactId>
 

cws-test/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
 		<artifactId>common-workflow-service</artifactId>
-		<version>2.5.0</version><!-- update this each CWS release -->
+		<version>2.6.0-pre.1</version><!-- update this each CWS release -->
 	</parent>
 	<artifactId>cws-test</artifactId>
 

cws-test/src/test/resources/configure_with_jacoco.sh

@@ -48,13 +48,13 @@ else
 	exit 1
 fi
 
-if [[ "$java_version" > "11" && "$java_version" < "12" ]]; then
-	echo "  Java version == 11x      [OK]"
+if [[ "$java_version" > "17" && "$java_version" < "18" ]]; then
+	echo "  Java version == 17x      [OK]"
 else
 	echo " +-------+----------------------------------------------------"
 	echo " | ERROR |                                                    "
 	echo " +-------+                                                    "
-	echo " | Java version is less than 11.  Must run with Java 11x    "
+	echo " | Java version is not 17.  Must run with Java 17x    "
 	echo " | Aborting program...                                        "
 	echo "--------------------------------------------------------------"
 	exit 1
@@ -264,7 +264,7 @@ rm -f ${ROOT}/config/my.cnf
 sleep 1
 
 if [ "$RECONFIGURE" = true ]; then
-	${JAVA_HOME}/bin/java -classpath "./installer/*" -javaagent:./server/apache-tomcat-${TOMCAT_VER}/lib/org.jacoco.agent-0.8.2-runtime.jar=destfile=./installer-jacoco.exec,append=false jpl.cws.task.CwsInstaller --reconfigure
+	${JAVA_HOME}/bin/java -classpath "./installer/*" -javaagent:./server/apache-tomcat-${TOMCAT_VER}/lib/org.jacoco.agent-0.8.7-runtime.jar=destfile=./installer-jacoco.exec,append=false jpl.cws.task.CwsInstaller --reconfigure
 else
-	${JAVA_HOME}/bin/java -classpath "./installer/*" -javaagent:./server/apache-tomcat-${TOMCAT_VER}/lib/org.jacoco.agent-0.8.2-runtime.jar=destfile=./installer-jacoco.exec,append=false jpl.cws.task.CwsInstaller
+	${JAVA_HOME}/bin/java -classpath "./installer/*" -javaagent:./server/apache-tomcat-${TOMCAT_VER}/lib/org.jacoco.agent-0.8.7-runtime.jar=destfile=./installer-jacoco.exec,append=false jpl.cws.task.CwsInstaller
 fi

cws-ui/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
 		<artifactId>common-workflow-service</artifactId>
-		<version>2.5.0</version><!-- update this each CWS release -->
+		<version>2.6.0-pre.1</version><!-- update this each CWS release -->
 	</parent>
 
 	<artifactId>cws-ui</artifactId>

cws-ui/src/main/webapp/WEB-INF/springmvc-servlet.xml

@@ -15,7 +15,9 @@
 
 	<context:property-placeholder location="classpath:cws-ui.properties"/>
 
-	<mvc:annotation-driven />
+    <mvc:annotation-driven>
+        <mvc:path-matching suffix-pattern="true" />
+    </mvc:annotation-driven>
 
 <!--     <bean id="viewResolver"
     	class="org.springframework.web.servlet.view.InternalResourceViewResolver" >

install/docker/console-db-es-ls-kibana/docker-compose.yml

@@ -89,7 +89,7 @@ services:
     labels:
       com.example.service: "cws-server"
       com.example.description: "Common Workflow Service"
-    image: nasa-ammos/common-workflow-service:2.5.0    # update this each CWS release
+    image: nasa-ammos/common-workflow-service:2.6.0-pre.1    # update this each CWS release
     depends_on:
       - db
       - es
@@ -121,7 +121,7 @@ services:
     labels:
       com.example.service: "cws-worker1"
       com.example.description: "Common Workflow Service"
-    image: nasa-ammos/common-workflow-service:2.5.0    # update this each CWS release
+    image: nasa-ammos/common-workflow-service:2.6.0-pre.1    # update this each CWS release
     depends_on:
       - db
       - es

install/docker/cws-image/build.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-ver='2.5.0'    # update this each CWS release
+ver='2.6.0-pre.1'    # update this each CWS release
 
 # Rebuild cws tar-ball
 ROOT=$(pwd)

install/docker/worker-ls/docker-compose.yml

@@ -28,7 +28,7 @@ services:
     labels:
       com.example.service: "cws-worker2"
       com.example.description: "Common Workflow Service"
-    image: nasa-ammos/common-workflow-service:2.5.0    # update this each CWS release
+    image: nasa-ammos/common-workflow-service:2.6.0-pre.1    # update this each CWS release
     #depends_on:
     #  - logstash
     hostname: cws-worker2