From d459886fd5aa67994b0c5920220c01d9c1ef1e8b Mon Sep 17 00:00:00 2001 From: "tobias.franz@dlr.de" Date: Mon, 20 Nov 2023 20:48:25 +0100 Subject: [PATCH 01/10] Update CEF model classes to define serialization --- .../sc/virsat/model/extension/cef/model/Document.java | 10 ++++++---- .../sc/virsat/model/extension/cef/model/Equipment.java | 8 +++++--- .../extension/cef/model/EquipmentMassParameters.java | 8 +++++--- .../model/extension/cef/model/EquipmentParameters.java | 10 ++++++---- .../extension/cef/model/EquipmentPowerParameters.java | 8 +++++--- .../cef/model/EquipmentTemperatureParameters.java | 8 +++++--- .../model/extension/cef/model/ExcelCalculation.java | 10 ++++++---- .../sc/virsat/model/extension/cef/model/Parameter.java | 10 ++++++---- .../model/extension/cef/model/ParameterRange.java | 10 ++++++---- .../sc/virsat/model/extension/cef/model/SubSystem.java | 8 +++++--- .../extension/cef/model/SubSystemMassParameters.java | 8 +++++--- .../extension/cef/model/SubSystemPowerParameters.java | 8 +++++--- .../sc/virsat/model/extension/cef/model/System.java | 8 +++++--- .../extension/cef/model/SystemMassParameters.java | 10 ++++++---- .../virsat/model/extension/cef/model/SystemMode.java | 6 ++++-- .../model/extension/cef/model/SystemOfSystems.java | 8 +++++--- .../model/extension/cef/model/SystemParameters.java | 10 ++++++---- .../extension/cef/model/SystemPowerParameters.java | 10 ++++++---- .../dlr/sc/virsat/model/extension/cef/model/Value.java | 10 ++++++---- 19 files changed, 103 insertions(+), 65 deletions(-) diff --git a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/Document.java b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/Document.java index 1c33b9d8..89f78857 100644 --- a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/Document.java +++ b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/Document.java @@ -13,21 +13,23 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = ADocument.FULL_QUALIFIED_CATEGORY_NAME) /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * Category to describe documents such as specifications * - */ -public class Document extends ADocument { + */ +public class Document extends ADocument { /** * Constructor of Concept Class diff --git a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/Equipment.java b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/Equipment.java index 505bafc2..54596421 100644 --- a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/Equipment.java +++ b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/Equipment.java @@ -14,19 +14,21 @@ // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.structural.StructuralElementInstance; import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; // ***************************************************************** // * Class Declaration // ***************************************************************** /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * - */ + */ +@XmlType(name = AEquipment.FULL_QUALIFIED_STRUCTURAL_ELEMENT_NAME) public class Equipment extends AEquipment { /** diff --git a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/EquipmentMassParameters.java b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/EquipmentMassParameters.java index e2584908..bbdd1472 100644 --- a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/EquipmentMassParameters.java +++ b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/EquipmentMassParameters.java @@ -13,20 +13,22 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = AEquipmentMassParameters.FULL_QUALIFIED_CATEGORY_NAME) /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * - */ + */ public class EquipmentMassParameters extends AEquipmentMassParameters { /** diff --git a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/EquipmentParameters.java b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/EquipmentParameters.java index 94980e9e..d7d99fcc 100644 --- a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/EquipmentParameters.java +++ b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/EquipmentParameters.java @@ -9,24 +9,26 @@ *******************************************************************************/ package de.dlr.sc.virsat.model.extension.cef.model; -import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; +import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = AEquipmentParameters.FULL_QUALIFIED_CATEGORY_NAME) /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * - */ + */ public class EquipmentParameters extends AEquipmentParameters { /** diff --git a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/EquipmentPowerParameters.java b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/EquipmentPowerParameters.java index 303675e4..87bb6124 100644 --- a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/EquipmentPowerParameters.java +++ b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/EquipmentPowerParameters.java @@ -13,20 +13,22 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = AEquipmentPowerParameters.FULL_QUALIFIED_CATEGORY_NAME) /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * - */ + */ public class EquipmentPowerParameters extends AEquipmentPowerParameters { /** diff --git a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/EquipmentTemperatureParameters.java b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/EquipmentTemperatureParameters.java index 83d35568..c58662c3 100644 --- a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/EquipmentTemperatureParameters.java +++ b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/EquipmentTemperatureParameters.java @@ -13,20 +13,22 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = AEquipmentTemperatureParameters.FULL_QUALIFIED_CATEGORY_NAME) /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * - */ + */ public class EquipmentTemperatureParameters extends AEquipmentTemperatureParameters { /** diff --git a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/ExcelCalculation.java b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/ExcelCalculation.java index f832fcbd..71d58aac 100644 --- a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/ExcelCalculation.java +++ b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/ExcelCalculation.java @@ -13,21 +13,23 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = AExcelCalculation.FULL_QUALIFIED_CATEGORY_NAME) /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * - */ -public class ExcelCalculation extends AExcelCalculation { + */ +public class ExcelCalculation extends AExcelCalculation { /** * Constructor of Concept Class diff --git a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/Parameter.java b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/Parameter.java index 3e44ee47..bdd437bf 100644 --- a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/Parameter.java +++ b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/Parameter.java @@ -13,21 +13,23 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = AParameter.FULL_QUALIFIED_CATEGORY_NAME) /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * - */ -public class Parameter extends AParameter { + */ +public class Parameter extends AParameter { /** * Constructor of Concept Class diff --git a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/ParameterRange.java b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/ParameterRange.java index e969f702..8a55b032 100644 --- a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/ParameterRange.java +++ b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/ParameterRange.java @@ -13,21 +13,23 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = AParameterRange.FULL_QUALIFIED_CATEGORY_NAME) /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * - */ -public class ParameterRange extends AParameterRange { + */ +public class ParameterRange extends AParameterRange { /** * Constructor of Concept Class diff --git a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SubSystem.java b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SubSystem.java index 68a289bc..e7484d6c 100644 --- a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SubSystem.java +++ b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SubSystem.java @@ -14,19 +14,21 @@ // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.structural.StructuralElementInstance; import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; // ***************************************************************** // * Class Declaration // ***************************************************************** /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * - */ + */ +@XmlType(name = ASubSystem.FULL_QUALIFIED_STRUCTURAL_ELEMENT_NAME) public class SubSystem extends ASubSystem { /** diff --git a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SubSystemMassParameters.java b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SubSystemMassParameters.java index dd70fbcd..71769075 100644 --- a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SubSystemMassParameters.java +++ b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SubSystemMassParameters.java @@ -13,20 +13,22 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = ASubSystemMassParameters.FULL_QUALIFIED_CATEGORY_NAME) /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * - */ + */ public class SubSystemMassParameters extends ASubSystemMassParameters { /** diff --git a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SubSystemPowerParameters.java b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SubSystemPowerParameters.java index 350b09e0..af8620ba 100644 --- a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SubSystemPowerParameters.java +++ b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SubSystemPowerParameters.java @@ -13,20 +13,22 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = ASubSystemPowerParameters.FULL_QUALIFIED_CATEGORY_NAME) /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * - */ + */ public class SubSystemPowerParameters extends ASubSystemPowerParameters { /** diff --git a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/System.java b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/System.java index f69ff275..dffb2a8c 100644 --- a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/System.java +++ b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/System.java @@ -14,19 +14,21 @@ // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.structural.StructuralElementInstance; import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; // ***************************************************************** // * Class Declaration // ***************************************************************** /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * - */ + */ +@XmlType(name = ASystem.FULL_QUALIFIED_STRUCTURAL_ELEMENT_NAME) public class System extends ASystem { /** diff --git a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SystemMassParameters.java b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SystemMassParameters.java index d10ffa0d..84d8bdd1 100644 --- a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SystemMassParameters.java +++ b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SystemMassParameters.java @@ -13,21 +13,23 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = ASystemMassParameters.FULL_QUALIFIED_CATEGORY_NAME) /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * - */ -public class SystemMassParameters extends ASystemMassParameters { + */ +public class SystemMassParameters extends ASystemMassParameters { /** * Constructor of Concept Class diff --git a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SystemMode.java b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SystemMode.java index 2b13ad01..246bd702 100644 --- a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SystemMode.java +++ b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SystemMode.java @@ -13,16 +13,18 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = ASystemMode.FULL_QUALIFIED_CATEGORY_NAME) /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * diff --git a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SystemOfSystems.java b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SystemOfSystems.java index 41784dbb..895433cf 100644 --- a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SystemOfSystems.java +++ b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SystemOfSystems.java @@ -14,19 +14,21 @@ // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.structural.StructuralElementInstance; import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; // ***************************************************************** // * Class Declaration // ***************************************************************** /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * - */ + */ +@XmlType(name = ASystemOfSystems.FULL_QUALIFIED_STRUCTURAL_ELEMENT_NAME) public class SystemOfSystems extends ASystemOfSystems { /** diff --git a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SystemParameters.java b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SystemParameters.java index 074c619a..50f02e1a 100644 --- a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SystemParameters.java +++ b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SystemParameters.java @@ -13,21 +13,23 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = ASystemParameters.FULL_QUALIFIED_CATEGORY_NAME) /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * - */ -public class SystemParameters extends ASystemParameters { + */ +public class SystemParameters extends ASystemParameters { /** * Constructor of Concept Class diff --git a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SystemPowerParameters.java b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SystemPowerParameters.java index a3d28822..bac3309f 100644 --- a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SystemPowerParameters.java +++ b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/SystemPowerParameters.java @@ -13,21 +13,23 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = ASystemPowerParameters.FULL_QUALIFIED_CATEGORY_NAME) /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * - */ -public class SystemPowerParameters extends ASystemPowerParameters { + */ +public class SystemPowerParameters extends ASystemPowerParameters { /** * Constructor of Concept Class diff --git a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/Value.java b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/Value.java index c903b458..18a861e1 100644 --- a/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/Value.java +++ b/de.dlr.sc.virsat.model.extension.cef/src/de/dlr/sc/virsat/model/extension/cef/model/Value.java @@ -13,6 +13,7 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; import de.dlr.sc.virsat.model.dvlm.categories.propertyinstances.ReferencePropertyInstance; @@ -20,15 +21,16 @@ // * Class Declaration // ***************************************************************** +@XmlType(name = AValue.FULL_QUALIFIED_CATEGORY_NAME) /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * - */ -public class Value extends AValue { + */ +public class Value extends AValue { /** * Constructor of Concept Class From 34bc10a0554313b35282dbaf66887974f9b936fd Mon Sep 17 00:00:00 2001 From: "tobias.franz@dlr.de" Date: Mon, 20 Nov 2023 20:51:50 +0100 Subject: [PATCH 02/10] Create a CEF server product with tycho --- de.dlr.sc.virsat.cef.product/pom.xml | 19 ++ .../virsat_cef_server.product | 212 ++++++++++++++++++ maven/pom.xml | 6 + 3 files changed, 237 insertions(+) create mode 100644 de.dlr.sc.virsat.cef.product/virsat_cef_server.product diff --git a/de.dlr.sc.virsat.cef.product/pom.xml b/de.dlr.sc.virsat.cef.product/pom.xml index 853bad69..04f8196b 100644 --- a/de.dlr.sc.virsat.cef.product/pom.xml +++ b/de.dlr.sc.virsat.cef.product/pom.xml @@ -28,9 +28,12 @@ deploy VirSat4_CEF_Application + VirSat4_CEF_Server ${build.folder.target.bin}/${build.folder.application}/${build.folder.type} ${build.folder.target.bin}/${build.folder.application}/${build.folder.type}/${build.file.win32} ${build.folder.target.bin}/${build.folder.application}/${build.folder.type}/${build.file.linux} + ${build.folder.target.bin}/${build.folder.server}/${build.folder.type}/${build.file.server.win32} + ${build.folder.target.bin}/${build.folder.server}/${build.folder.type}/${build.file.server.linux} @@ -73,6 +76,8 @@ + + @@ -80,6 +85,20 @@ basedir="./target/products/de.dlr.virsat.cef.product/linux/gtk/x86_64" compression="gzip" longfile="gnu" /> + + + + + + + + + + + diff --git a/de.dlr.sc.virsat.cef.product/virsat_cef_server.product b/de.dlr.sc.virsat.cef.product/virsat_cef_server.product new file mode 100644 index 00000000..bf1b2e90 --- /dev/null +++ b/de.dlr.sc.virsat.cef.product/virsat_cef_server.product @@ -0,0 +1,212 @@ + + + + + + + + + + -consoleLog -console + + -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts + + + + + + + + + + + + + + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/maven/pom.xml b/maven/pom.xml index 73493049..29dc5e66 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -62,6 +62,8 @@ development VirSat_CEF_Development_Win32.zip VirSat_CEF_Development_Linux.tar.gz + VirSat_CEF_Server_Development_Win32.zip + VirSat_CEF_Server_Development_Linux.tar.gz @@ -72,6 +74,8 @@ integration/${build.version} VirSat_CEF_Integration_${build.version}_Win32.zip VirSat_CEF_Integration_${build.version}_Linux.tar.gz + VirSat_CEF_Server_Integration_${build.version}_Win32.zip + VirSat_CEF_Server_Integration_${build.version}_Linux.tar.gz @@ -83,6 +87,8 @@ release/${build.version}/${env.GITHUB_SHA} VirSat_CEF_Release_${build.version}_${env.GITHUB_SHA}_Win32.zip VirSat_CEF_Release_${build.version}_${env.GITHUB_SHA}_Linux.tar.gz + VirSat_CEF_Server_Release_${build.version}_${env.GITHUB_SHA}_Win32.zip + VirSat_CEF_Server_Release_${build.version}_${env.GITHUB_SHA}_Linux.tar.gz From 3a1dd20eb3b9d8b31b13b122fa8c4b88269f2b4f Mon Sep 17 00:00:00 2001 From: "tobias.franz@dlr.de" Date: Mon, 20 Nov 2023 20:52:19 +0100 Subject: [PATCH 03/10] Create a maven launch config for local release build with deploy --- ...at CEF Build Release (Deploy Local).launch | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 launch/VirSat CEF Build Release (Deploy Local).launch diff --git a/launch/VirSat CEF Build Release (Deploy Local).launch b/launch/VirSat CEF Build Release (Deploy Local).launch new file mode 100644 index 00000000..e540462e --- /dev/null +++ b/launch/VirSat CEF Build Release (Deploy Local).launch @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + From b0adab777f0d31cbd7ea3c69a9c2013d52feaf3b Mon Sep 17 00:00:00 2001 From: "tobias.franz@dlr.de" Date: Tue, 21 Nov 2023 11:28:41 +0100 Subject: [PATCH 04/10] Add server annotations to cefx concept elements --- .../extension/cefx/model/EquipmentMassParameters.java | 8 +++++--- .../extension/cefx/model/EquipmentParameters.java | 9 +++++---- .../extension/cefx/model/EquipmentPowerParameters.java | 8 +++++--- .../cefx/model/EquipmentTemperatureParameters.java | 8 +++++--- .../model/extension/cefx/model/ExcelCalculation.java | 10 ++++++---- .../virsat/model/extension/cefx/model/Parameter.java | 10 ++++++---- .../model/extension/cefx/model/ParameterRange.java | 10 ++++++---- .../extension/cefx/model/SubSystemMassParameters.java | 8 +++++--- .../extension/cefx/model/SubSystemPowerParameters.java | 8 +++++--- .../extension/cefx/model/SystemMassParameters.java | 10 ++++++---- .../virsat/model/extension/cefx/model/SystemMode.java | 6 ++++-- .../model/extension/cefx/model/SystemParameters.java | 10 ++++++---- .../extension/cefx/model/SystemPowerParameters.java | 10 ++++++---- .../sc/virsat/model/extension/cefx/model/Value.java | 10 ++++++---- 14 files changed, 76 insertions(+), 49 deletions(-) diff --git a/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/EquipmentMassParameters.java b/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/EquipmentMassParameters.java index 2892eb33..80fe9d58 100644 --- a/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/EquipmentMassParameters.java +++ b/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/EquipmentMassParameters.java @@ -13,20 +13,22 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = AEquipmentMassParameters.FULL_QUALIFIED_CATEGORY_NAME) /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * - */ + */ public class EquipmentMassParameters extends AEquipmentMassParameters { /** diff --git a/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/EquipmentParameters.java b/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/EquipmentParameters.java index eec683d4..840a6838 100644 --- a/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/EquipmentParameters.java +++ b/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/EquipmentParameters.java @@ -13,20 +13,22 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = AEquipmentParameters.FULL_QUALIFIED_CATEGORY_NAME) /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * - */ + */ public class EquipmentParameters extends AEquipmentParameters { /** @@ -52,5 +54,4 @@ public EquipmentParameters(Concept concept) { public EquipmentParameters(CategoryAssignment categoryAssignment) { super(categoryAssignment); } - } diff --git a/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/EquipmentPowerParameters.java b/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/EquipmentPowerParameters.java index 337d0aa3..ed19010c 100644 --- a/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/EquipmentPowerParameters.java +++ b/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/EquipmentPowerParameters.java @@ -13,20 +13,22 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = AEquipmentPowerParameters.FULL_QUALIFIED_CATEGORY_NAME) /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * - */ + */ public class EquipmentPowerParameters extends AEquipmentPowerParameters { /** diff --git a/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/EquipmentTemperatureParameters.java b/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/EquipmentTemperatureParameters.java index 6e5e57fd..39c70b97 100644 --- a/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/EquipmentTemperatureParameters.java +++ b/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/EquipmentTemperatureParameters.java @@ -13,20 +13,22 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = AEquipmentTemperatureParameters.FULL_QUALIFIED_CATEGORY_NAME) /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * - */ + */ public class EquipmentTemperatureParameters extends AEquipmentTemperatureParameters { /** diff --git a/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/ExcelCalculation.java b/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/ExcelCalculation.java index 2ebda701..0e098a31 100644 --- a/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/ExcelCalculation.java +++ b/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/ExcelCalculation.java @@ -13,21 +13,23 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = AExcelCalculation.FULL_QUALIFIED_CATEGORY_NAME) /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * - */ -public class ExcelCalculation extends AExcelCalculation { + */ +public class ExcelCalculation extends AExcelCalculation { /** * Constructor of Concept Class diff --git a/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/Parameter.java b/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/Parameter.java index 7238bfc6..1d70f2e1 100644 --- a/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/Parameter.java +++ b/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/Parameter.java @@ -13,21 +13,23 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = AParameter.FULL_QUALIFIED_CATEGORY_NAME) /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * - */ -public class Parameter extends AParameter { + */ +public class Parameter extends AParameter { /** * Constructor of Concept Class diff --git a/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/ParameterRange.java b/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/ParameterRange.java index d72e374a..1d0529e8 100644 --- a/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/ParameterRange.java +++ b/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/ParameterRange.java @@ -13,21 +13,23 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = AParameterRange.FULL_QUALIFIED_CATEGORY_NAME) /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * - */ -public class ParameterRange extends AParameterRange { + */ +public class ParameterRange extends AParameterRange { /** * Constructor of Concept Class diff --git a/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/SubSystemMassParameters.java b/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/SubSystemMassParameters.java index bdb7404f..05716370 100644 --- a/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/SubSystemMassParameters.java +++ b/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/SubSystemMassParameters.java @@ -13,20 +13,22 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = ASubSystemMassParameters.FULL_QUALIFIED_CATEGORY_NAME) /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * - */ + */ public class SubSystemMassParameters extends ASubSystemMassParameters { /** diff --git a/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/SubSystemPowerParameters.java b/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/SubSystemPowerParameters.java index 256e9d85..125b8848 100644 --- a/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/SubSystemPowerParameters.java +++ b/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/SubSystemPowerParameters.java @@ -13,20 +13,22 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = ASubSystemPowerParameters.FULL_QUALIFIED_CATEGORY_NAME) /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * - */ + */ public class SubSystemPowerParameters extends ASubSystemPowerParameters { /** diff --git a/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/SystemMassParameters.java b/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/SystemMassParameters.java index d130ff39..00c69a50 100644 --- a/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/SystemMassParameters.java +++ b/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/SystemMassParameters.java @@ -13,21 +13,23 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = ASystemMassParameters.FULL_QUALIFIED_CATEGORY_NAME) /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * - */ -public class SystemMassParameters extends ASystemMassParameters { + */ +public class SystemMassParameters extends ASystemMassParameters { /** * Constructor of Concept Class diff --git a/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/SystemMode.java b/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/SystemMode.java index 212d1b3d..ad2b00e2 100644 --- a/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/SystemMode.java +++ b/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/SystemMode.java @@ -13,16 +13,18 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = ASystemMode.FULL_QUALIFIED_CATEGORY_NAME) /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * diff --git a/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/SystemParameters.java b/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/SystemParameters.java index 2389b3cc..ffe2263a 100644 --- a/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/SystemParameters.java +++ b/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/SystemParameters.java @@ -13,21 +13,23 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = ASystemParameters.FULL_QUALIFIED_CATEGORY_NAME) /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * - */ -public class SystemParameters extends ASystemParameters { + */ +public class SystemParameters extends ASystemParameters { /** * Constructor of Concept Class diff --git a/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/SystemPowerParameters.java b/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/SystemPowerParameters.java index 3117a2cc..78deeeed 100644 --- a/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/SystemPowerParameters.java +++ b/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/SystemPowerParameters.java @@ -13,21 +13,23 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = ASystemPowerParameters.FULL_QUALIFIED_CATEGORY_NAME) /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * - */ -public class SystemPowerParameters extends ASystemPowerParameters { + */ +public class SystemPowerParameters extends ASystemPowerParameters { /** * Constructor of Concept Class diff --git a/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/Value.java b/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/Value.java index 86d29718..6543da82 100644 --- a/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/Value.java +++ b/de.dlr.sc.virsat.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/model/Value.java @@ -13,6 +13,7 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; import de.dlr.sc.virsat.model.dvlm.categories.propertyinstances.ReferencePropertyInstance; @@ -20,15 +21,16 @@ // * Class Declaration // ***************************************************************** +@XmlType(name = AValue.FULL_QUALIFIED_CATEGORY_NAME) /** - * Auto Generated Abstract Generator Gap Class + * Auto Generated Class inheriting from Generator Gap Class * - * Don't Manually modify this class + * This class is generated once, do your changes here * * * - */ -public class Value extends AValue { + */ +public class Value extends AValue { /** * Constructor of Concept Class From ed319dcdfb47e03bcadd7938a1ce858faf10ff5b Mon Sep 17 00:00:00 2001 From: "tobias.franz@dlr.de" Date: Tue, 21 Nov 2023 11:31:43 +0100 Subject: [PATCH 05/10] Add server annotations to cef interaerface concept --- .../model/extension/cef/interfaces/model/AInterface.java | 2 ++ .../model/extension/cef/interfaces/model/AInterfaceEnd.java | 3 +++ .../model/extension/cef/interfaces/model/BusInterface.java | 2 ++ .../model/extension/cef/interfaces/model/DataInterfaceEnd.java | 2 ++ .../cef/interfaces/model/DataInterfaceTypeCollection.java | 2 ++ .../extension/cef/interfaces/model/DataInterfaceTypes.java | 2 ++ .../cef/interfaces/model/EquipmentDataParameters.java | 2 ++ .../extension/cef/interfaces/model/PointToPointInterface.java | 2 ++ .../extension/cef/interfaces/model/PowerInterfaceEnd.java | 2 ++ 9 files changed, 19 insertions(+) diff --git a/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/AInterface.java b/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/AInterface.java index 40c541fe..6a5e7433 100644 --- a/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/AInterface.java +++ b/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/AInterface.java @@ -13,12 +13,14 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = AAInterface.FULL_QUALIFIED_CATEGORY_NAME) /** * Auto Generated Class inheriting from Generator Gap Class * diff --git a/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/AInterfaceEnd.java b/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/AInterfaceEnd.java index c637f55f..7b22fe90 100644 --- a/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/AInterfaceEnd.java +++ b/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/AInterfaceEnd.java @@ -9,6 +9,8 @@ *******************************************************************************/ package de.dlr.sc.virsat.model.extension.cef.interfaces.model; +import javax.xml.bind.annotation.XmlType; + import de.dlr.sc.virsat.model.concept.types.structural.IBeanStructuralElementInstance; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** @@ -21,6 +23,7 @@ // * Class Declaration // ***************************************************************** +@XmlType(name = AAInterfaceEnd.FULL_QUALIFIED_CATEGORY_NAME) /** * Auto Generated Class inheriting from Generator Gap Class * diff --git a/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/BusInterface.java b/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/BusInterface.java index d95687e0..4e1a58a7 100644 --- a/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/BusInterface.java +++ b/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/BusInterface.java @@ -13,12 +13,14 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = ABusInterface.FULL_QUALIFIED_CATEGORY_NAME) /** * Auto Generated Class inheriting from Generator Gap Class * diff --git a/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/DataInterfaceEnd.java b/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/DataInterfaceEnd.java index 4c6d6bb6..d05bc9cf 100644 --- a/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/DataInterfaceEnd.java +++ b/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/DataInterfaceEnd.java @@ -13,12 +13,14 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = ADataInterfaceEnd.FULL_QUALIFIED_CATEGORY_NAME) /** * Auto Generated Class inheriting from Generator Gap Class * diff --git a/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/DataInterfaceTypeCollection.java b/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/DataInterfaceTypeCollection.java index a405f127..ce51ca34 100644 --- a/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/DataInterfaceTypeCollection.java +++ b/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/DataInterfaceTypeCollection.java @@ -14,6 +14,7 @@ // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.structural.StructuralElementInstance; import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; // ***************************************************************** // * Class Declaration @@ -27,6 +28,7 @@ * * */ +@XmlType(name = ADataInterfaceTypeCollection.FULL_QUALIFIED_STRUCTURAL_ELEMENT_NAME) public class DataInterfaceTypeCollection extends ADataInterfaceTypeCollection { /** diff --git a/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/DataInterfaceTypes.java b/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/DataInterfaceTypes.java index 9edf45b8..a008245e 100644 --- a/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/DataInterfaceTypes.java +++ b/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/DataInterfaceTypes.java @@ -13,12 +13,14 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = ADataInterfaceTypes.FULL_QUALIFIED_CATEGORY_NAME) /** * Auto Generated Class inheriting from Generator Gap Class * diff --git a/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/EquipmentDataParameters.java b/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/EquipmentDataParameters.java index ad675e5e..116d8df2 100644 --- a/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/EquipmentDataParameters.java +++ b/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/EquipmentDataParameters.java @@ -13,12 +13,14 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = AEquipmentDataParameters.FULL_QUALIFIED_CATEGORY_NAME) /** * Auto Generated Class inheriting from Generator Gap Class * diff --git a/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/PointToPointInterface.java b/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/PointToPointInterface.java index 0e2c5a86..ba125174 100644 --- a/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/PointToPointInterface.java +++ b/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/PointToPointInterface.java @@ -13,12 +13,14 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = APointToPointInterface.FULL_QUALIFIED_CATEGORY_NAME) /** * Auto Generated Class inheriting from Generator Gap Class * diff --git a/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/PowerInterfaceEnd.java b/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/PowerInterfaceEnd.java index 9880ef62..bba3855b 100644 --- a/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/PowerInterfaceEnd.java +++ b/de.dlr.sc.virsat.model.extension.cef.interfaces/src/de/dlr/sc/virsat/model/extension/cef/interfaces/model/PowerInterfaceEnd.java @@ -13,12 +13,14 @@ // * Import Statements // ***************************************************************** import de.dlr.sc.virsat.model.dvlm.concepts.Concept; +import javax.xml.bind.annotation.XmlType; import de.dlr.sc.virsat.model.dvlm.categories.CategoryAssignment; // ***************************************************************** // * Class Declaration // ***************************************************************** +@XmlType(name = APowerInterfaceEnd.FULL_QUALIFIED_CATEGORY_NAME) /** * Auto Generated Class inheriting from Generator Gap Class * From 0eec00eb8e1f60303c491a0f238c5d3a13aa13c8 Mon Sep 17 00:00:00 2001 From: "tobias.franz@dlr.de" Date: Tue, 21 Nov 2023 15:56:11 +0100 Subject: [PATCH 06/10] Update mailmap --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index d0aa79ed..675504ce 100644 --- a/.mailmap +++ b/.mailmap @@ -4,6 +4,7 @@ andriikovalov-dlr kova_an franzTobiasDLR franzTobiasDLR <49645871+franzTobiasDLR@users.noreply.github.com> franzTobiasDLR Tobias Franz franzTobiasDLR fran_tb +franzTobiasDLR tobias.franz@dlr.de SaMuellerDLR Müller, Sascha ( SC-SRV ) SaMuellerDLR SaMuellerDLR <48356419+SaMuellerDLR@users.noreply.github.com> From 3335ba767509843c8186809f15856aadb8c2807f Mon Sep 17 00:00:00 2001 From: "tobias.franz@dlr.de" Date: Tue, 21 Nov 2023 15:56:31 +0100 Subject: [PATCH 07/10] Add a server launch config --- launch/VirSat CEF Headless Server.launch | 104 +++++++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 launch/VirSat CEF Headless Server.launch diff --git a/launch/VirSat CEF Headless Server.launch b/launch/VirSat CEF Headless Server.launch new file mode 100644 index 00000000..16407c5f --- /dev/null +++ b/launch/VirSat CEF Headless Server.launch @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From f98b6847b643561001fa3ee19264cf6faf84994c Mon Sep 17 00:00:00 2001 From: "tobias.franz@dlr.de" Date: Wed, 22 Nov 2023 17:43:54 +0100 Subject: [PATCH 08/10] Remove absolut path file from launch config --- launch/VirSat CEF Headless Server.launch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launch/VirSat CEF Headless Server.launch b/launch/VirSat CEF Headless Server.launch index 16407c5f..a55d4576 100644 --- a/launch/VirSat CEF Headless Server.launch +++ b/launch/VirSat CEF Headless Server.launch @@ -24,7 +24,7 @@ - + From 2f774c246372b3a92c2e33e24fedab1608f3b2f4 Mon Sep 17 00:00:00 2001 From: "tobias.franz@dlr.de" Date: Mon, 4 Dec 2023 14:39:12 +0100 Subject: [PATCH 09/10] Remove concept project from server prodcut --- de.dlr.sc.virsat.cef.product/virsat_cef_server.product | 2 -- 1 file changed, 2 deletions(-) diff --git a/de.dlr.sc.virsat.cef.product/virsat_cef_server.product b/de.dlr.sc.virsat.cef.product/virsat_cef_server.product index bf1b2e90..64133895 100644 --- a/de.dlr.sc.virsat.cef.product/virsat_cef_server.product +++ b/de.dlr.sc.virsat.cef.product/virsat_cef_server.product @@ -26,7 +26,6 @@ org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 - @@ -138,7 +137,6 @@ - From 3ed28b1d9ba6f62114c15469db11cbd876bab4fa Mon Sep 17 00:00:00 2001 From: "tobias.franz@dlr.de" Date: Mon, 4 Dec 2023 15:35:48 +0100 Subject: [PATCH 10/10] Fix icon path --- de.dlr.sc.virsat.cef.product/virsat_cef_server.product | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de.dlr.sc.virsat.cef.product/virsat_cef_server.product b/de.dlr.sc.virsat.cef.product/virsat_cef_server.product index 64133895..c7a2ff71 100644 --- a/de.dlr.sc.virsat.cef.product/virsat_cef_server.product +++ b/de.dlr.sc.virsat.cef.product/virsat_cef_server.product @@ -17,7 +17,7 @@ - +