Merge remote-tracking branch 'origin/master' into v1.0.0

dariol83 · Jul 14, 2024 · 64c41a5 · 64c41a5
2 parents 4cc49ae + fc4af72
commit 64c41a5
Show file tree

Hide file tree

Showing 40 changed files with 115 additions and 89 deletions.
diff --git a/README.md b/README.md
@@ -2,13 +2,15 @@
 
 ReatMetric is a well-documented Java-based software infrastructure for the implementation of Monitoring & Control (M&C) systems.
 
-![GitHub Release](https://img.shields.io/github/v/release/dariol83/reatmetric)
+![GitHub Release](https://img.shields.io/github/v/release/dariol83/reatmetric) [<img src="https://img.shields.io/maven-central/v/eu.dariolucia.reatmetric/eu.dariolucia.reatmetric?color=greem&style=flat">](https://search.maven.org/search?q=eu.dariolucia.reatmetric)
 
 ![Displays](docs/images/reatmetric-windows-01.PNG "ReatMetric")
 
 ## Documentation
 The system concepts, design, configuration and usage are described in the [documentation](docs/ReatMetric%20System%20Manual.adoc).
 
+The development of ReatMetric is considered completed and no further updates will be performed.
+
 ## Dependencies
 ReatMetric is based on a very limited set of dependencies:
 - [openJFX](https://openjfx.io): for the graphical user interface of the _ui_ module;
@@ -77,9 +79,6 @@ Example of remoting configuration:
 	    <connector local-name="Test System" remote-name="Test System" host="192.168.2.106" port="19000" />
     </ns1:connectors>
 
-## Roadmap
-The development of ReatMetric is considered completed and no further updates will be performed.
-
 ## Acknowledgements and Credits
 A special mention goes to Theresa Köster from the University of Gießen, who evaluated ReatMetric (among other tools) 
 against the Flying Laptop operational simulator. With her contributions, ideas and suggestions, she helped greatly to 

diff --git a/eu.dariolucia.reatmetric.api/pom.xml b/eu.dariolucia.reatmetric.api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>eu.dariolucia.reatmetric</groupId>
         <artifactId>eu.dariolucia.reatmetric</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.2.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/...etric.api/src/main/java/eu/dariolucia/reatmetric/api/activity/ActivityOccurrenceData.java b/...etric.api/src/main/java/eu/dariolucia/reatmetric/api/activity/ActivityOccurrenceData.java
@@ -258,13 +258,13 @@ public String toString() {
     /**
      * This method derives the aggregated status of the activity occurrence. The status of the activity: can be OK, FAIL,
      * PENDING, UNKNOWN, TIMEOUT (not others).
-     *
-     * OK -> Activity is COMPLETED && no FATAL present && last state in verification or execution state is OK
-     * TIMEOUT -> Activity is COMPLETED && no FATAL present && no verification expression defined && last state is TIMEOUT
-     * FAIL -> Activity is COMPLETED && (FATAL present || last state in verification or execution state is FAIL)
-     * UNKNOWN -> Activity is COMPLETED && no FATAL, FAIL, OK, TIMEOUT present && no execution state reported
-     * PENDING -> Activity is not completed
-     *
+     * <ul>
+     * <li>OK: Activity is COMPLETED AND no FATAL present AND last state in verification or execution state is OK</li>
+     * <li>TIMEOUT: Activity is COMPLETED AND no FATAL present AND no verification expression defined AND last state is TIMEOUT</li>
+     * <li>FAIL: Activity is COMPLETED AND (FATAL present OR last state in verification or execution state is FAIL)</li>
+     * <li>UNKNOWN: Activity is COMPLETED AND no FATAL, FAIL, OK, TIMEOUT present AND no execution state reported</li>
+     * <li>PENDING: Activity is not completed</li>
+     * </ul>
      * @return the aggregated status
      */
     public ActivityReportState aggregateStatus() {

diff --git a/...a.reatmetric.api/src/main/java/eu/dariolucia/reatmetric/api/archive/IDataItemArchive.java b/...a.reatmetric.api/src/main/java/eu/dariolucia/reatmetric/api/archive/IDataItemArchive.java
@@ -62,8 +62,8 @@ public interface IDataItemArchive<T extends AbstractDataItem, K extends Abstract
 
     /**
      * Retrieve data items, between the provided startItem and the provided endTime (included), and matching the provided filter.
-     * The returned list is ordered according to generation time (ascending order if startItem < endTime, descending order
-     * if startItem > endTime).
+     * The returned list is ordered according to generation time (ascending order if startItem less than endTime, descending order
+     * if startItem greater than endTime).
      *
      * @param startTime the start time used as reference for the retrieval
      * @param endTime the end time used as reference for the retrieval
@@ -161,7 +161,7 @@ public interface IDataItemArchive<T extends AbstractDataItem, K extends Abstract
     void remove(K filter) throws ArchiveException;
 
     /**
-     * Delete all entries in the archive strictly following (generationTime > referenceTime) or preceeding (generationTime < referenceTime)
+     * Delete all entries in the archive strictly following (generationTime &gt; referenceTime) or preceeding (generationTime &lt; referenceTime)
      * the provided time.
      *
      * @param referenceTime the reference time

diff --git a/...eatmetric.api/src/main/java/eu/dariolucia/reatmetric/api/scheduler/ISchedulerFactory.java b/...eatmetric.api/src/main/java/eu/dariolucia/reatmetric/api/scheduler/ISchedulerFactory.java
@@ -47,5 +47,5 @@ public interface ISchedulerFactory {
      * @return an implementation of {@link IScheduler} interface
      * @throws SchedulingException in case of problems arising from the construction of the specific {@link IScheduler} object
      */
-   IScheduler buildScheduler(String schedulerConfigurationLocation, IArchive archive, IActivityExecutionService activityExecutor, IEventDataProvisionService eventMonService, IActivityOccurrenceDataProvisionService activityMonService, IParameterDataProvisionService parameterMonService);
+   IScheduler buildScheduler(String schedulerConfigurationLocation, IArchive archive, IActivityExecutionService activityExecutor, IEventDataProvisionService eventMonService, IActivityOccurrenceDataProvisionService activityMonService, IParameterDataProvisionService parameterMonService) throws SchedulingException;
 }
diff --git a/eu.dariolucia.reatmetric.core/pom.xml b/eu.dariolucia.reatmetric.core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>eu.dariolucia.reatmetric</groupId>
         <artifactId>eu.dariolucia.reatmetric</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.2.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/eu.dariolucia.reatmetric.deployment/pom.xml b/eu.dariolucia.reatmetric.deployment/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>eu.dariolucia.reatmetric</groupId>
         <artifactId>eu.dariolucia.reatmetric</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.2.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/eu.dariolucia.reatmetric.driver.automation.base/pom.xml b/eu.dariolucia.reatmetric.driver.automation.base/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>eu.dariolucia.reatmetric</groupId>
         <artifactId>eu.dariolucia.reatmetric</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.2.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/eu.dariolucia.reatmetric.driver.automation.groovy/pom.xml b/eu.dariolucia.reatmetric.driver.automation.groovy/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>eu.dariolucia.reatmetric</groupId>
         <artifactId>eu.dariolucia.reatmetric</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.2.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/eu.dariolucia.reatmetric.driver.automation.js/pom.xml b/eu.dariolucia.reatmetric.driver.automation.js/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>eu.dariolucia.reatmetric</groupId>
         <artifactId>eu.dariolucia.reatmetric</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.2.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/eu.dariolucia.reatmetric.driver.automation.python/pom.xml b/eu.dariolucia.reatmetric.driver.automation.python/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>eu.dariolucia.reatmetric</groupId>
         <artifactId>eu.dariolucia.reatmetric</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.2.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/eu.dariolucia.reatmetric.driver.example.test/Documentation.adoc b/eu.dariolucia.reatmetric.driver.example.test/Documentation.adoc
@@ -25,7 +25,7 @@ required for the deployment.
     <groupId>eu.dariolucia.reatmetric.example</groupId>
     <artifactId>eu.dariolucia.reatmetric.driver.example.test</artifactId>
     <name>REATMETRIC - Example Test</name>
-    <version>1.0.2</version>
+    <version>1.0.2.1</version>
     <description>REATMETRIC Example Test for deployment</description>
 
     <properties>
@@ -68,48 +68,48 @@ required for the deployment.
         <dependency>
             <groupId>eu.dariolucia.reatmetric</groupId>
             <artifactId>eu.dariolucia.reatmetric.api</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2.1</version>
         </dependency>
 	    <dependency>
             <groupId>eu.dariolucia.reatmetric</groupId>
             <artifactId>eu.dariolucia.reatmetric.core</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2.1</version>
         </dependency>
         <dependency>
             <groupId>eu.dariolucia.reatmetric</groupId>
             <artifactId>eu.dariolucia.reatmetric.scheduler</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2.1</version>
         </dependency>
 	    <dependency>
             <groupId>eu.dariolucia.reatmetric</groupId>
             <artifactId>eu.dariolucia.reatmetric.ui</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2.1</version>
         </dependency>
         <dependency>
             <groupId>eu.dariolucia.reatmetric</groupId>
             <artifactId>eu.dariolucia.reatmetric.driver.automation.groovy</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2.1</version>
         </dependency>
         <dependency>
             <groupId>eu.dariolucia.reatmetric</groupId>
             <artifactId>eu.dariolucia.reatmetric.persist</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2.1</version>
         </dependency>
 	    <dependency>
             <groupId>eu.dariolucia.reatmetric</groupId>
             <artifactId>eu.dariolucia.reatmetric.processing</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2.1</version>
         </dependency>
         <dependency>
             <groupId>eu.dariolucia.reatmetric</groupId>
             <artifactId>eu.dariolucia.reatmetric.driver.httpserver</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2.1</version>
         </dependency>
         <!-- The new driver -->
         <dependency>
             <groupId>eu.dariolucia.reatmetric.example</groupId>
             <artifactId>eu.dariolucia.reatmetric.driver.example</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2.1</version>
         </dependency>
     </dependencies>
 </project>

diff --git a/eu.dariolucia.reatmetric.driver.example.test/pom.xml b/eu.dariolucia.reatmetric.driver.example.test/pom.xml
@@ -22,7 +22,7 @@
     <groupId>eu.dariolucia.reatmetric.example</groupId>
     <artifactId>eu.dariolucia.reatmetric.driver.example.test</artifactId>
     <name>REATMETRIC - Example Test</name>
-    <version>1.0.2</version>
+    <version>1.0.2.1</version>
     <description>REATMETRIC Example Test for deployment</description>
 
     <properties>
@@ -65,48 +65,48 @@
         <dependency>
             <groupId>eu.dariolucia.reatmetric</groupId>
             <artifactId>eu.dariolucia.reatmetric.api</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2.1</version>
         </dependency>
 	    <dependency>
             <groupId>eu.dariolucia.reatmetric</groupId>
             <artifactId>eu.dariolucia.reatmetric.core</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2.1</version>
         </dependency>
         <dependency>
             <groupId>eu.dariolucia.reatmetric</groupId>
             <artifactId>eu.dariolucia.reatmetric.scheduler</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2.1</version>
         </dependency>
 	    <dependency>
             <groupId>eu.dariolucia.reatmetric</groupId>
             <artifactId>eu.dariolucia.reatmetric.ui</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2.1</version>
         </dependency>
         <dependency>
             <groupId>eu.dariolucia.reatmetric</groupId>
             <artifactId>eu.dariolucia.reatmetric.driver.automation.groovy</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2.1</version>
         </dependency>
         <dependency>
             <groupId>eu.dariolucia.reatmetric</groupId>
             <artifactId>eu.dariolucia.reatmetric.persist</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2.1</version>
         </dependency>
 	    <dependency>
             <groupId>eu.dariolucia.reatmetric</groupId>
             <artifactId>eu.dariolucia.reatmetric.processing</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2.1</version>
         </dependency>
         <dependency>
             <groupId>eu.dariolucia.reatmetric</groupId>
             <artifactId>eu.dariolucia.reatmetric.driver.httpserver</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2.1</version>
         </dependency>
         <!-- The new driver -->
         <dependency>
             <groupId>eu.dariolucia.reatmetric.example</groupId>
             <artifactId>eu.dariolucia.reatmetric.driver.example</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2.1</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/eu.dariolucia.reatmetric.driver.example/Documentation.adoc b/eu.dariolucia.reatmetric.driver.example/Documentation.adoc
@@ -22,7 +22,7 @@ src/main/java needs to exist. The pom file must contain as a minimum the depende
     <groupId>eu.dariolucia.reatmetric.example</groupId>
     <artifactId>eu.dariolucia.reatmetric.driver.example</artifactId>
     <name>REATMETRIC DRIVER - Example driver</name>
-    <version>1.0.2</version>
+    <version>1.0.2.1</version>
     <description>REATMETRIC driver module for documentation purposes</description>
     <packaging>jar</packaging>
 
@@ -59,17 +59,17 @@ src/main/java needs to exist. The pom file must contain as a minimum the depende
         <dependency>
             <groupId>eu.dariolucia.reatmetric</groupId>
             <artifactId>eu.dariolucia.reatmetric.api</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2.1</version>
         </dependency>
 		<dependency>
             <groupId>eu.dariolucia.reatmetric</groupId>
             <artifactId>eu.dariolucia.reatmetric.core</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2.1</version>
         </dependency>
 		<dependency>
             <groupId>eu.dariolucia.reatmetric</groupId>
             <artifactId>eu.dariolucia.reatmetric.processing</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2.1</version>
         </dependency>
     </dependencies>
 </project>

diff --git a/eu.dariolucia.reatmetric.driver.example/pom.xml b/eu.dariolucia.reatmetric.driver.example/pom.xml
@@ -21,7 +21,7 @@
     <groupId>eu.dariolucia.reatmetric.example</groupId>
     <artifactId>eu.dariolucia.reatmetric.driver.example</artifactId>
     <name>REATMETRIC DRIVER - Example driver</name>
-    <version>1.0.2</version>
+    <version>1.0.2.1</version>
     <description>REATMETRIC driver module for documentation purposes</description>
     <packaging>jar</packaging>
 
@@ -58,17 +58,17 @@
         <dependency>
             <groupId>eu.dariolucia.reatmetric</groupId>
             <artifactId>eu.dariolucia.reatmetric.api</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2.1</version>
         </dependency>
 		<dependency>
             <groupId>eu.dariolucia.reatmetric</groupId>
             <artifactId>eu.dariolucia.reatmetric.core</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2.1</version>
         </dependency>
 		<dependency>
             <groupId>eu.dariolucia.reatmetric</groupId>
             <artifactId>eu.dariolucia.reatmetric.processing</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2.1</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/eu.dariolucia.reatmetric.driver.httpserver/pom.xml b/eu.dariolucia.reatmetric.driver.httpserver/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>eu.dariolucia.reatmetric</groupId>
         <artifactId>eu.dariolucia.reatmetric</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.2.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/eu.dariolucia.reatmetric.driver.remote/pom.xml b/eu.dariolucia.reatmetric.driver.remote/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>eu.dariolucia.reatmetric</groupId>
         <artifactId>eu.dariolucia.reatmetric</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.2.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/eu.dariolucia.reatmetric.driver.serial/pom.xml b/eu.dariolucia.reatmetric.driver.serial/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>eu.dariolucia.reatmetric</groupId>
         <artifactId>eu.dariolucia.reatmetric</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.2.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/eu.dariolucia.reatmetric.driver.snmp.util/pom.xml b/eu.dariolucia.reatmetric.driver.snmp.util/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>eu.dariolucia.reatmetric</groupId>
         <artifactId>eu.dariolucia.reatmetric</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.2.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/eu.dariolucia.reatmetric.driver.snmp/pom.xml b/eu.dariolucia.reatmetric.driver.snmp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>eu.dariolucia.reatmetric</groupId>
         <artifactId>eu.dariolucia.reatmetric</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.2.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/eu.dariolucia.reatmetric.driver.socket/pom.xml b/eu.dariolucia.reatmetric.driver.socket/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>eu.dariolucia.reatmetric</groupId>
         <artifactId>eu.dariolucia.reatmetric</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.2.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/eu.dariolucia.reatmetric.driver.spacecraft.test/pom.xml b/eu.dariolucia.reatmetric.driver.spacecraft.test/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>eu.dariolucia.reatmetric</groupId>
         <artifactId>eu.dariolucia.reatmetric</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.2.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>