Maestro1 log4j updated

.github/workflows/maven.yml

@@ -5,9 +5,8 @@ name: Java CI with Maven
 
 on:
   push:
-    branches: [ 1.x.x-development ]
+
   pull_request:
-    branches: [ 1.x.x-development ]
 
 
 
@@ -18,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-18.04, macos-10.15, windows-2019]
+        os: [ubuntu-20.04, macos-latest, windows-2019]
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK 1.8
@@ -30,18 +29,8 @@ jobs:
     - name: Maven Test
       run: mvn test
     - name: Artifact Name
-      if: runner.os == 'macOS'
-      run: |
-           JARPATH=$(find . -type f -iname 'coe-*-SNAPSHOT-jar-with-dependencies.jar')
-           echo "Found jar path: ${JARPATH}"
-           echo "Setting artifactpath to ${JARPATH}"
-           echo "::set-env name=artifactpath::${JARPATH}"
-           JARNAME=$(basename $JARPATH)
-           echo "Setting artifactname to ${JARNAME}"
-           echo "::set-env name=artifactname::${JARNAME}"
-    - name: Upload artifact
-      uses: actions/upload-artifact@v2
-      if: runner.os == 'macOS'
+      uses: actions/upload-artifact@v3
       with:
-        name: ${{env.artifactname}}
-        path: ${{env.artifactpath}}
+        name: maestro.jar
+        path: orchestration/coe/target/coe-*-SNAPSHOT-jar-with-dependencies.jar
+        retention-days: 5

.gitignore

@@ -102,3 +102,8 @@ orchestration/coe/interpreter.log*
 repository
 orchestration/coe/src/main/resources/coe-protocol/.texlipse
 orchestration/coe/src/main/java/META-INF/MANIFEST.MF
+simulate.json
+initialize.json
+outputs.csv
+.java-version
+orchestration/coe/failed

README.md

@@ -98,3 +98,4 @@ for more see https://github.com/overturetool/overture/wiki/Release-Process
 remember to create github release from the released tag and upload: `target/checkout/orchestration/coe/target/coe-0.0.2-jar-with-dependencies.jar`.
 
 Furthermore, remember to update the download.json file in the development branch of INTO-CPS/github.io
+

orchestration/coe/pom.xml

@@ -10,12 +10,14 @@
 
     <properties>
         <jackson-2-version>2.9.10.3</jackson-2-version>
+        <log4j2.version>2.20.0</log4j2.version>
     </properties>
 
     <groupId>org.into-cps.orchestration</groupId>
     <artifactId>coe</artifactId>
     <name>The orchestration engine</name>
 
+
     <repositories>
         <repository>
             <id>scala-tools.org</id>
@@ -90,6 +92,12 @@
         <dependency>
             <groupId>org.into-cps.fmi</groupId>
             <artifactId>jnifmuapi</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -131,12 +139,6 @@
             <scope>test</scope>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/log4j/apache-log4j-extras -->
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>apache-log4j-extras</artifactId>
-            <version>1.2.17</version>
-        </dependency>
 
 
         <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-csv -->
@@ -175,7 +177,43 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>${log4j2.version}</version> <!-- Use the latest version available -->
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>${log4j2.version}</version> <!-- Use the same version as log4j-api -->
+        </dependency>
 
+        <!-- https://mvnrepository.com/artifact/log4j/apache-log4j-extras -->
+        <!--        <dependency>-->
+        <!--            <groupId>log4j</groupId>-->
+        <!--            <artifactId>apache-log4j-extras</artifactId>-->
+        <!--            <version>1.2.17</version>-->
+        <!--        </dependency>-->
+        <!-- From Log4j 1.x to Log4j 2.x API -->
+        <!-- From Log4j 1.x to SLF4J -->
+
+        <!-- From SLF4J 2.0+ to Log4j 2.x API -->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j2-impl</artifactId>
+            <version>${log4j2.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <version>${log4j2.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>2.0.7</version> <!-- Use the latest version available -->
+        </dependency>
     </dependencies>
 
 

orchestration/coe/src/main/java/org/intocps/orchestration/coe/BasicInitializer.java

@@ -34,17 +34,7 @@
 */
 package org.intocps.orchestration.coe;
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collector;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
 import org.intocps.fmi.*;
-import org.intocps.orchestration.coe.config.ModelConnection;
 import org.intocps.orchestration.coe.config.ModelConnection.ModelInstance;
 import org.intocps.orchestration.coe.config.ModelParameter;
 import org.intocps.orchestration.coe.cosim.base.CoSimInitializer;
@@ -63,11 +53,14 @@
 import org.intocps.orchestration.coe.util.Util;
 import org.jgrapht.DirectedGraph;
 import org.jgrapht.alg.CycleDetector;
-import org.jgrapht.ext.DOTExporter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.xml.xpath.XPathExpressionException;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class BasicInitializer implements CoSimInitializer
 {

orchestration/coe/src/main/java/org/intocps/orchestration/coe/FmuFactory.java

@@ -34,11 +34,6 @@
 */
 package org.intocps.orchestration.coe;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.URI;
-
 import org.apache.commons.io.FileUtils;
 import org.intocps.fmi.FmuInvocationException;
 import org.intocps.fmi.IFmu;
@@ -47,6 +42,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.URI;
+
 public class FmuFactory
 {
 	final static Logger logger = LoggerFactory.getLogger(FmuFactory.class);

orchestration/coe/src/main/java/org/intocps/orchestration/coe/IFmuFactory.java

@@ -34,11 +34,11 @@
 */
 package org.intocps.orchestration.coe;
 
+import org.intocps.fmi.IFmu;
+
 import java.io.File;
 import java.net.URI;
 
-import org.intocps.fmi.IFmu;
-
 public interface IFmuFactory
 {
 	/**

orchestration/coe/src/main/java/org/intocps/orchestration/coe/cosim/BasicFixedStepSizeCalculator.scala

@@ -35,12 +35,9 @@
 package org.intocps.orchestration.coe.cosim
 
 import org.intocps.orchestration.coe.config.ModelConnection
-import org.intocps.orchestration.coe.config.ModelConnection.Variable
-import org.intocps.orchestration.coe.scala.CoeObject
-import org.slf4j.LoggerFactory
-import scala.collection.JavaConverters._
-import org.intocps.orchestration.coe.scala.VariableResolver
 import org.intocps.orchestration.coe.cosim.base.FmiSimulationInstance
+import org.intocps.orchestration.coe.scala.{CoeObject, VariableResolver}
+import org.slf4j.LoggerFactory
 
 class BasicFixedStepSizeCalculator(val size: Double) extends CoSimStepSizeCalculator {
 

orchestration/coe/src/main/java/org/intocps/orchestration/coe/cosim/CoSimStepSizeCalculator.scala

@@ -34,11 +34,9 @@
 */
 package org.intocps.orchestration.coe.cosim
 
-import org.intocps.fmi.IFmiComponent
-import org.intocps.orchestration.coe.scala.CoeObject
 import org.intocps.orchestration.coe.config.ModelConnection
-import org.intocps.orchestration.coe.scala.VariableResolver
 import org.intocps.orchestration.coe.cosim.base.FmiSimulationInstance
+import org.intocps.orchestration.coe.scala.{CoeObject, VariableResolver}
 
 /**
  * Interface that provides features to determine a step size which can be taken

orchestration/coe/src/main/java/org/intocps/orchestration/coe/cosim/ExternalSignalsStepSizeCalculator.scala

@@ -37,8 +37,8 @@ package org.intocps.orchestration.coe.cosim
 
 import org.intocps.orchestration.coe.config.ModelConnection.ModelInstance
 import org.intocps.orchestration.coe.cosim.base.FmiSimulationInstance
-import org.intocps.orchestration.coe.scala.{Coe, VariableResolver}
 import org.intocps.orchestration.coe.scala.CoeObject.{GlobalState, Inputs, Outputs}
+import org.intocps.orchestration.coe.scala.{Coe, VariableResolver}
 
 /**
   * Created by kel on 04/10/2017.

orchestration/coe/src/main/java/org/intocps/orchestration/coe/cosim/VariableStepSizeCalculator.scala

@@ -34,30 +34,19 @@
 */
 package org.intocps.orchestration.coe.cosim
 
-import java.lang
-
-import org.intocps.orchestration.coe.json.InitializationMsgJson
-
-import scala.collection.JavaConverters.mapAsJavaMapConverter
-import scala.collection.JavaConverters.mapAsScalaMapConverter
+import org.intocps.fmi.Fmi2Status
 import org.intocps.orchestration.coe.config.ModelConnection
 import org.intocps.orchestration.coe.config.ModelConnection.Variable
-import org.intocps.orchestration.coe.scala.CoeObject
+import org.intocps.orchestration.coe.cosim.base.FmiSimulationInstance
+import org.intocps.orchestration.coe.cosim.varstep.{StepsizeCalculator, StepsizeInterval}
+import org.intocps.orchestration.coe.json.InitializationMsgJson
+import org.intocps.orchestration.coe.json.InitializationMsgJson.Constraint
+import org.intocps.orchestration.coe.scala.CoeObject.FmiInstanceConfigScalaWrapper
+import org.intocps.orchestration.coe.scala.{CoeObject, VariableResolver}
 import org.slf4j.LoggerFactory
-import org.intocps.orchestration.coe.cosim.varstep.StepsizeCalculator
-import InitializationMsgJson.Constraint
-import org.intocps.orchestration.coe.cosim.varstep.StepsizeInterval
-import org.intocps.orchestration.coe.scala.VariableResolver
 
 import scala.collection.JavaConversions._
-import org.intocps.orchestration.coe.scala.CoeObject.FmiInstanceConfigScalaWrapper
-import org.intocps.orchestration.coe.cosim.varstep.StepsizeCalculator
-import org.intocps.orchestration.coe.cosim.base.FmiSimulationInstance
-import org.intocps.orchestration.coe.cosim.varstep.StepsizeCalculator
-import InitializationMsgJson.Constraint
-import org.intocps.fmi.Fmi2Status
-
-import scala.collection.immutable
+import scala.collection.JavaConverters.mapAsJavaMapConverter
 
 class VariableStepSizeCalculator(constraints: java.util.Set[Constraint],
                                  val stepsizeInterval: StepsizeInterval,

orchestration/coe/src/main/java/org/intocps/orchestration/coe/cosim/base/CoSimInitializer.java

@@ -34,15 +34,15 @@
 */
 package org.intocps.orchestration.coe.cosim.base;
 
-import java.util.List;
-import java.util.Map;
-
 import org.intocps.fmi.FmuInvocationException;
 import org.intocps.orchestration.coe.AbortSimulationException;
-import org.intocps.orchestration.coe.config.*;
 import org.intocps.orchestration.coe.config.ModelConnection.ModelInstance;
+import org.intocps.orchestration.coe.config.ModelParameter;
 import org.intocps.orchestration.coe.modeldefinition.ModelDescription.ScalarVariable;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * initializer interface responsible for initializing all components.</br> Methods on this interface will be called in
  * the FMI initialization state

orchestration/coe/src/main/java/org/intocps/orchestration/coe/cosim/base/CoSimMasterAlgorithm.java

@@ -34,10 +34,10 @@
 */
 package org.intocps.orchestration.coe.cosim.base;
 
-import java.util.Set;
-
 import org.intocps.fmi.IFmiComponent;
 
+import java.util.Set;
+
 /**
  * The master algorithm on the COE that is responsible for calling
  * {@link CoSimInitializer} looping over {@link CoSimStepSizeCalculator}