Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Korb2018-12-03 14:11:48 -0500
committerFelix Korb2018-12-03 14:11:48 -0500
commit2bcb06af2ccdeaf646a09dacaa6901bf8dad2520 (patch)
tree94d610f7cb7f3c235bffd035bd00c8a76178c5fe
parent22100cf5ad09d8adb75054d288dceb60812e10a1 (diff)
downloadorg.eclipse.openk-platform.openk-repo-2bcb06af2ccdeaf646a09dacaa6901bf8dad2520.tar.gz
org.eclipse.openk-platform.openk-repo-2bcb06af2ccdeaf646a09dacaa6901bf8dad2520.tar.xz
org.eclipse.openk-platform.openk-repo-2bcb06af2ccdeaf646a09dacaa6901bf8dad2520.zip
Task references: CICA-711
Reason: set license => EPL 1.0 Rationale: - Side effects: -
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/EismanCimProfile.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/ActivityRecord.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/ElectronicAddress.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/Location.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/PositionPoint.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/StreetAddress.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/StreetDetail.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/TownDetail.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/AcDcTerminal.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/ConductingEquipment.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/ConnectivityNode.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/ConnectivityNodeContainer.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/Equipment.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/EquipmentContainer.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/GeographicalRegion.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/IdentifiedObject.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/OperatingParticipant.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/OperatingShare.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/PowerSystemResource.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/SubGeographicalRegion.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/Substation.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/Terminal.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/VoltageLevel.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/AbsoluteDateTime.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/ActivePower.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/CommunicationType.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/PerCent.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/ReductionSetting.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/UnitMultiplier.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/UnitSymbol.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/Voltage.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/informative/infoperations/PsrEvent.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/informative/infoperations/PsrEventKind.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/marketcommon/RegisteredResource.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/marketoperations/mktdomain/UnitType.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/marketoperations/referencedata/RegisteredGenerator.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/Analog.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/AnalogValue.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/Measurement.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/MeasurementValue.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/MeasurementValueQuality.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/production/GeneratingUnit.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/production/GeneratorControlSource.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/util/BigDecimalDeserializer.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/AcLineSegment.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/BusbarSection.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/Conductor.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/Connector.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/PowerTransformer.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/RegulatingCondEq.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/RotatingMachine.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/Switch.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/SynchronousMachine.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/SynchronousMachineKind.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/CimCacheDataAccess.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/ActivityRecordJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/ElectronicAddressJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/LocationJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/PositionPointJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/StreetAddressJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/StreetDetailJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/TownDetailJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/AcDcTerminalJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/ConductingEquipmentJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/ConnectivityNodeContainerJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/ConnectivityNodeJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/EquipmentContainerJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/EquipmentJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/GeographicalRegionJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/IdentifiedObjectJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/OperatingParticipantJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/OperatingShareJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/PowerSystemResourceJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/SubGeographicalRegionJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/SubstationJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/TerminalJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/VoltageLevelJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/AbsoluteDateTimeJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/ActivePowerJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/CommunicationTypeJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/PerCentJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/ReductionSettingJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/UnitMultiplierJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/UnitSymbolJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/VoltageJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/informative/infoperations/PsrEventJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/informative/infoperations/PsrEventKindJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/marketcommon/RegisteredResourceJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/marketoperations/mktdomain/UnitTypeJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/marketoperations/referencedata/RegisteredGeneratorJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/AnalogJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/AnalogValueJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/MeasurementJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/MeasurementValueJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/MeasurementValueQualityJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/production/GeneratingUnitJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/production/GeneratorControlSourceJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/Boolean2StringConverter.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/RegisteredGenerator2StringConverter.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/Sequence.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/Temporal.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/AcLineSegmentJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/BusbarSectionJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/ConductorJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/ConnectorJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/PowerTransformerJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/RegulatingCondEqJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/RotatingMachineJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/SwitchJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/SynchronousMachineJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/SynchronousMachineKindJpa.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/CimCache.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/DataExchangeDefaults.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/SecureRequestHandlerInterceptor.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/AbstractRestClient.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/client/GeographicalRegionProvider.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/client/JsonFileProvider.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/client/SynchronousMachineProvider.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/controller/SubGeographicalRegionRestController.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/controller/SubstationRestController.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/controller/SynchronousMachineRestController.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/JobController.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/JsonFileJob.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/NetstateJob.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/SynchronousMachineJob.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/TopologyJob.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/util/JobUtils.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/Abstract4Tree.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/SubGeographicalRegion4Tree.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/Substation4Tree.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/SumContainer.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/GeneratingUnitJpaRepository.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/GeographicalRegionJpaRepository.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SequenceJpaRepository.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SubGeographicalRegionJpaRepository.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SubstationJpaRepository.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SynchronousMachineJpaRepository.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/VoltageLevelJpaRepository.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/AbstractJpaService.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/ActivePowerJpaService.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/AnalogJpaService.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/AnalogValueJpaService.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/BaseMapperService.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/EquipmentService.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionJpaService.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionMapperService.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionRestConsumerService.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionValidatorService.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/JsonFileRestConsumerService.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/NetworkTraceService.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SequenceJpaService.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SignumService.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegion4TreeService.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegionJpaService.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegionMapperService.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegionService.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubstationJpaService.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubstationMapperService.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubstationService.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineJpaDiffCheckerService.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineJpaService.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineMapperService.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineRestConsumerService.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineValidatorService.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/TimePeriodPassedService.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/util/TimestampUtil.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/dataexchange/adapter/rest/RestDefaults.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/dataexchange/adapter/rest/controller/AbstractRestController.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/date/DateDefaults.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/date/DateToolkit.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/module/AbstractModule.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/module/IModule.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/string/StringDefaults.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/string/StringToolkit.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/EismanDataAccess.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/ElectronicAddressJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/LocationJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/StreetAddressJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/StreetDetailJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/TownDetailJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/EquipmentContainerJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/EquipmentJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/IdentifiedObjectJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/SubGeographicalRegionJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/SubstationJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/VoltageLevelJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/AbsoluteDateTimeJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/ActivePowerJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/CommunicationTypeJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/PerCentJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/ReductionSettingJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/UnitMultiplierJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/UnitSymbolJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/VoltageJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/informative/infoperations/PsrEventJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/informative/infoperations/PsrEventKindJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/marketoperations/mktdomain/UnitTypeJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/marketoperations/referencedata/RegisteredGeneratorJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/AnalogJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/AnalogValueJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/MeasurementJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/MeasurementValueJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/MeasurementValueQualityJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/AbstractBaseEntityJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/ActivityJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/CharacteristicForActivityStatus.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/CharacteristicForMissingMeasurementJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/PreselectionConfigurationJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/PreselectionJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/UserSettingsJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/production/GeneratingUnitJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/util/Boolean2StringConverter.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/wires/SynchronousMachineJpa.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/EismanDataTransfer.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/networkstate/AbstractNetworkStateNode.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/networkstate/SubGeographicalRegion4Tree.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/networkstate/Substation4Tree.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/ConnectedConnectingEquipments_1_ApplicationXml_Importer.java13
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/EquipmentContainerContent_1_ApplicationXml_Importer.java13
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/SubGeographicalRegions_1_ApplicationXml_Importer.java13
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/TopologicalResources_1_ApplicationXml_Importer.java13
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/AbstractRestImporter.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/SubGeographicalRegionsImporter.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/SubstationsImporter.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/SynchronousMachinesImporter.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/EnergySources_1_Cim17v07_EismanDataTransfer_Mapper.java13
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/GeneratedEntityProvider.java13
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/OidToMridMapper.java13
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/SubGeographicalRegions_1_Cim17v07_EismanDataTransfer_Mapper.java13
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/Substations_1_Cim17v07_EismanDataTransfer_Mapper.java13
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/EISMAN.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/AbstractRestController.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/ActivityRestController.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/DisplayDtoRestController.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/HysteresisController.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/PreselectionRestController.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/ReasonOfReductionRestController.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/ReductionSettingListRestController.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/SubGeographicalRegionRestController.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/SubstationRestController.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/TimerRestContoller.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/exceptionhandler/RestResponseEntityExceptionHandler.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/util/IncludeAttribute4Json.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/util/SubstationToolkit.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/controller/BaseController.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/ActionOverviewDto.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/ActionSettingsDto.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/OverviewDto.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/PointOfInjectionType.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/PreselectionConfigurationDto.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/ProcessOverviewDto.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/SynchronousMachineOverviewDto.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/util/mapper/BigDecimalDeserializer.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/ActivityJpaRepository.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/PreselectionJpaRepository.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/SubGeographicalRegionJpaRepository.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/SubstationJpaRepository.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/SynchronousMachineJpaRepository.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AbstractReductionAdviceCalculatorService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AbstractReductionAdviceService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AbstractService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivePowerJpaService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivityJpaFindService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivityJpaMappingService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivityJpaService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AnalogJpaService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AnalogValueJpaService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/BaseMapperService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/DiscriminationCoefficientService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/DisplayDtoService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/HysteresisService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/IReductionAdvice.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/PreselectionJpaService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReasonOfReductionService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionAdviceAdjustmentService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionAdviceCalculatorService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionAdviceInitialService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionAdviceService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionAdviceUpdateService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionSettingService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubGeographicalRegionJpaService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubGeographicalRegionMapperService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubGeographicalRegionRestConsumerService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubstationJpaService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubstationMapperService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubstationRestConsumerService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SynchronousMachineJpaService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SynchronousMachineMapperService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SynchronousMachineMeasurementService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SynchronousMachineOrderService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SynchronousMachineRestConsumerService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/TimerService.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/util/JpaUtils.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/servlet/interceptor/SecureRequestHandlerInterceptor.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/logic/task/ImportSubGeographicalRegionsForNetworkState_1_Task.java13
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/logic/task/ImportSubstationForNetworkState_1_Task.java13
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/logic/task/parameters/ConnectedConnectingEquipmentsImportParameters.java13
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/logic/task/parameters/EquipmentContainerContentImportParameters.java13
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/logic/task/parameters/TopologicalResourcesImportParameters.java13
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/ISubGeographicalRegionsProvider.java13
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/ISubstationsProvider.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/ISynchronousMachinesProvider.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/SubGeographicalRegionsProvider.java13
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/SubstationsProvider.java12
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/SynchronousMachinesProvider.java12
305 files changed, 2357 insertions, 1655 deletions
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/EismanCimProfile.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/EismanCimProfile.java
index 90a927a1..162ef5dc 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/EismanCimProfile.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/EismanCimProfile.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/ActivityRecord.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/ActivityRecord.java
index c104582a..9754ffbe 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/ActivityRecord.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/ActivityRecord.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.common;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/ElectronicAddress.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/ElectronicAddress.java
index 4df23998..b88d177e 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/ElectronicAddress.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/ElectronicAddress.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.common;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/Location.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/Location.java
index ed0b29b2..34cdc0e2 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/Location.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/Location.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.common;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/PositionPoint.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/PositionPoint.java
index 078e39cd..2230bb13 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/PositionPoint.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/PositionPoint.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.common;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/StreetAddress.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/StreetAddress.java
index dd3cb241..041c4a33 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/StreetAddress.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/StreetAddress.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.common;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/StreetDetail.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/StreetDetail.java
index 701b7c33..0375c12e 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/StreetDetail.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/StreetDetail.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.common;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/TownDetail.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/TownDetail.java
index 39c9384c..3cf2d2ac 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/TownDetail.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/TownDetail.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.common;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/AcDcTerminal.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/AcDcTerminal.java
index c6f1f91a..a1f8ac9e 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/AcDcTerminal.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/AcDcTerminal.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.core;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/ConductingEquipment.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/ConductingEquipment.java
index 64b5d8c1..652c2b95 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/ConductingEquipment.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/ConductingEquipment.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.core;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/ConnectivityNode.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/ConnectivityNode.java
index aa1c16d2..bd7dc1e2 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/ConnectivityNode.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/ConnectivityNode.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.core;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/ConnectivityNodeContainer.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/ConnectivityNodeContainer.java
index 8b4bf73a..690f70b6 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/ConnectivityNodeContainer.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/ConnectivityNodeContainer.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.core;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/Equipment.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/Equipment.java
index 4d22e048..21a9a7f4 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/Equipment.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/Equipment.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.core;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/EquipmentContainer.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/EquipmentContainer.java
index a4b970b3..002c56a6 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/EquipmentContainer.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/EquipmentContainer.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.core;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/GeographicalRegion.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/GeographicalRegion.java
index 96b4a716..90ada5b0 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/GeographicalRegion.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/GeographicalRegion.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.core;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/IdentifiedObject.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/IdentifiedObject.java
index 6053b00a..27d7b3d8 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/IdentifiedObject.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/IdentifiedObject.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.core;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/OperatingParticipant.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/OperatingParticipant.java
index d3966287..70ea1ee3 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/OperatingParticipant.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/OperatingParticipant.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.core;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/OperatingShare.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/OperatingShare.java
index c79a8cd3..a0068c96 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/OperatingShare.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/OperatingShare.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.core;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/PowerSystemResource.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/PowerSystemResource.java
index af4d9672..225828c6 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/PowerSystemResource.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/PowerSystemResource.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.core;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/SubGeographicalRegion.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/SubGeographicalRegion.java
index 593de663..5e443ed7 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/SubGeographicalRegion.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/SubGeographicalRegion.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.core;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/Substation.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/Substation.java
index e1a2c8e4..7632a936 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/Substation.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/Substation.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.core;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/Terminal.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/Terminal.java
index ad79e375..98ced0b1 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/Terminal.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/Terminal.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.core;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/VoltageLevel.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/VoltageLevel.java
index a8d14e15..d6c142da 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/VoltageLevel.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/VoltageLevel.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.core;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/AbsoluteDateTime.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/AbsoluteDateTime.java
index a39cde65..37d78d24 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/AbsoluteDateTime.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/AbsoluteDateTime.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.domain;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/ActivePower.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/ActivePower.java
index 09499481..a9cf283f 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/ActivePower.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/ActivePower.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.domain;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/CommunicationType.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/CommunicationType.java
index 7d40b575..1b75863a 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/CommunicationType.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/CommunicationType.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.domain;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/PerCent.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/PerCent.java
index ab6d9ef0..8a53a447 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/PerCent.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/PerCent.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.domain;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/ReductionSetting.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/ReductionSetting.java
index 97a52319..db280fd6 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/ReductionSetting.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/ReductionSetting.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.domain;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/UnitMultiplier.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/UnitMultiplier.java
index c7264d0d..04dc3220 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/UnitMultiplier.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/UnitMultiplier.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.domain;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/UnitSymbol.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/UnitSymbol.java
index f137b337..b2546799 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/UnitSymbol.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/UnitSymbol.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.domain;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/Voltage.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/Voltage.java
index eecbae58..f07b206d 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/Voltage.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/Voltage.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.domain;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/informative/infoperations/PsrEvent.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/informative/infoperations/PsrEvent.java
index 92e70e72..9a18f073 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/informative/infoperations/PsrEvent.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/informative/infoperations/PsrEvent.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.informative.infoperations;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/informative/infoperations/PsrEventKind.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/informative/infoperations/PsrEventKind.java
index 984dd9f0..618f9465 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/informative/infoperations/PsrEventKind.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/informative/infoperations/PsrEventKind.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.informative.infoperations;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/marketcommon/RegisteredResource.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/marketcommon/RegisteredResource.java
index 7050b6ff..f1bf7a97 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/marketcommon/RegisteredResource.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/marketcommon/RegisteredResource.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.marketcommon;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/marketoperations/mktdomain/UnitType.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/marketoperations/mktdomain/UnitType.java
index 5d7884e2..f83c29ae 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/marketoperations/mktdomain/UnitType.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/marketoperations/mktdomain/UnitType.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.marketoperations.mktdomain;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/marketoperations/referencedata/RegisteredGenerator.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/marketoperations/referencedata/RegisteredGenerator.java
index f491dd2c..94231607 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/marketoperations/referencedata/RegisteredGenerator.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/marketoperations/referencedata/RegisteredGenerator.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.marketoperations.referencedata;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/Analog.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/Analog.java
index 47b13d8a..814b33ca 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/Analog.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/Analog.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.meas;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/AnalogValue.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/AnalogValue.java
index 9ee96f26..31bdffc1 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/AnalogValue.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/AnalogValue.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.meas;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/Measurement.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/Measurement.java
index 747b24d7..659c6e4d 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/Measurement.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/Measurement.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.meas;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/MeasurementValue.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/MeasurementValue.java
index 02f3b706..289e6c8d 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/MeasurementValue.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/MeasurementValue.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.meas;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/MeasurementValueQuality.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/MeasurementValueQuality.java
index 6ac448ad..fcc27e9b 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/MeasurementValueQuality.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/MeasurementValueQuality.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.meas;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/production/GeneratingUnit.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/production/GeneratingUnit.java
index 16e7195d..61cf1ba3 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/production/GeneratingUnit.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/production/GeneratingUnit.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.production;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/production/GeneratorControlSource.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/production/GeneratorControlSource.java
index 06daeeab..6c997aba 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/production/GeneratorControlSource.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/production/GeneratorControlSource.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.production;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/util/BigDecimalDeserializer.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/util/BigDecimalDeserializer.java
index 926320fb..4a27751c 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/util/BigDecimalDeserializer.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/util/BigDecimalDeserializer.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.util;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/AcLineSegment.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/AcLineSegment.java
index 14f27c29..2a656e56 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/AcLineSegment.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/AcLineSegment.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.wires;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/BusbarSection.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/BusbarSection.java
index 24de22b1..f97a1d76 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/BusbarSection.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/BusbarSection.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.wires;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/Conductor.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/Conductor.java
index 95d4aeab..9886fca5 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/Conductor.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/Conductor.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.wires;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/Connector.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/Connector.java
index b192094d..c2118f2a 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/Connector.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/Connector.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.wires;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/PowerTransformer.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/PowerTransformer.java
index 670d36f2..ec240794 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/PowerTransformer.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/PowerTransformer.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.wires;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/RegulatingCondEq.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/RegulatingCondEq.java
index f08c4ec0..6d53389d 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/RegulatingCondEq.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/RegulatingCondEq.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.wires;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/RotatingMachine.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/RotatingMachine.java
index e1b1f709..2b11352d 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/RotatingMachine.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/RotatingMachine.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.wires;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/Switch.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/Switch.java
index d724eb2e..dc0bf8bb 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/Switch.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/Switch.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.wires;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/SynchronousMachine.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/SynchronousMachine.java
index 94ef2e11..c50d4182 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/SynchronousMachine.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/SynchronousMachine.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.wires;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/SynchronousMachineKind.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/SynchronousMachineKind.java
index 142fd0c1..5c4f944f 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/SynchronousMachineKind.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/SynchronousMachineKind.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.cim.wires;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/CimCacheDataAccess.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/CimCacheDataAccess.java
index 359844ea..a2440561 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/CimCacheDataAccess.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/CimCacheDataAccess.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/ActivityRecordJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/ActivityRecordJpa.java
index f468307f..1a7cce86 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/ActivityRecordJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/ActivityRecordJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.common;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/ElectronicAddressJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/ElectronicAddressJpa.java
index d0f4b917..27795bf0 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/ElectronicAddressJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/ElectronicAddressJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.common;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/LocationJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/LocationJpa.java
index d570b0df..30794896 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/LocationJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/LocationJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.common;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/PositionPointJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/PositionPointJpa.java
index 8eed2c82..12dc4fe3 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/PositionPointJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/PositionPointJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.common;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/StreetAddressJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/StreetAddressJpa.java
index 9dd75128..ceff4394 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/StreetAddressJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/StreetAddressJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.common;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/StreetDetailJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/StreetDetailJpa.java
index 10df1797..821b2501 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/StreetDetailJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/StreetDetailJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.common;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/TownDetailJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/TownDetailJpa.java
index 578f74e3..e71602d4 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/TownDetailJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/TownDetailJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.common;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/AcDcTerminalJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/AcDcTerminalJpa.java
index 7bcdecd9..1c2c6c86 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/AcDcTerminalJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/AcDcTerminalJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/ConductingEquipmentJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/ConductingEquipmentJpa.java
index 0b4a870e..51c10c97 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/ConductingEquipmentJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/ConductingEquipmentJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/ConnectivityNodeContainerJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/ConnectivityNodeContainerJpa.java
index 5eb6c72e..9159c1bf 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/ConnectivityNodeContainerJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/ConnectivityNodeContainerJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/ConnectivityNodeJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/ConnectivityNodeJpa.java
index adc43edd..9e0037bd 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/ConnectivityNodeJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/ConnectivityNodeJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/EquipmentContainerJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/EquipmentContainerJpa.java
index 163f8743..93c88969 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/EquipmentContainerJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/EquipmentContainerJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/EquipmentJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/EquipmentJpa.java
index 42d68315..5bd81662 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/EquipmentJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/EquipmentJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/GeographicalRegionJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/GeographicalRegionJpa.java
index bcce972e..e4b1ff1f 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/GeographicalRegionJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/GeographicalRegionJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/IdentifiedObjectJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/IdentifiedObjectJpa.java
index 3b1fd9bf..a9ab6364 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/IdentifiedObjectJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/IdentifiedObjectJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/OperatingParticipantJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/OperatingParticipantJpa.java
index a4c62aef..388f37b6 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/OperatingParticipantJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/OperatingParticipantJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/OperatingShareJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/OperatingShareJpa.java
index 7b16d099..e5aa86c4 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/OperatingShareJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/OperatingShareJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/PowerSystemResourceJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/PowerSystemResourceJpa.java
index 8415c3fe..0f729efb 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/PowerSystemResourceJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/PowerSystemResourceJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/SubGeographicalRegionJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/SubGeographicalRegionJpa.java
index a9c6a192..8965f431 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/SubGeographicalRegionJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/SubGeographicalRegionJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/SubstationJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/SubstationJpa.java
index fc23556f..d5e36e9d 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/SubstationJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/SubstationJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/TerminalJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/TerminalJpa.java
index 48bfbe8d..06ac485a 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/TerminalJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/TerminalJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/VoltageLevelJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/VoltageLevelJpa.java
index 095e4595..89305b4e 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/VoltageLevelJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/VoltageLevelJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/AbsoluteDateTimeJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/AbsoluteDateTimeJpa.java
index cf337d11..a7edeae8 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/AbsoluteDateTimeJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/AbsoluteDateTimeJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.domain;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/ActivePowerJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/ActivePowerJpa.java
index 200ea8a3..76477f86 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/ActivePowerJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/ActivePowerJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.domain;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/CommunicationTypeJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/CommunicationTypeJpa.java
index 5a7fd61f..9b0c047b 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/CommunicationTypeJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/CommunicationTypeJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.domain;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/PerCentJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/PerCentJpa.java
index c5894c2d..f2c8fcd2 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/PerCentJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/PerCentJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.domain;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/ReductionSettingJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/ReductionSettingJpa.java
index 769e32d0..68296184 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/ReductionSettingJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/ReductionSettingJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.domain;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/UnitMultiplierJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/UnitMultiplierJpa.java
index 4945f076..b8c4094f 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/UnitMultiplierJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/UnitMultiplierJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.domain;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/UnitSymbolJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/UnitSymbolJpa.java
index f45dac58..b7e86de6 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/UnitSymbolJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/UnitSymbolJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.domain;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/VoltageJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/VoltageJpa.java
index f6846362..e9996091 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/VoltageJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/VoltageJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.domain;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/informative/infoperations/PsrEventJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/informative/infoperations/PsrEventJpa.java
index e2f53c93..56d7abf3 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/informative/infoperations/PsrEventJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/informative/infoperations/PsrEventJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.informative.infoperations;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/informative/infoperations/PsrEventKindJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/informative/infoperations/PsrEventKindJpa.java
index 2dbf803e..9a74436c 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/informative/infoperations/PsrEventKindJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/informative/infoperations/PsrEventKindJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.informative.infoperations;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/marketcommon/RegisteredResourceJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/marketcommon/RegisteredResourceJpa.java
index 037e9ad3..d85ec3ad 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/marketcommon/RegisteredResourceJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/marketcommon/RegisteredResourceJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.marketcommon;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/marketoperations/mktdomain/UnitTypeJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/marketoperations/mktdomain/UnitTypeJpa.java
index f3243420..33d7f2cf 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/marketoperations/mktdomain/UnitTypeJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/marketoperations/mktdomain/UnitTypeJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.marketoperations.mktdomain;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/marketoperations/referencedata/RegisteredGeneratorJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/marketoperations/referencedata/RegisteredGeneratorJpa.java
index 1b04d88c..1b722e39 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/marketoperations/referencedata/RegisteredGeneratorJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/marketoperations/referencedata/RegisteredGeneratorJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.marketoperations.referencedata;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/AnalogJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/AnalogJpa.java
index 906a1489..b91b5435 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/AnalogJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/AnalogJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.meas;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/AnalogValueJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/AnalogValueJpa.java
index df172492..16c1a042 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/AnalogValueJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/AnalogValueJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.meas;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/MeasurementJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/MeasurementJpa.java
index 07a4535c..15f6268e 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/MeasurementJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/MeasurementJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.meas;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/MeasurementValueJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/MeasurementValueJpa.java
index 23db4b72..455a86e1 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/MeasurementValueJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/MeasurementValueJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.meas;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/MeasurementValueQualityJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/MeasurementValueQualityJpa.java
index df953bbc..45e0cfd7 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/MeasurementValueQualityJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/MeasurementValueQualityJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.meas;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/production/GeneratingUnitJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/production/GeneratingUnitJpa.java
index 896a6d74..17896799 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/production/GeneratingUnitJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/production/GeneratingUnitJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.production;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/production/GeneratorControlSourceJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/production/GeneratorControlSourceJpa.java
index 4b8817d4..265ceaac 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/production/GeneratorControlSourceJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/production/GeneratorControlSourceJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.production;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/Boolean2StringConverter.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/Boolean2StringConverter.java
index 7f8e3b9d..05cf4a71 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/Boolean2StringConverter.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/Boolean2StringConverter.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.util;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/RegisteredGenerator2StringConverter.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/RegisteredGenerator2StringConverter.java
index 4c03c636..72ca8eb3 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/RegisteredGenerator2StringConverter.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/RegisteredGenerator2StringConverter.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.util;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/Sequence.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/Sequence.java
index 5de8859b..cbac1175 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/Sequence.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/Sequence.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.util;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/Temporal.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/Temporal.java
index 53e70660..c364082b 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/Temporal.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/Temporal.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.util;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/AcLineSegmentJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/AcLineSegmentJpa.java
index 6081642c..10b5800a 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/AcLineSegmentJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/AcLineSegmentJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.wires;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/BusbarSectionJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/BusbarSectionJpa.java
index 45192dd6..086a73c9 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/BusbarSectionJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/BusbarSectionJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.wires;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/ConductorJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/ConductorJpa.java
index 16a7d63b..6fe8eaac 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/ConductorJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/ConductorJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.wires;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/ConnectorJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/ConnectorJpa.java
index d3f19197..d477be8b 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/ConnectorJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/ConnectorJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.wires;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/PowerTransformerJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/PowerTransformerJpa.java
index cf1ed61b..55858e61 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/PowerTransformerJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/PowerTransformerJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.wires;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/RegulatingCondEqJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/RegulatingCondEqJpa.java
index 7ce8158b..525f7173 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/RegulatingCondEqJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/RegulatingCondEqJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.wires;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/RotatingMachineJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/RotatingMachineJpa.java
index c22343db..4477e3e9 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/RotatingMachineJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/RotatingMachineJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.wires;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/SwitchJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/SwitchJpa.java
index 442d500c..f3610931 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/SwitchJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/SwitchJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.wires;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/SynchronousMachineJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/SynchronousMachineJpa.java
index 67101d3f..1ac93e47 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/SynchronousMachineJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/SynchronousMachineJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.wires;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/SynchronousMachineKindJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/SynchronousMachineKindJpa.java
index 62f10c3c..9f130017 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/SynchronousMachineKindJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/SynchronousMachineKindJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.wires;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/CimCache.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/CimCache.java
index 3eb0706f..36929bad 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/CimCache.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/CimCache.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/DataExchangeDefaults.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/DataExchangeDefaults.java
index 534e398f..589e99a6 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/DataExchangeDefaults.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/DataExchangeDefaults.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.datainterchange;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/SecureRequestHandlerInterceptor.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/SecureRequestHandlerInterceptor.java
index a107a21a..328aeec0 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/SecureRequestHandlerInterceptor.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/SecureRequestHandlerInterceptor.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.datainterchange;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/AbstractRestClient.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/AbstractRestClient.java
index ae97ad4f..d2049a53 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/AbstractRestClient.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/AbstractRestClient.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.datainterchange.adapter.rest;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/client/GeographicalRegionProvider.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/client/GeographicalRegionProvider.java
index 6e89243f..c62085e3 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/client/GeographicalRegionProvider.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/client/GeographicalRegionProvider.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.datainterchange.adapter.rest.client;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/client/JsonFileProvider.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/client/JsonFileProvider.java
index 1b29cb45..fc33cab5 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/client/JsonFileProvider.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/client/JsonFileProvider.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.datainterchange.adapter.rest.client;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/client/SynchronousMachineProvider.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/client/SynchronousMachineProvider.java
index d52b9713..e68698db 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/client/SynchronousMachineProvider.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/client/SynchronousMachineProvider.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.datainterchange.adapter.rest.client;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/controller/SubGeographicalRegionRestController.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/controller/SubGeographicalRegionRestController.java
index 36a2b86f..c113d5c3 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/controller/SubGeographicalRegionRestController.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/controller/SubGeographicalRegionRestController.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.datainterchange.adapter.rest.controller;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/controller/SubstationRestController.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/controller/SubstationRestController.java
index fcfe9b5e..6c44e1a0 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/controller/SubstationRestController.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/controller/SubstationRestController.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.datainterchange.adapter.rest.controller;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/controller/SynchronousMachineRestController.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/controller/SynchronousMachineRestController.java
index e0b260d0..94c1c427 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/controller/SynchronousMachineRestController.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/controller/SynchronousMachineRestController.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.datainterchange.adapter.rest.controller;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/JobController.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/JobController.java
index 2bfc3dc8..6c9d4a6d 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/JobController.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/JobController.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.job;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/JsonFileJob.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/JsonFileJob.java
index 4b173811..26ed2c3b 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/JsonFileJob.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/JsonFileJob.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.job;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/NetstateJob.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/NetstateJob.java
index fb951274..10bcc31f 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/NetstateJob.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/NetstateJob.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.job;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/SynchronousMachineJob.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/SynchronousMachineJob.java
index 6b5c5604..eb908814 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/SynchronousMachineJob.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/SynchronousMachineJob.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.job;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/TopologyJob.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/TopologyJob.java
index 9e3b43b4..5afd4748 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/TopologyJob.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/TopologyJob.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.job;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/util/JobUtils.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/util/JobUtils.java
index c503954c..08ca691b 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/util/JobUtils.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/util/JobUtils.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.job.util;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/Abstract4Tree.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/Abstract4Tree.java
index 8bdfb4e0..9c7ced0e 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/Abstract4Tree.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/Abstract4Tree.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.model.util;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/SubGeographicalRegion4Tree.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/SubGeographicalRegion4Tree.java
index 24c2d2dd..199adefc 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/SubGeographicalRegion4Tree.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/SubGeographicalRegion4Tree.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.model.util;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/Substation4Tree.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/Substation4Tree.java
index a433331c..27e86397 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/Substation4Tree.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/Substation4Tree.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.model.util;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/SumContainer.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/SumContainer.java
index fff8e9ba..5bf30a39 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/SumContainer.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/SumContainer.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.model.util;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/GeneratingUnitJpaRepository.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/GeneratingUnitJpaRepository.java
index 6c25641c..b809fe50 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/GeneratingUnitJpaRepository.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/GeneratingUnitJpaRepository.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.repository;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/GeographicalRegionJpaRepository.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/GeographicalRegionJpaRepository.java
index 8810ef6d..e50fa15f 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/GeographicalRegionJpaRepository.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/GeographicalRegionJpaRepository.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.repository;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SequenceJpaRepository.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SequenceJpaRepository.java
index 37f9416b..af41bac6 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SequenceJpaRepository.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SequenceJpaRepository.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.repository;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SubGeographicalRegionJpaRepository.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SubGeographicalRegionJpaRepository.java
index 89964822..f03b3167 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SubGeographicalRegionJpaRepository.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SubGeographicalRegionJpaRepository.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.repository;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SubstationJpaRepository.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SubstationJpaRepository.java
index 84623c78..3fe73087 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SubstationJpaRepository.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SubstationJpaRepository.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.repository;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SynchronousMachineJpaRepository.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SynchronousMachineJpaRepository.java
index a46f278b..dd44c0bc 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SynchronousMachineJpaRepository.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SynchronousMachineJpaRepository.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.repository;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/VoltageLevelJpaRepository.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/VoltageLevelJpaRepository.java
index e5d6afa2..18fd24e8 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/VoltageLevelJpaRepository.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/VoltageLevelJpaRepository.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.repository;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/AbstractJpaService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/AbstractJpaService.java
index a6d39905..7da0937d 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/AbstractJpaService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/AbstractJpaService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/ActivePowerJpaService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/ActivePowerJpaService.java
index 07f2df2f..73a66229 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/ActivePowerJpaService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/ActivePowerJpaService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/AnalogJpaService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/AnalogJpaService.java
index 5c66cbee..338c3016 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/AnalogJpaService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/AnalogJpaService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/AnalogValueJpaService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/AnalogValueJpaService.java
index 56c3e3e7..4bc71ae2 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/AnalogValueJpaService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/AnalogValueJpaService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/BaseMapperService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/BaseMapperService.java
index 4946ffb8..caba777e 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/BaseMapperService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/BaseMapperService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/EquipmentService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/EquipmentService.java
index e24ae47a..c1ab232b 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/EquipmentService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/EquipmentService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionJpaService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionJpaService.java
index 03ef437b..d4b5f8bc 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionJpaService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionJpaService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionMapperService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionMapperService.java
index 0ba3b205..364af51b 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionMapperService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionMapperService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionRestConsumerService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionRestConsumerService.java
index 4ecf130e..6b151847 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionRestConsumerService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionRestConsumerService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionValidatorService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionValidatorService.java
index 3eaf97be..a8eeff96 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionValidatorService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionValidatorService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/JsonFileRestConsumerService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/JsonFileRestConsumerService.java
index 1731261c..4cb5fe76 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/JsonFileRestConsumerService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/JsonFileRestConsumerService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/NetworkTraceService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/NetworkTraceService.java
index f3c53768..fc596b34 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/NetworkTraceService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/NetworkTraceService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SequenceJpaService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SequenceJpaService.java
index f7267201..35113b0f 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SequenceJpaService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SequenceJpaService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SignumService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SignumService.java
index 4cb8e779..eae2b418 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SignumService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SignumService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegion4TreeService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegion4TreeService.java
index 848be782..aa5b2778 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegion4TreeService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegion4TreeService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegionJpaService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegionJpaService.java
index 2aa83ef0..75e86575 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegionJpaService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegionJpaService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegionMapperService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegionMapperService.java
index 86dc373d..74a06f4d 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegionMapperService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegionMapperService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegionService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegionService.java
index d2de8bec..14a60636 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegionService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegionService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubstationJpaService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubstationJpaService.java
index 3ece53bd..4d33a234 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubstationJpaService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubstationJpaService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubstationMapperService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubstationMapperService.java
index fddfcb65..f2ef3dc3 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubstationMapperService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubstationMapperService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubstationService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubstationService.java
index b234a588..aa7d4c18 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubstationService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubstationService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineJpaDiffCheckerService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineJpaDiffCheckerService.java
index 0f7b5727..c2f8ad86 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineJpaDiffCheckerService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineJpaDiffCheckerService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineJpaService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineJpaService.java
index ba24e2d7..5ada9f35 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineJpaService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineJpaService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineMapperService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineMapperService.java
index b42efcfc..af0f0af8 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineMapperService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineMapperService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineRestConsumerService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineRestConsumerService.java
index f978db1a..17ff64e8 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineRestConsumerService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineRestConsumerService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineValidatorService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineValidatorService.java
index 247e6730..1497c41d 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineValidatorService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineValidatorService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/TimePeriodPassedService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/TimePeriodPassedService.java
index 13e4c018..85081a54 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/TimePeriodPassedService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/TimePeriodPassedService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/util/TimestampUtil.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/util/TimestampUtil.java
index c80e5593..f8c63928 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/util/TimestampUtil.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/util/TimestampUtil.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.cimcache.deprecated.util;
diff --git a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/dataexchange/adapter/rest/RestDefaults.java b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/dataexchange/adapter/rest/RestDefaults.java
index a3d3ebef..b8eee15f 100644
--- a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/dataexchange/adapter/rest/RestDefaults.java
+++ b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/dataexchange/adapter/rest/RestDefaults.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.dataexchange.adapter.rest;
diff --git a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/dataexchange/adapter/rest/controller/AbstractRestController.java b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/dataexchange/adapter/rest/controller/AbstractRestController.java
index c47cec23..d29355ec 100644
--- a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/dataexchange/adapter/rest/controller/AbstractRestController.java
+++ b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/dataexchange/adapter/rest/controller/AbstractRestController.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.dataexchange.adapter.rest.controller;
diff --git a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/date/DateDefaults.java b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/date/DateDefaults.java
index 0d72eba4..7ad73642 100644
--- a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/date/DateDefaults.java
+++ b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/date/DateDefaults.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.date;
diff --git a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/date/DateToolkit.java b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/date/DateToolkit.java
index 97cf3d8a..46ff30f4 100644
--- a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/date/DateToolkit.java
+++ b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/date/DateToolkit.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.date;
diff --git a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/module/AbstractModule.java b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/module/AbstractModule.java
index c195fbb3..b90bf4f2 100644
--- a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/module/AbstractModule.java
+++ b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/module/AbstractModule.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.module;
diff --git a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/module/IModule.java b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/module/IModule.java
index 16038902..71ace046 100644
--- a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/module/IModule.java
+++ b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/module/IModule.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.module;
diff --git a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/string/StringDefaults.java b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/string/StringDefaults.java
index bbb39c16..124c65fc 100644
--- a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/string/StringDefaults.java
+++ b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/string/StringDefaults.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.string;
diff --git a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/string/StringToolkit.java b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/string/StringToolkit.java
index 44fe919f..34c2252b 100644
--- a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/string/StringToolkit.java
+++ b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/string/StringToolkit.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.string;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/EismanDataAccess.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/EismanDataAccess.java
index 663ebb69..e84bbbc8 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/EismanDataAccess.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/EismanDataAccess.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/ElectronicAddressJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/ElectronicAddressJpa.java
index 7cd6e1af..95e07d9d 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/ElectronicAddressJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/ElectronicAddressJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.common;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/LocationJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/LocationJpa.java
index 270152f9..155b6e1c 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/LocationJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/LocationJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.common;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/StreetAddressJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/StreetAddressJpa.java
index 28eb7d82..fef3fa4c 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/StreetAddressJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/StreetAddressJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.common;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/StreetDetailJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/StreetDetailJpa.java
index dfb8f2c3..fa312e68 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/StreetDetailJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/StreetDetailJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.common;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/TownDetailJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/TownDetailJpa.java
index bd4b6827..89d7229e 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/TownDetailJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/TownDetailJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.common;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/EquipmentContainerJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/EquipmentContainerJpa.java
index df6384c1..9f3631c7 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/EquipmentContainerJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/EquipmentContainerJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.core;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/EquipmentJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/EquipmentJpa.java
index 2922d506..81d19bc1 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/EquipmentJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/EquipmentJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.core;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/IdentifiedObjectJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/IdentifiedObjectJpa.java
index f3d1fdc8..da555879 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/IdentifiedObjectJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/IdentifiedObjectJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.core;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/SubGeographicalRegionJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/SubGeographicalRegionJpa.java
index 5e36c9fd..04d5b07b 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/SubGeographicalRegionJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/SubGeographicalRegionJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.core;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/SubstationJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/SubstationJpa.java
index 543c8aab..72a15809 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/SubstationJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/SubstationJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.core;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/VoltageLevelJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/VoltageLevelJpa.java
index f6eff7e8..ef2d2537 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/VoltageLevelJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/VoltageLevelJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.core;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/AbsoluteDateTimeJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/AbsoluteDateTimeJpa.java
index 99ae6f55..0d3afc5a 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/AbsoluteDateTimeJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/AbsoluteDateTimeJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.domain;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/ActivePowerJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/ActivePowerJpa.java
index 828ad2c4..8f729023 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/ActivePowerJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/ActivePowerJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.domain;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/CommunicationTypeJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/CommunicationTypeJpa.java
index 4f71c1b1..0417b994 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/CommunicationTypeJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/CommunicationTypeJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.domain;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/PerCentJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/PerCentJpa.java
index 8f21636f..0c037f76 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/PerCentJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/PerCentJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.domain;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/ReductionSettingJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/ReductionSettingJpa.java
index 5a5fe1a2..dda29466 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/ReductionSettingJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/ReductionSettingJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.domain;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/UnitMultiplierJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/UnitMultiplierJpa.java
index 99e3a82c..b7baa289 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/UnitMultiplierJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/UnitMultiplierJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.domain;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/UnitSymbolJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/UnitSymbolJpa.java
index 9ca8c58f..3359e7d4 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/UnitSymbolJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/UnitSymbolJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.domain;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/VoltageJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/VoltageJpa.java
index c47f202d..bb5678c5 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/VoltageJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/VoltageJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.domain;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/informative/infoperations/PsrEventJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/informative/infoperations/PsrEventJpa.java
index 0cc9225d..1d8bb5ef 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/informative/infoperations/PsrEventJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/informative/infoperations/PsrEventJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.informative.infoperations;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/informative/infoperations/PsrEventKindJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/informative/infoperations/PsrEventKindJpa.java
index 4e2c7df3..a877eac4 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/informative/infoperations/PsrEventKindJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/informative/infoperations/PsrEventKindJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.informative.infoperations;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/marketoperations/mktdomain/UnitTypeJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/marketoperations/mktdomain/UnitTypeJpa.java
index f3ab954e..eb5dba36 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/marketoperations/mktdomain/UnitTypeJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/marketoperations/mktdomain/UnitTypeJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.marketoperations.mktdomain;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/marketoperations/referencedata/RegisteredGeneratorJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/marketoperations/referencedata/RegisteredGeneratorJpa.java
index d337623a..c7ed8146 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/marketoperations/referencedata/RegisteredGeneratorJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/marketoperations/referencedata/RegisteredGeneratorJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.marketoperations.referencedata;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/AnalogJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/AnalogJpa.java
index 39ad415a..71ae2060 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/AnalogJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/AnalogJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.meas;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/AnalogValueJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/AnalogValueJpa.java
index 8dacda37..4b45739f 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/AnalogValueJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/AnalogValueJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.meas;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/MeasurementJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/MeasurementJpa.java
index f8b992e3..ad67ac20 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/MeasurementJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/MeasurementJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.meas;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/MeasurementValueJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/MeasurementValueJpa.java
index 2fb26523..f5861104 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/MeasurementValueJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/MeasurementValueJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.meas;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/MeasurementValueQualityJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/MeasurementValueQualityJpa.java
index e072f75e..b9440b06 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/MeasurementValueQualityJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/MeasurementValueQualityJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.meas;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/AbstractBaseEntityJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/AbstractBaseEntityJpa.java
index 22cead83..0659f7fe 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/AbstractBaseEntityJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/AbstractBaseEntityJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.process;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/ActivityJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/ActivityJpa.java
index 78760287..39e8050e 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/ActivityJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/ActivityJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.process;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/CharacteristicForActivityStatus.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/CharacteristicForActivityStatus.java
index e8f236a3..020391a6 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/CharacteristicForActivityStatus.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/CharacteristicForActivityStatus.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.process;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/CharacteristicForMissingMeasurementJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/CharacteristicForMissingMeasurementJpa.java
index ddc8ab72..68ff9039 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/CharacteristicForMissingMeasurementJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/CharacteristicForMissingMeasurementJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.process;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/PreselectionConfigurationJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/PreselectionConfigurationJpa.java
index d6d58256..17149217 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/PreselectionConfigurationJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/PreselectionConfigurationJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.process;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/PreselectionJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/PreselectionJpa.java
index c76c1e2a..4a0f12f3 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/PreselectionJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/PreselectionJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.process;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/UserSettingsJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/UserSettingsJpa.java
index c4542fb7..a70794b1 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/UserSettingsJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/UserSettingsJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.process;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/production/GeneratingUnitJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/production/GeneratingUnitJpa.java
index 73645758..03a0c1c3 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/production/GeneratingUnitJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/production/GeneratingUnitJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.production;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/util/Boolean2StringConverter.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/util/Boolean2StringConverter.java
index cfa8650a..2737d337 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/util/Boolean2StringConverter.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/util/Boolean2StringConverter.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.util;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/wires/SynchronousMachineJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/wires/SynchronousMachineJpa.java
index ce63384b..fa50954f 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/wires/SynchronousMachineJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/wires/SynchronousMachineJpa.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.dataaccess.eisman.wires;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/EismanDataTransfer.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/EismanDataTransfer.java
index f66da458..6a426aff 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/EismanDataTransfer.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/EismanDataTransfer.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.datatransfer.eisman;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/networkstate/AbstractNetworkStateNode.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/networkstate/AbstractNetworkStateNode.java
index 2021a66c..d864a2bf 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/networkstate/AbstractNetworkStateNode.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/networkstate/AbstractNetworkStateNode.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.datatransfer.eisman.networkstate;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/networkstate/SubGeographicalRegion4Tree.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/networkstate/SubGeographicalRegion4Tree.java
index 8a6ac68f..e344b035 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/networkstate/SubGeographicalRegion4Tree.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/networkstate/SubGeographicalRegion4Tree.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.datatransfer.eisman.networkstate;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/networkstate/Substation4Tree.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/networkstate/Substation4Tree.java
index fa8767b7..4281f53d 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/networkstate/Substation4Tree.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/networkstate/Substation4Tree.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.datatransfer.eisman.networkstate;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/ConnectedConnectingEquipments_1_ApplicationXml_Importer.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/ConnectedConnectingEquipments_1_ApplicationXml_Importer.java
index b3ce96ab..3510249b 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/ConnectedConnectingEquipments_1_ApplicationXml_Importer.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/ConnectedConnectingEquipments_1_ApplicationXml_Importer.java
@@ -1,3 +1,16 @@
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * -----------------------------------------------------------------------------
+ */
package org.eclipse.openk.app.eisman.adapter.importer;
import java.io.IOException;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/EquipmentContainerContent_1_ApplicationXml_Importer.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/EquipmentContainerContent_1_ApplicationXml_Importer.java
index 7d6a63cb..58db05d1 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/EquipmentContainerContent_1_ApplicationXml_Importer.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/EquipmentContainerContent_1_ApplicationXml_Importer.java
@@ -1,3 +1,16 @@
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * -----------------------------------------------------------------------------
+ */
package org.eclipse.openk.app.eisman.adapter.importer;
import java.io.IOException;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/SubGeographicalRegions_1_ApplicationXml_Importer.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/SubGeographicalRegions_1_ApplicationXml_Importer.java
index 1cb3a7a3..28abdf0f 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/SubGeographicalRegions_1_ApplicationXml_Importer.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/SubGeographicalRegions_1_ApplicationXml_Importer.java
@@ -1,3 +1,16 @@
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * -----------------------------------------------------------------------------
+ */
package org.eclipse.openk.app.eisman.adapter.importer;
import java.io.IOException;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/TopologicalResources_1_ApplicationXml_Importer.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/TopologicalResources_1_ApplicationXml_Importer.java
index de806228..d7415fc1 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/TopologicalResources_1_ApplicationXml_Importer.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/TopologicalResources_1_ApplicationXml_Importer.java
@@ -1,3 +1,16 @@
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * -----------------------------------------------------------------------------
+ */
package org.eclipse.openk.app.eisman.adapter.importer;
import java.io.IOException;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/AbstractRestImporter.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/AbstractRestImporter.java
index 8ab637e9..aa91036d 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/AbstractRestImporter.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/AbstractRestImporter.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.importer.eisman;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/SubGeographicalRegionsImporter.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/SubGeographicalRegionsImporter.java
index 0a2ccb02..a4ac12da 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/SubGeographicalRegionsImporter.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/SubGeographicalRegionsImporter.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.importer.eisman;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/SubstationsImporter.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/SubstationsImporter.java
index 6ce1564d..59d7130a 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/SubstationsImporter.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/SubstationsImporter.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.importer.eisman;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/SynchronousMachinesImporter.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/SynchronousMachinesImporter.java
index b162f8fe..4a179ecd 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/SynchronousMachinesImporter.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/SynchronousMachinesImporter.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.adapter.importer.eisman;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/EnergySources_1_Cim17v07_EismanDataTransfer_Mapper.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/EnergySources_1_Cim17v07_EismanDataTransfer_Mapper.java
index 2dc10109..69c6810b 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/EnergySources_1_Cim17v07_EismanDataTransfer_Mapper.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/EnergySources_1_Cim17v07_EismanDataTransfer_Mapper.java
@@ -1,15 +1,16 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
-
package org.eclipse.openk.app.eisman.adapter.mapper.eisman;
import java.io.IOException;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/GeneratedEntityProvider.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/GeneratedEntityProvider.java
index 036da8cf..c5d0b77a 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/GeneratedEntityProvider.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/GeneratedEntityProvider.java
@@ -1,15 +1,16 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
-
package org.eclipse.openk.app.eisman.adapter.mapper.eisman;
import java.sql.Timestamp;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/OidToMridMapper.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/OidToMridMapper.java
index f50f6b37..9947dbfd 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/OidToMridMapper.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/OidToMridMapper.java
@@ -1,15 +1,16 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
-
package org.eclipse.openk.app.eisman.adapter.mapper.eisman;
import java.util.Map;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/SubGeographicalRegions_1_Cim17v07_EismanDataTransfer_Mapper.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/SubGeographicalRegions_1_Cim17v07_EismanDataTransfer_Mapper.java
index c61e4db5..3b6fbdcc 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/SubGeographicalRegions_1_Cim17v07_EismanDataTransfer_Mapper.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/SubGeographicalRegions_1_Cim17v07_EismanDataTransfer_Mapper.java
@@ -1,15 +1,16 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
-
package org.eclipse.openk.app.eisman.adapter.mapper.eisman;
import java.io.IOException;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/Substations_1_Cim17v07_EismanDataTransfer_Mapper.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/Substations_1_Cim17v07_EismanDataTransfer_Mapper.java
index 0f311e73..0e38e26b 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/Substations_1_Cim17v07_EismanDataTransfer_Mapper.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/Substations_1_Cim17v07_EismanDataTransfer_Mapper.java
@@ -1,15 +1,16 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
-
package org.eclipse.openk.app.eisman.adapter.mapper.eisman;
import java.io.IOException;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/EISMAN.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/EISMAN.java
index 408f2054..87be9f10 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/EISMAN.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/EISMAN.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/AbstractRestController.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/AbstractRestController.java
index aca08e27..3ddcf609 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/AbstractRestController.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/AbstractRestController.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.adapter.rest.controller;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/ActivityRestController.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/ActivityRestController.java
index e0913041..4e3031c6 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/ActivityRestController.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/ActivityRestController.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.adapter.rest.controller;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/DisplayDtoRestController.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/DisplayDtoRestController.java
index da36afb4..8f25a3e1 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/DisplayDtoRestController.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/DisplayDtoRestController.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.adapter.rest.controller;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/HysteresisController.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/HysteresisController.java
index 02e336d8..686c6937 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/HysteresisController.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/HysteresisController.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.adapter.rest.controller;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/PreselectionRestController.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/PreselectionRestController.java
index 0571b560..b49da470 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/PreselectionRestController.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/PreselectionRestController.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.adapter.rest.controller;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/ReasonOfReductionRestController.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/ReasonOfReductionRestController.java
index faed6cad..448eacb8 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/ReasonOfReductionRestController.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/ReasonOfReductionRestController.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.adapter.rest.controller;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/ReductionSettingListRestController.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/ReductionSettingListRestController.java
index fba52cd9..ef5f4498 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/ReductionSettingListRestController.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/ReductionSettingListRestController.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.adapter.rest.controller;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/SubGeographicalRegionRestController.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/SubGeographicalRegionRestController.java
index 60a685e2..363dcd9e 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/SubGeographicalRegionRestController.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/SubGeographicalRegionRestController.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.adapter.rest.controller;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/SubstationRestController.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/SubstationRestController.java
index ab59ed18..1369b71d 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/SubstationRestController.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/SubstationRestController.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.adapter.rest.controller;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/TimerRestContoller.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/TimerRestContoller.java
index 6192f3f0..d9756488 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/TimerRestContoller.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/TimerRestContoller.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.adapter.rest.controller;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/exceptionhandler/RestResponseEntityExceptionHandler.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/exceptionhandler/RestResponseEntityExceptionHandler.java
index 1fa770de..52d287fa 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/exceptionhandler/RestResponseEntityExceptionHandler.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/exceptionhandler/RestResponseEntityExceptionHandler.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.adapter.rest.controller.exceptionhandler;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/util/IncludeAttribute4Json.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/util/IncludeAttribute4Json.java
index c73486bd..596ecdae 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/util/IncludeAttribute4Json.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/util/IncludeAttribute4Json.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.adapter.rest.controller.util;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/util/SubstationToolkit.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/util/SubstationToolkit.java
index 8cbc0649..1c4b90ed 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/util/SubstationToolkit.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/util/SubstationToolkit.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.adapter.rest.controller.util;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/controller/BaseController.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/controller/BaseController.java
index 6eeb832b..17bea33e 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/controller/BaseController.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/controller/BaseController.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.controller;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/ActionOverviewDto.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/ActionOverviewDto.java
index d190398f..5fa8a9f7 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/ActionOverviewDto.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/ActionOverviewDto.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.model.dto.core;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/ActionSettingsDto.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/ActionSettingsDto.java
index 1e4edbfa..5a12c79f 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/ActionSettingsDto.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/ActionSettingsDto.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.model.dto.core;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/OverviewDto.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/OverviewDto.java
index 4b3c2313..350954a8 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/OverviewDto.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/OverviewDto.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.model.dto.core;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/PointOfInjectionType.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/PointOfInjectionType.java
index 88d23aef..20df4067 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/PointOfInjectionType.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/PointOfInjectionType.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.model.dto.core;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/PreselectionConfigurationDto.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/PreselectionConfigurationDto.java
index 5b3bb05e..0d367956 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/PreselectionConfigurationDto.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/PreselectionConfigurationDto.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.model.dto.core;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/ProcessOverviewDto.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/ProcessOverviewDto.java
index 05dd9cb8..2e70e0af 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/ProcessOverviewDto.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/ProcessOverviewDto.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.model.dto.core;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/SynchronousMachineOverviewDto.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/SynchronousMachineOverviewDto.java
index a701fc0f..549d5d36 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/SynchronousMachineOverviewDto.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/SynchronousMachineOverviewDto.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.model.dto.core;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/util/mapper/BigDecimalDeserializer.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/util/mapper/BigDecimalDeserializer.java
index d1e6c27b..a258b2c8 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/util/mapper/BigDecimalDeserializer.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/util/mapper/BigDecimalDeserializer.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.model.util.mapper;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/ActivityJpaRepository.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/ActivityJpaRepository.java
index cc773f4d..14b70643 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/ActivityJpaRepository.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/ActivityJpaRepository.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.repository;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/PreselectionJpaRepository.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/PreselectionJpaRepository.java
index 1ec3a770..76c41845 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/PreselectionJpaRepository.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/PreselectionJpaRepository.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.repository;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/SubGeographicalRegionJpaRepository.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/SubGeographicalRegionJpaRepository.java
index 8c356d20..fc5d8676 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/SubGeographicalRegionJpaRepository.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/SubGeographicalRegionJpaRepository.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.repository;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/SubstationJpaRepository.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/SubstationJpaRepository.java
index 0c3f3695..be4977be 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/SubstationJpaRepository.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/SubstationJpaRepository.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.repository;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/SynchronousMachineJpaRepository.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/SynchronousMachineJpaRepository.java
index e15ab8dd..917d9213 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/SynchronousMachineJpaRepository.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/SynchronousMachineJpaRepository.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.repository;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AbstractReductionAdviceCalculatorService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AbstractReductionAdviceCalculatorService.java
index 144f6ca6..0b87f7ad 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AbstractReductionAdviceCalculatorService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AbstractReductionAdviceCalculatorService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AbstractReductionAdviceService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AbstractReductionAdviceService.java
index 122e93ed..ed63f7cf 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AbstractReductionAdviceService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AbstractReductionAdviceService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AbstractService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AbstractService.java
index c7335817..7bc43fb1 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AbstractService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AbstractService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivePowerJpaService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivePowerJpaService.java
index 73844d66..357ae691 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivePowerJpaService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivePowerJpaService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivityJpaFindService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivityJpaFindService.java
index b6238a26..42f7ce7f 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivityJpaFindService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivityJpaFindService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivityJpaMappingService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivityJpaMappingService.java
index e208e4a6..420441bb 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivityJpaMappingService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivityJpaMappingService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivityJpaService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivityJpaService.java
index 85f368dc..08a505f8 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivityJpaService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivityJpaService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AnalogJpaService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AnalogJpaService.java
index c3138a26..d4f2a86d 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AnalogJpaService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AnalogJpaService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AnalogValueJpaService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AnalogValueJpaService.java
index 26995f8f..9244f2d5 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AnalogValueJpaService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AnalogValueJpaService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/BaseMapperService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/BaseMapperService.java
index bfa01b4d..7f3205f1 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/BaseMapperService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/BaseMapperService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/DiscriminationCoefficientService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/DiscriminationCoefficientService.java
index de44b7af..25dfb55e 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/DiscriminationCoefficientService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/DiscriminationCoefficientService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/DisplayDtoService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/DisplayDtoService.java
index f5e1651b..43699dc8 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/DisplayDtoService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/DisplayDtoService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/HysteresisService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/HysteresisService.java
index 986983c6..2f2f5d21 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/HysteresisService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/HysteresisService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/IReductionAdvice.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/IReductionAdvice.java
index 9c4658d1..589c5494 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/IReductionAdvice.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/IReductionAdvice.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/PreselectionJpaService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/PreselectionJpaService.java
index 6192bc62..b23e6798 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/PreselectionJpaService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/PreselectionJpaService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReasonOfReductionService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReasonOfReductionService.java
index 9a446d56..e3f2a766 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReasonOfReductionService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReasonOfReductionService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionAdviceAdjustmentService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionAdviceAdjustmentService.java
index c33da2de..c9504e67 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionAdviceAdjustmentService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionAdviceAdjustmentService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionAdviceCalculatorService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionAdviceCalculatorService.java
index 77b6b2b6..a75b8c2f 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionAdviceCalculatorService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionAdviceCalculatorService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionAdviceInitialService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionAdviceInitialService.java
index 651e10f5..fe429ae0 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionAdviceInitialService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionAdviceInitialService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionAdviceService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionAdviceService.java
index a8a88d23..f1c64ca7 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionAdviceService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionAdviceService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionAdviceUpdateService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionAdviceUpdateService.java
index 02cdadd3..cb702a83 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionAdviceUpdateService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionAdviceUpdateService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionSettingService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionSettingService.java
index dc5df1d5..4d95e908 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionSettingService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionSettingService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubGeographicalRegionJpaService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubGeographicalRegionJpaService.java
index 73c7adc5..8dd6edcc 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubGeographicalRegionJpaService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubGeographicalRegionJpaService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubGeographicalRegionMapperService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubGeographicalRegionMapperService.java
index b383aef6..9dddeeae 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubGeographicalRegionMapperService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubGeographicalRegionMapperService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubGeographicalRegionRestConsumerService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubGeographicalRegionRestConsumerService.java
index 78462ea1..38e3f237 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubGeographicalRegionRestConsumerService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubGeographicalRegionRestConsumerService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubstationJpaService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubstationJpaService.java
index bdbd7f21..48081b87 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubstationJpaService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubstationJpaService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubstationMapperService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubstationMapperService.java
index 28a5398b..f9949686 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubstationMapperService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubstationMapperService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubstationRestConsumerService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubstationRestConsumerService.java
index cb987db0..651a0416 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubstationRestConsumerService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubstationRestConsumerService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SynchronousMachineJpaService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SynchronousMachineJpaService.java
index f0817419..d1f5582a 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SynchronousMachineJpaService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SynchronousMachineJpaService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SynchronousMachineMapperService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SynchronousMachineMapperService.java
index 4a762da1..c68b4625 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SynchronousMachineMapperService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SynchronousMachineMapperService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SynchronousMachineMeasurementService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SynchronousMachineMeasurementService.java
index 2b3858ce..783e5b5a 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SynchronousMachineMeasurementService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SynchronousMachineMeasurementService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SynchronousMachineOrderService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SynchronousMachineOrderService.java
index 93484053..659a2213 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SynchronousMachineOrderService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SynchronousMachineOrderService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SynchronousMachineRestConsumerService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SynchronousMachineRestConsumerService.java
index 477c29db..81440089 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SynchronousMachineRestConsumerService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SynchronousMachineRestConsumerService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/TimerService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/TimerService.java
index c7e4c4d3..c6acdd60 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/TimerService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/TimerService.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/util/JpaUtils.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/util/JpaUtils.java
index ecd1c85f..953a0780 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/util/JpaUtils.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/util/JpaUtils.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.service.util;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/servlet/interceptor/SecureRequestHandlerInterceptor.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/servlet/interceptor/SecureRequestHandlerInterceptor.java
index b668d864..6db07053 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/servlet/interceptor/SecureRequestHandlerInterceptor.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/servlet/interceptor/SecureRequestHandlerInterceptor.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.deprecated.servlet.interceptor;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/logic/task/ImportSubGeographicalRegionsForNetworkState_1_Task.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/logic/task/ImportSubGeographicalRegionsForNetworkState_1_Task.java
index 041607dc..8f451a64 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/logic/task/ImportSubGeographicalRegionsForNetworkState_1_Task.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/logic/task/ImportSubGeographicalRegionsForNetworkState_1_Task.java
@@ -1,3 +1,16 @@
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * -----------------------------------------------------------------------------
+ */
package org.eclipse.openk.app.eisman.logic.task;
import java.io.IOException;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/logic/task/ImportSubstationForNetworkState_1_Task.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/logic/task/ImportSubstationForNetworkState_1_Task.java
index 8ed2594b..bb38cca7 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/logic/task/ImportSubstationForNetworkState_1_Task.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/logic/task/ImportSubstationForNetworkState_1_Task.java
@@ -1,3 +1,16 @@
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * -----------------------------------------------------------------------------
+ */
package org.eclipse.openk.app.eisman.logic.task;
import java.io.IOException;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/logic/task/parameters/ConnectedConnectingEquipmentsImportParameters.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/logic/task/parameters/ConnectedConnectingEquipmentsImportParameters.java
index 7e02032d..15a0e3b0 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/logic/task/parameters/ConnectedConnectingEquipmentsImportParameters.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/logic/task/parameters/ConnectedConnectingEquipmentsImportParameters.java
@@ -1,3 +1,16 @@
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * -----------------------------------------------------------------------------
+ */
package org.eclipse.openk.app.eisman.logic.task.parameters;
import java.util.List;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/logic/task/parameters/EquipmentContainerContentImportParameters.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/logic/task/parameters/EquipmentContainerContentImportParameters.java
index c9e03c64..b890ae7b 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/logic/task/parameters/EquipmentContainerContentImportParameters.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/logic/task/parameters/EquipmentContainerContentImportParameters.java
@@ -1,3 +1,16 @@
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * -----------------------------------------------------------------------------
+ */
package org.eclipse.openk.app.eisman.logic.task.parameters;
import java.util.List;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/logic/task/parameters/TopologicalResourcesImportParameters.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/logic/task/parameters/TopologicalResourcesImportParameters.java
index 27e0efcc..fd8b6cd1 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/logic/task/parameters/TopologicalResourcesImportParameters.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/logic/task/parameters/TopologicalResourcesImportParameters.java
@@ -1,3 +1,16 @@
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * -----------------------------------------------------------------------------
+ */
package org.eclipse.openk.app.eisman.logic.task.parameters;
import java.util.Collection;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/ISubGeographicalRegionsProvider.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/ISubGeographicalRegionsProvider.java
index 182f8b8f..94e74721 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/ISubGeographicalRegionsProvider.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/ISubGeographicalRegionsProvider.java
@@ -1,15 +1,16 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
-
package org.eclipse.openk.app.eisman.model;
import java.sql.Timestamp;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/ISubstationsProvider.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/ISubstationsProvider.java
index 29fe205d..cb167f53 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/ISubstationsProvider.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/ISubstationsProvider.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.model;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/ISynchronousMachinesProvider.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/ISynchronousMachinesProvider.java
index a37fd40d..de9f3bdd 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/ISynchronousMachinesProvider.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/ISynchronousMachinesProvider.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.model;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/SubGeographicalRegionsProvider.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/SubGeographicalRegionsProvider.java
index 1d2d5dff..80fa31dc 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/SubGeographicalRegionsProvider.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/SubGeographicalRegionsProvider.java
@@ -1,15 +1,16 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
-
package org.eclipse.openk.app.eisman.model;
import java.io.IOException;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/SubstationsProvider.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/SubstationsProvider.java
index 1bf787a1..c29d1fa1 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/SubstationsProvider.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/SubstationsProvider.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.model;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/SynchronousMachinesProvider.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/SynchronousMachinesProvider.java
index cb6b49ed..d8c20e68 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/SynchronousMachinesProvider.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/SynchronousMachinesProvider.java
@@ -1,13 +1,15 @@
-/**
- ******************************************************************************
- * Copyright © 2015-2017 BTC AG.
- * All rights reserved. This program and the accompanying materials
+/*
+ * -----------------------------------------------------------------------------
+ *
+ * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ *
+ * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* http://www.eclipse.org/legal/epl-v10.html
*
- ******************************************************************************
+ * -----------------------------------------------------------------------------
*/
package org.eclipse.openk.app.eisman.model;

Back to the top