diff --git a/build.gradle.kts b/build.gradle.kts index 8a4a56f..48be680 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,13 +7,13 @@ val ktorVersion: String by extra(ru.mipt.npm.gradle.KScienceVersions.ktorVersion val rsocketVersion by extra("0.15.4") allprojects { - group = "ru.mipt.npm" - version = "0.1.1" + group = "space.kscience" + version = "0.1.1-SNAPSHOT" } ksciencePublish { github("controls.kt") - space() + space("https://maven.pkg.jetbrains.space/mipt-npm/p/controls/maven") } apiValidation { diff --git a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/api/Device.kt b/controls-core/src/commonMain/kotlin/space/kscience/controls/api/Device.kt similarity index 97% rename from controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/api/Device.kt rename to controls-core/src/commonMain/kotlin/space/kscience/controls/api/Device.kt index bd85ae2..223bd0c 100644 --- a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/api/Device.kt +++ b/controls-core/src/commonMain/kotlin/space/kscience/controls/api/Device.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.controls.api +package space.kscience.controls.api import io.ktor.utils.io.core.Closeable import kotlinx.coroutines.CoroutineScope @@ -8,7 +8,7 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.filterIsInstance import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach -import ru.mipt.npm.controls.api.Device.Companion.DEVICE_TARGET +import space.kscience.controls.api.Device.Companion.DEVICE_TARGET import space.kscience.dataforge.context.ContextAware import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.misc.Type diff --git a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/api/DeviceHub.kt b/controls-core/src/commonMain/kotlin/space/kscience/controls/api/DeviceHub.kt similarity index 98% rename from controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/api/DeviceHub.kt rename to controls-core/src/commonMain/kotlin/space/kscience/controls/api/DeviceHub.kt index aba8517..9565950 100644 --- a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/api/DeviceHub.kt +++ b/controls-core/src/commonMain/kotlin/space/kscience/controls/api/DeviceHub.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.controls.api +package space.kscience.controls.api import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.names.* diff --git a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/api/DeviceMessage.kt b/controls-core/src/commonMain/kotlin/space/kscience/controls/api/DeviceMessage.kt similarity index 99% rename from controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/api/DeviceMessage.kt rename to controls-core/src/commonMain/kotlin/space/kscience/controls/api/DeviceMessage.kt index 9d9bc19..8f6f0f9 100644 --- a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/api/DeviceMessage.kt +++ b/controls-core/src/commonMain/kotlin/space/kscience/controls/api/DeviceMessage.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.controls.api +package space.kscience.controls.api import kotlinx.datetime.Clock import kotlinx.datetime.Instant diff --git a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/api/Socket.kt b/controls-core/src/commonMain/kotlin/space/kscience/controls/api/Socket.kt similarity index 91% rename from controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/api/Socket.kt rename to controls-core/src/commonMain/kotlin/space/kscience/controls/api/Socket.kt index eda8942..4d1bb1e 100644 --- a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/api/Socket.kt +++ b/controls-core/src/commonMain/kotlin/space/kscience/controls/api/Socket.kt @@ -1,10 +1,9 @@ -package ru.mipt.npm.controls.api +package space.kscience.controls.api import io.ktor.utils.io.core.Closeable import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.collect import kotlinx.coroutines.launch /** diff --git a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/api/descriptors.kt b/controls-core/src/commonMain/kotlin/space/kscience/controls/api/descriptors.kt similarity index 95% rename from controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/api/descriptors.kt rename to controls-core/src/commonMain/kotlin/space/kscience/controls/api/descriptors.kt index 1e70962..8e1705b 100644 --- a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/api/descriptors.kt +++ b/controls-core/src/commonMain/kotlin/space/kscience/controls/api/descriptors.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.controls.api +package space.kscience.controls.api import kotlinx.serialization.Serializable import space.kscience.dataforge.meta.descriptors.MetaDescriptor diff --git a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/manager/DeviceManager.kt b/controls-core/src/commonMain/kotlin/space/kscience/controls/manager/DeviceManager.kt similarity index 93% rename from controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/manager/DeviceManager.kt rename to controls-core/src/commonMain/kotlin/space/kscience/controls/manager/DeviceManager.kt index 3194f78..2e7d186 100644 --- a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/manager/DeviceManager.kt +++ b/controls-core/src/commonMain/kotlin/space/kscience/controls/manager/DeviceManager.kt @@ -1,8 +1,8 @@ -package ru.mipt.npm.controls.manager +package space.kscience.controls.manager import kotlinx.coroutines.launch -import ru.mipt.npm.controls.api.Device -import ru.mipt.npm.controls.api.DeviceHub +import space.kscience.controls.api.Device +import space.kscience.controls.api.DeviceHub import space.kscience.dataforge.context.* import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.MutableMeta diff --git a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/manager/deviceMessages.kt b/controls-core/src/commonMain/kotlin/space/kscience/controls/manager/deviceMessages.kt similarity index 97% rename from controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/manager/deviceMessages.kt rename to controls-core/src/commonMain/kotlin/space/kscience/controls/manager/deviceMessages.kt index 6d47dba..ea5d34c 100644 --- a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/manager/deviceMessages.kt +++ b/controls-core/src/commonMain/kotlin/space/kscience/controls/manager/deviceMessages.kt @@ -1,11 +1,11 @@ -package ru.mipt.npm.controls.manager +package space.kscience.controls.manager import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach -import ru.mipt.npm.controls.api.* +import space.kscience.controls.api.* import space.kscience.dataforge.names.Name import space.kscience.dataforge.names.plus diff --git a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/ports/Port.kt b/controls-core/src/commonMain/kotlin/space/kscience/controls/ports/Port.kt similarity index 95% rename from controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/ports/Port.kt rename to controls-core/src/commonMain/kotlin/space/kscience/controls/ports/Port.kt index 4cf672d..e7f9504 100644 --- a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/ports/Port.kt +++ b/controls-core/src/commonMain/kotlin/space/kscience/controls/ports/Port.kt @@ -1,10 +1,10 @@ -package ru.mipt.npm.controls.ports +package space.kscience.controls.ports import kotlinx.coroutines.* import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.receiveAsFlow -import ru.mipt.npm.controls.api.Socket +import space.kscience.controls.api.Socket import space.kscience.dataforge.context.* import kotlin.coroutines.CoroutineContext diff --git a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/ports/PortProxy.kt b/controls-core/src/commonMain/kotlin/space/kscience/controls/ports/PortProxy.kt similarity index 95% rename from controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/ports/PortProxy.kt rename to controls-core/src/commonMain/kotlin/space/kscience/controls/ports/PortProxy.kt index 686992d..4e51f6f 100644 --- a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/ports/PortProxy.kt +++ b/controls-core/src/commonMain/kotlin/space/kscience/controls/ports/PortProxy.kt @@ -1,8 +1,7 @@ -package ru.mipt.npm.controls.ports +package space.kscience.controls.ports import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.flow import kotlinx.coroutines.launch import kotlinx.coroutines.sync.Mutex diff --git a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/ports/SynchronousPortHandler.kt b/controls-core/src/commonMain/kotlin/space/kscience/controls/ports/SynchronousPortHandler.kt similarity index 96% rename from controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/ports/SynchronousPortHandler.kt rename to controls-core/src/commonMain/kotlin/space/kscience/controls/ports/SynchronousPortHandler.kt index 508ce6d..6dd8849 100644 --- a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/ports/SynchronousPortHandler.kt +++ b/controls-core/src/commonMain/kotlin/space/kscience/controls/ports/SynchronousPortHandler.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.controls.ports +package space.kscience.controls.ports import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.first diff --git a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/ports/phrases.kt b/controls-core/src/commonMain/kotlin/space/kscience/controls/ports/phrases.kt similarity index 97% rename from controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/ports/phrases.kt rename to controls-core/src/commonMain/kotlin/space/kscience/controls/ports/phrases.kt index 62d075a..896d87a 100644 --- a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/ports/phrases.kt +++ b/controls-core/src/commonMain/kotlin/space/kscience/controls/ports/phrases.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.controls.ports +package space.kscience.controls.ports import io.ktor.utils.io.core.BytePacketBuilder import io.ktor.utils.io.core.readBytes diff --git a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/spec/DeviceBase.kt b/controls-core/src/commonMain/kotlin/space/kscience/controls/spec/DeviceBase.kt similarity index 98% rename from controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/spec/DeviceBase.kt rename to controls-core/src/commonMain/kotlin/space/kscience/controls/spec/DeviceBase.kt index 8ba0969..397eff7 100644 --- a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/spec/DeviceBase.kt +++ b/controls-core/src/commonMain/kotlin/space/kscience/controls/spec/DeviceBase.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.controls.spec +package space.kscience.controls.spec import kotlinx.coroutines.Job import kotlinx.coroutines.SupervisorJob @@ -7,7 +7,7 @@ import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.launch import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock -import ru.mipt.npm.controls.api.* +import space.kscience.controls.api.* import space.kscience.dataforge.context.Context import space.kscience.dataforge.context.Global import space.kscience.dataforge.meta.Meta diff --git a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/spec/DeviceMetaPropertySpec.kt b/controls-core/src/commonMain/kotlin/space/kscience/controls/spec/DeviceMetaPropertySpec.kt similarity index 75% rename from controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/spec/DeviceMetaPropertySpec.kt rename to controls-core/src/commonMain/kotlin/space/kscience/controls/spec/DeviceMetaPropertySpec.kt index 9d37ef8..809d940 100644 --- a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/spec/DeviceMetaPropertySpec.kt +++ b/controls-core/src/commonMain/kotlin/space/kscience/controls/spec/DeviceMetaPropertySpec.kt @@ -1,7 +1,7 @@ -package ru.mipt.npm.controls.spec +package space.kscience.controls.spec -import ru.mipt.npm.controls.api.Device -import ru.mipt.npm.controls.api.PropertyDescriptor +import space.kscience.controls.api.Device +import space.kscience.controls.api.PropertyDescriptor import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.transformations.MetaConverter diff --git a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/spec/DevicePropertySpec.kt b/controls-core/src/commonMain/kotlin/space/kscience/controls/spec/DevicePropertySpec.kt similarity index 93% rename from controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/spec/DevicePropertySpec.kt rename to controls-core/src/commonMain/kotlin/space/kscience/controls/spec/DevicePropertySpec.kt index 10b3b6b..c1bdc11 100644 --- a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/spec/DevicePropertySpec.kt +++ b/controls-core/src/commonMain/kotlin/space/kscience/controls/spec/DevicePropertySpec.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.controls.spec +package space.kscience.controls.spec import kotlinx.coroutines.Job import kotlinx.coroutines.flow.filter @@ -6,10 +6,10 @@ import kotlinx.coroutines.flow.filterIsInstance import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch -import ru.mipt.npm.controls.api.ActionDescriptor -import ru.mipt.npm.controls.api.Device -import ru.mipt.npm.controls.api.PropertyChangedMessage -import ru.mipt.npm.controls.api.PropertyDescriptor +import space.kscience.controls.api.ActionDescriptor +import space.kscience.controls.api.Device +import space.kscience.controls.api.PropertyChangedMessage +import space.kscience.controls.api.PropertyDescriptor import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.transformations.MetaConverter diff --git a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/spec/DeviceSpec.kt b/controls-core/src/commonMain/kotlin/space/kscience/controls/spec/DeviceSpec.kt similarity index 97% rename from controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/spec/DeviceSpec.kt rename to controls-core/src/commonMain/kotlin/space/kscience/controls/spec/DeviceSpec.kt index 9bd8ea2..67552ea 100644 --- a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/spec/DeviceSpec.kt +++ b/controls-core/src/commonMain/kotlin/space/kscience/controls/spec/DeviceSpec.kt @@ -1,9 +1,9 @@ -package ru.mipt.npm.controls.spec +package space.kscience.controls.spec import kotlinx.coroutines.withContext -import ru.mipt.npm.controls.api.ActionDescriptor -import ru.mipt.npm.controls.api.Device -import ru.mipt.npm.controls.api.PropertyDescriptor +import space.kscience.controls.api.ActionDescriptor +import space.kscience.controls.api.Device +import space.kscience.controls.api.PropertyDescriptor import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.transformations.MetaConverter import kotlin.properties.PropertyDelegateProvider diff --git a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/spec/deviceExtensions.kt b/controls-core/src/commonMain/kotlin/space/kscience/controls/spec/deviceExtensions.kt similarity index 96% rename from controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/spec/deviceExtensions.kt rename to controls-core/src/commonMain/kotlin/space/kscience/controls/spec/deviceExtensions.kt index da83fab..3a9c280 100644 --- a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/spec/deviceExtensions.kt +++ b/controls-core/src/commonMain/kotlin/space/kscience/controls/spec/deviceExtensions.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.controls.spec +package space.kscience.controls.spec import kotlinx.coroutines.Job import kotlinx.coroutines.flow.Flow diff --git a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/spec/misc.kt b/controls-core/src/commonMain/kotlin/space/kscience/controls/spec/misc.kt similarity index 94% rename from controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/spec/misc.kt rename to controls-core/src/commonMain/kotlin/space/kscience/controls/spec/misc.kt index 345f453..dfcc76e 100644 --- a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/spec/misc.kt +++ b/controls-core/src/commonMain/kotlin/space/kscience/controls/spec/misc.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.controls.spec +package space.kscience.controls.spec import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.double diff --git a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/spec/propertySpecDelegates.kt b/controls-core/src/commonMain/kotlin/space/kscience/controls/spec/propertySpecDelegates.kt similarity index 96% rename from controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/spec/propertySpecDelegates.kt rename to controls-core/src/commonMain/kotlin/space/kscience/controls/spec/propertySpecDelegates.kt index 56cd0ae..3d701e3 100644 --- a/controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/spec/propertySpecDelegates.kt +++ b/controls-core/src/commonMain/kotlin/space/kscience/controls/spec/propertySpecDelegates.kt @@ -1,7 +1,7 @@ -package ru.mipt.npm.controls.spec +package space.kscience.controls.spec -import ru.mipt.npm.controls.api.PropertyDescriptor -import ru.mipt.npm.controls.api.metaDescriptor +import space.kscience.controls.api.PropertyDescriptor +import space.kscience.controls.api.metaDescriptor import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.transformations.MetaConverter import space.kscience.dataforge.values.ValueType diff --git a/controls-core/src/jvmMain/kotlin/ru/mipt/npm/controls/misc/javaTimeMeta.kt b/controls-core/src/jvmMain/kotlin/space/kscience/controls/misc/javaTimeMeta.kt similarity index 92% rename from controls-core/src/jvmMain/kotlin/ru/mipt/npm/controls/misc/javaTimeMeta.kt rename to controls-core/src/jvmMain/kotlin/space/kscience/controls/misc/javaTimeMeta.kt index eec5774..30829b3 100644 --- a/controls-core/src/jvmMain/kotlin/ru/mipt/npm/controls/misc/javaTimeMeta.kt +++ b/controls-core/src/jvmMain/kotlin/space/kscience/controls/misc/javaTimeMeta.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.controls.misc +package space.kscience.controls.misc import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.get diff --git a/controls-core/src/jvmMain/kotlin/ru/mipt/npm/controls/ports/TcpPort.kt b/controls-core/src/jvmMain/kotlin/space/kscience/controls/ports/TcpPort.kt similarity index 98% rename from controls-core/src/jvmMain/kotlin/ru/mipt/npm/controls/ports/TcpPort.kt rename to controls-core/src/jvmMain/kotlin/space/kscience/controls/ports/TcpPort.kt index da41a47..2ef0d89 100644 --- a/controls-core/src/jvmMain/kotlin/ru/mipt/npm/controls/ports/TcpPort.kt +++ b/controls-core/src/jvmMain/kotlin/space/kscience/controls/ports/TcpPort.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.controls.ports +package space.kscience.controls.ports import kotlinx.coroutines.* import space.kscience.dataforge.context.Context diff --git a/controls-core/src/jvmMain/kotlin/ru/mipt/npm/controls/spec/getDeviceProperty.kt b/controls-core/src/jvmMain/kotlin/space/kscience/controls/spec/getDeviceProperty.kt similarity index 69% rename from controls-core/src/jvmMain/kotlin/ru/mipt/npm/controls/spec/getDeviceProperty.kt rename to controls-core/src/jvmMain/kotlin/space/kscience/controls/spec/getDeviceProperty.kt index 39c92e9..4a783e2 100644 --- a/controls-core/src/jvmMain/kotlin/ru/mipt/npm/controls/spec/getDeviceProperty.kt +++ b/controls-core/src/jvmMain/kotlin/space/kscience/controls/spec/getDeviceProperty.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.controls.spec +package space.kscience.controls.spec import kotlinx.coroutines.runBlocking diff --git a/controls-core/src/jvmTest/kotlin/ru/mipt/npm/controls/ports/PortIOTest.kt b/controls-core/src/jvmTest/kotlin/space/kscience/controls/ports/PortIOTest.kt similarity index 95% rename from controls-core/src/jvmTest/kotlin/ru/mipt/npm/controls/ports/PortIOTest.kt rename to controls-core/src/jvmTest/kotlin/space/kscience/controls/ports/PortIOTest.kt index cdb3107..bdf6891 100644 --- a/controls-core/src/jvmTest/kotlin/ru/mipt/npm/controls/ports/PortIOTest.kt +++ b/controls-core/src/jvmTest/kotlin/space/kscience/controls/ports/PortIOTest.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.controls.ports +package space.kscience.controls.ports import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.map diff --git a/controls-magix-client/src/commonMain/kotlin/ru/mipt/npm/controls/client/controlsMagix.kt b/controls-magix-client/src/commonMain/kotlin/space/kscience/controls/client/controlsMagix.kt similarity index 87% rename from controls-magix-client/src/commonMain/kotlin/ru/mipt/npm/controls/client/controlsMagix.kt rename to controls-magix-client/src/commonMain/kotlin/space/kscience/controls/client/controlsMagix.kt index d5fa09d..7355df0 100644 --- a/controls-magix-client/src/commonMain/kotlin/ru/mipt/npm/controls/client/controlsMagix.kt +++ b/controls-magix-client/src/commonMain/kotlin/space/kscience/controls/client/controlsMagix.kt @@ -1,15 +1,15 @@ -package ru.mipt.npm.controls.client +package space.kscience.controls.client import kotlinx.coroutines.Job import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch -import ru.mipt.npm.controls.api.DeviceMessage -import ru.mipt.npm.controls.manager.DeviceManager -import ru.mipt.npm.controls.manager.hubMessageFlow -import ru.mipt.npm.controls.manager.respondHubMessage import ru.mipt.npm.magix.api.* +import space.kscience.controls.api.DeviceMessage +import space.kscience.controls.manager.DeviceManager +import space.kscience.controls.manager.hubMessageFlow +import space.kscience.controls.manager.respondHubMessage import space.kscience.dataforge.context.error import space.kscience.dataforge.context.logger diff --git a/controls-magix-client/src/commonMain/kotlin/ru/mipt/npm/controls/client/doocsMagix.kt b/controls-magix-client/src/commonMain/kotlin/space/kscience/controls/client/doocsMagix.kt similarity index 99% rename from controls-magix-client/src/commonMain/kotlin/ru/mipt/npm/controls/client/doocsMagix.kt rename to controls-magix-client/src/commonMain/kotlin/space/kscience/controls/client/doocsMagix.kt index 8f42deb..5655189 100644 --- a/controls-magix-client/src/commonMain/kotlin/ru/mipt/npm/controls/client/doocsMagix.kt +++ b/controls-magix-client/src/commonMain/kotlin/space/kscience/controls/client/doocsMagix.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.controls.client +package space.kscience.controls.client import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/controls-magix-client/src/commonMain/kotlin/ru/mipt/npm/controls/client/tangoMagix.kt b/controls-magix-client/src/commonMain/kotlin/space/kscience/controls/client/tangoMagix.kt similarity index 96% rename from controls-magix-client/src/commonMain/kotlin/ru/mipt/npm/controls/client/tangoMagix.kt rename to controls-magix-client/src/commonMain/kotlin/space/kscience/controls/client/tangoMagix.kt index 8a88868..1638d85 100644 --- a/controls-magix-client/src/commonMain/kotlin/ru/mipt/npm/controls/client/tangoMagix.kt +++ b/controls-magix-client/src/commonMain/kotlin/space/kscience/controls/client/tangoMagix.kt @@ -1,14 +1,14 @@ -package ru.mipt.npm.controls.client +package space.kscience.controls.client import kotlinx.coroutines.Job import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch import kotlinx.serialization.Serializable -import ru.mipt.npm.controls.api.get -import ru.mipt.npm.controls.api.getOrReadProperty -import ru.mipt.npm.controls.manager.DeviceManager import ru.mipt.npm.magix.api.* +import space.kscience.controls.api.get +import space.kscience.controls.api.getOrReadProperty +import space.kscience.controls.manager.DeviceManager import space.kscience.dataforge.context.error import space.kscience.dataforge.context.logger import space.kscience.dataforge.meta.Meta diff --git a/controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/client/MetaBsdParser.kt b/controls-opcua/src/main/kotlin/space/kscience/controls/opcua/client/MetaBsdParser.kt similarity index 98% rename from controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/client/MetaBsdParser.kt rename to controls-opcua/src/main/kotlin/space/kscience/controls/opcua/client/MetaBsdParser.kt index 171b74e..2cfe632 100644 --- a/controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/client/MetaBsdParser.kt +++ b/controls-opcua/src/main/kotlin/space/kscience/controls/opcua/client/MetaBsdParser.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.controls.opcua.client +package space.kscience.controls.opcua.client import org.eclipse.milo.opcua.binaryschema.AbstractCodec import org.eclipse.milo.opcua.binaryschema.parser.BsdParser @@ -11,8 +11,8 @@ import org.eclipse.milo.opcua.stack.core.types.builtin.* import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.* import org.opcfoundation.opcua.binaryschema.EnumeratedType import org.opcfoundation.opcua.binaryschema.StructuredType -import ru.mipt.npm.controls.misc.instant -import ru.mipt.npm.controls.misc.toMeta +import space.kscience.controls.misc.instant +import space.kscience.controls.misc.toMeta import space.kscience.dataforge.meta.* import space.kscience.dataforge.names.Name import space.kscience.dataforge.names.asName diff --git a/controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/client/MiloDevice.kt b/controls-opcua/src/main/kotlin/space/kscience/controls/opcua/client/MiloDevice.kt similarity index 96% rename from controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/client/MiloDevice.kt rename to controls-opcua/src/main/kotlin/space/kscience/controls/opcua/client/MiloDevice.kt index 04393fc..7172e22 100644 --- a/controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/client/MiloDevice.kt +++ b/controls-opcua/src/main/kotlin/space/kscience/controls/opcua/client/MiloDevice.kt @@ -1,11 +1,11 @@ -package ru.mipt.npm.controls.opcua.client +package space.kscience.controls.opcua.client import kotlinx.coroutines.future.await import kotlinx.serialization.json.Json import org.eclipse.milo.opcua.sdk.client.OpcUaClient import org.eclipse.milo.opcua.stack.core.types.builtin.* import org.eclipse.milo.opcua.stack.core.types.enumerated.TimestampsToReturn -import ru.mipt.npm.controls.api.Device +import space.kscience.controls.api.Device import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.MetaSerializer import space.kscience.dataforge.meta.transformations.MetaConverter diff --git a/controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/client/MiloDeviceBySpec.kt b/controls-opcua/src/main/kotlin/space/kscience/controls/opcua/client/MiloDeviceBySpec.kt similarity index 93% rename from controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/client/MiloDeviceBySpec.kt rename to controls-opcua/src/main/kotlin/space/kscience/controls/opcua/client/MiloDeviceBySpec.kt index d76fc75..cae0f5e 100644 --- a/controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/client/MiloDeviceBySpec.kt +++ b/controls-opcua/src/main/kotlin/space/kscience/controls/opcua/client/MiloDeviceBySpec.kt @@ -1,11 +1,11 @@ -package ru.mipt.npm.controls.opcua.client +package space.kscience.controls.opcua.client import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking import org.eclipse.milo.opcua.sdk.client.OpcUaClient import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId -import ru.mipt.npm.controls.spec.DeviceBySpec -import ru.mipt.npm.controls.spec.DeviceSpec +import space.kscience.controls.spec.DeviceBySpec +import space.kscience.controls.spec.DeviceSpec import space.kscience.dataforge.context.Context import space.kscience.dataforge.context.Global import space.kscience.dataforge.meta.Meta diff --git a/controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/client/miloClient.kt b/controls-opcua/src/main/kotlin/space/kscience/controls/opcua/client/miloClient.kt similarity index 98% rename from controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/client/miloClient.kt rename to controls-opcua/src/main/kotlin/space/kscience/controls/opcua/client/miloClient.kt index 2d489d6..8415b3a 100644 --- a/controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/client/miloClient.kt +++ b/controls-opcua/src/main/kotlin/space/kscience/controls/opcua/client/miloClient.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.controls.opcua.client +package space.kscience.controls.opcua.client import org.eclipse.milo.opcua.sdk.client.OpcUaClient import org.eclipse.milo.opcua.sdk.client.api.config.OpcUaClientConfigBuilder diff --git a/controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/server/DeviceNameSpace.kt b/controls-opcua/src/main/kotlin/space/kscience/controls/opcua/server/DeviceNameSpace.kt similarity index 95% rename from controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/server/DeviceNameSpace.kt rename to controls-opcua/src/main/kotlin/space/kscience/controls/opcua/server/DeviceNameSpace.kt index 8b95d8e..8686764 100644 --- a/controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/server/DeviceNameSpace.kt +++ b/controls-opcua/src/main/kotlin/space/kscience/controls/opcua/server/DeviceNameSpace.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.controls.opcua.server +package space.kscience.controls.opcua.server import kotlinx.coroutines.launch import kotlinx.datetime.toJavaInstant @@ -18,11 +18,11 @@ import org.eclipse.milo.opcua.stack.core.AttributeId import org.eclipse.milo.opcua.stack.core.Identifiers import org.eclipse.milo.opcua.stack.core.types.builtin.DateTime import org.eclipse.milo.opcua.stack.core.types.builtin.LocalizedText -import ru.mipt.npm.controls.api.Device -import ru.mipt.npm.controls.api.DeviceHub -import ru.mipt.npm.controls.api.PropertyDescriptor -import ru.mipt.npm.controls.api.onPropertyChange -import ru.mipt.npm.controls.manager.DeviceManager +import space.kscience.controls.api.Device +import space.kscience.controls.api.DeviceHub +import space.kscience.controls.api.PropertyDescriptor +import space.kscience.controls.api.onPropertyChange +import space.kscience.controls.manager.DeviceManager import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.MetaSerializer import space.kscience.dataforge.names.Name diff --git a/controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/server/metaToOpc.kt b/controls-opcua/src/main/kotlin/space/kscience/controls/opcua/server/metaToOpc.kt similarity index 96% rename from controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/server/metaToOpc.kt rename to controls-opcua/src/main/kotlin/space/kscience/controls/opcua/server/metaToOpc.kt index cbcd2ec..5294625 100644 --- a/controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/server/metaToOpc.kt +++ b/controls-opcua/src/main/kotlin/space/kscience/controls/opcua/server/metaToOpc.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.controls.opcua.server +package space.kscience.controls.opcua.server import kotlinx.serialization.json.Json import org.eclipse.milo.opcua.stack.core.types.builtin.DataValue diff --git a/controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/server/nodeUtils.kt b/controls-opcua/src/main/kotlin/space/kscience/controls/opcua/server/nodeUtils.kt similarity index 98% rename from controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/server/nodeUtils.kt rename to controls-opcua/src/main/kotlin/space/kscience/controls/opcua/server/nodeUtils.kt index 783c229..26e0dfe 100644 --- a/controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/server/nodeUtils.kt +++ b/controls-opcua/src/main/kotlin/space/kscience/controls/opcua/server/nodeUtils.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.controls.opcua.server +package space.kscience.controls.opcua.server import org.eclipse.milo.opcua.sdk.core.AccessLevel import org.eclipse.milo.opcua.sdk.core.Reference diff --git a/controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/server/serverUtils.kt b/controls-opcua/src/main/kotlin/space/kscience/controls/opcua/server/serverUtils.kt similarity index 96% rename from controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/server/serverUtils.kt rename to controls-opcua/src/main/kotlin/space/kscience/controls/opcua/server/serverUtils.kt index 6ba3d36..083d953 100644 --- a/controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/server/serverUtils.kt +++ b/controls-opcua/src/main/kotlin/space/kscience/controls/opcua/server/serverUtils.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.controls.opcua.server +package space.kscience.controls.opcua.server import org.eclipse.milo.opcua.sdk.server.OpcUaServer import org.eclipse.milo.opcua.sdk.server.api.config.OpcUaServerConfig diff --git a/controls-serial/src/main/kotlin/ru/mipt/npm/controls/serial/SerialPort.kt b/controls-serial/src/main/kotlin/space/kscience/controls/serial/SerialPort.kt similarity index 93% rename from controls-serial/src/main/kotlin/ru/mipt/npm/controls/serial/SerialPort.kt rename to controls-serial/src/main/kotlin/space/kscience/controls/serial/SerialPort.kt index 1c9ad27..eab88b6 100644 --- a/controls-serial/src/main/kotlin/ru/mipt/npm/controls/serial/SerialPort.kt +++ b/controls-serial/src/main/kotlin/space/kscience/controls/serial/SerialPort.kt @@ -1,10 +1,10 @@ -package ru.mipt.npm.controls.serial +package space.kscience.controls.serial import jssc.SerialPort.* import jssc.SerialPortEventListener -import ru.mipt.npm.controls.ports.AbstractPort -import ru.mipt.npm.controls.ports.Port -import ru.mipt.npm.controls.ports.PortFactory +import space.kscience.controls.ports.AbstractPort +import space.kscience.controls.ports.Port +import space.kscience.controls.ports.PortFactory import space.kscience.dataforge.context.Context import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.int diff --git a/controls-server/src/main/kotlin/ru/mipt/npm/controls/server/deviceWebServer.kt b/controls-server/src/main/kotlin/space/kscience/controls/server/deviceWebServer.kt similarity index 95% rename from controls-server/src/main/kotlin/ru/mipt/npm/controls/server/deviceWebServer.kt rename to controls-server/src/main/kotlin/space/kscience/controls/server/deviceWebServer.kt index a2c67dd..881ad1b 100644 --- a/controls-server/src/main/kotlin/ru/mipt/npm/controls/server/deviceWebServer.kt +++ b/controls-server/src/main/kotlin/space/kscience/controls/server/deviceWebServer.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.controls.server +package space.kscience.controls.server import io.ktor.http.HttpStatusCode @@ -26,16 +26,16 @@ import kotlinx.serialization.json.Json import kotlinx.serialization.json.buildJsonArray import kotlinx.serialization.json.encodeToJsonElement import kotlinx.serialization.json.put -import ru.mipt.npm.controls.api.DeviceMessage -import ru.mipt.npm.controls.api.PropertyGetMessage -import ru.mipt.npm.controls.api.PropertySetMessage -import ru.mipt.npm.controls.api.getOrNull -import ru.mipt.npm.controls.manager.DeviceManager -import ru.mipt.npm.controls.manager.respondHubMessage import ru.mipt.npm.magix.api.MagixEndpoint import ru.mipt.npm.magix.api.MagixMessage import ru.mipt.npm.magix.server.launchMagixServerRawRSocket import ru.mipt.npm.magix.server.magixModule +import space.kscience.controls.api.DeviceMessage +import space.kscience.controls.api.PropertyGetMessage +import space.kscience.controls.api.PropertySetMessage +import space.kscience.controls.api.getOrNull +import space.kscience.controls.manager.DeviceManager +import space.kscience.controls.manager.respondHubMessage import space.kscience.dataforge.meta.toMeta import space.kscience.dataforge.names.Name import space.kscience.dataforge.names.asName diff --git a/controls-server/src/main/kotlin/ru/mipt/npm/controls/server/responses.kt b/controls-server/src/main/kotlin/space/kscience/controls/server/responses.kt similarity index 91% rename from controls-server/src/main/kotlin/ru/mipt/npm/controls/server/responses.kt rename to controls-server/src/main/kotlin/space/kscience/controls/server/responses.kt index fe56b96..96912e2 100644 --- a/controls-server/src/main/kotlin/ru/mipt/npm/controls/server/responses.kt +++ b/controls-server/src/main/kotlin/space/kscience/controls/server/responses.kt @@ -1,12 +1,12 @@ -package ru.mipt.npm.controls.server +package space.kscience.controls.server import io.ktor.http.ContentType import io.ktor.server.application.ApplicationCall import io.ktor.server.response.respondText import kotlinx.serialization.json.JsonObjectBuilder import kotlinx.serialization.json.buildJsonObject -import ru.mipt.npm.controls.api.DeviceMessage import ru.mipt.npm.magix.api.MagixEndpoint +import space.kscience.controls.api.DeviceMessage //internal fun Frame.toEnvelope(): Envelope { diff --git a/controls-storage/controls-xodus/src/main/kotlin/ru/mipt/npm/controls/xodus/XodusDeviceMessageStorage.kt b/controls-storage/controls-xodus/src/main/kotlin/space/kscience/controls/xodus/XodusDeviceMessageStorage.kt similarity index 96% rename from controls-storage/controls-xodus/src/main/kotlin/ru/mipt/npm/controls/xodus/XodusDeviceMessageStorage.kt rename to controls-storage/controls-xodus/src/main/kotlin/space/kscience/controls/xodus/XodusDeviceMessageStorage.kt index fd2f79b..2255d89 100644 --- a/controls-storage/controls-xodus/src/main/kotlin/ru/mipt/npm/controls/xodus/XodusDeviceMessageStorage.kt +++ b/controls-storage/controls-xodus/src/main/kotlin/space/kscience/controls/xodus/XodusDeviceMessageStorage.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.controls.xodus +package space.kscience.controls.xodus import jetbrains.exodus.entitystore.Entity import jetbrains.exodus.entitystore.PersistentEntityStore @@ -11,9 +11,9 @@ import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import kotlinx.serialization.json.jsonObject import kotlinx.serialization.json.jsonPrimitive -import ru.mipt.npm.controls.api.DeviceMessage -import ru.mipt.npm.controls.storage.DeviceMessageStorage -import ru.mipt.npm.controls.storage.workDirectory +import space.kscience.controls.api.DeviceMessage +import space.kscience.controls.storage.DeviceMessageStorage +import space.kscience.controls.storage.workDirectory import space.kscience.dataforge.context.Context import space.kscience.dataforge.context.Factory import space.kscience.dataforge.context.fetch diff --git a/controls-storage/controls-xodus/src/test/kotlin/PropertyHistoryTest.kt b/controls-storage/controls-xodus/src/test/kotlin/PropertyHistoryTest.kt index 618569f..1724079 100644 --- a/controls-storage/controls-xodus/src/test/kotlin/PropertyHistoryTest.kt +++ b/controls-storage/controls-xodus/src/test/kotlin/PropertyHistoryTest.kt @@ -6,10 +6,10 @@ import org.junit.jupiter.api.AfterAll import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.Test -import ru.mipt.npm.controls.api.PropertyChangedMessage -import ru.mipt.npm.controls.xodus.XodusDeviceMessageStorage -import ru.mipt.npm.controls.xodus.query -import ru.mipt.npm.controls.xodus.writeMessage +import space.kscience.controls.api.PropertyChangedMessage +import space.kscience.controls.xodus.XodusDeviceMessageStorage +import space.kscience.controls.xodus.query +import space.kscience.controls.xodus.writeMessage import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.names.Name import space.kscience.dataforge.names.asName diff --git a/controls-storage/src/commonMain/kotlin/ru/mipt/npm/controls/storage/DeviceMessageStorage.kt b/controls-storage/src/commonMain/kotlin/space/kscience/controls/storage/DeviceMessageStorage.kt similarity index 84% rename from controls-storage/src/commonMain/kotlin/ru/mipt/npm/controls/storage/DeviceMessageStorage.kt rename to controls-storage/src/commonMain/kotlin/space/kscience/controls/storage/DeviceMessageStorage.kt index 7c5a8bb..87f4b74 100644 --- a/controls-storage/src/commonMain/kotlin/ru/mipt/npm/controls/storage/DeviceMessageStorage.kt +++ b/controls-storage/src/commonMain/kotlin/space/kscience/controls/storage/DeviceMessageStorage.kt @@ -1,7 +1,7 @@ -package ru.mipt.npm.controls.storage +package space.kscience.controls.storage import kotlinx.datetime.Instant -import ru.mipt.npm.controls.api.DeviceMessage +import space.kscience.controls.api.DeviceMessage import space.kscience.dataforge.names.Name /** diff --git a/controls-storage/src/commonMain/kotlin/ru/mipt/npm/controls/storage/storageCommon.kt b/controls-storage/src/commonMain/kotlin/space/kscience/controls/storage/storageCommon.kt similarity index 91% rename from controls-storage/src/commonMain/kotlin/ru/mipt/npm/controls/storage/storageCommon.kt rename to controls-storage/src/commonMain/kotlin/space/kscience/controls/storage/storageCommon.kt index 9d9c058..672e2cc 100644 --- a/controls-storage/src/commonMain/kotlin/ru/mipt/npm/controls/storage/storageCommon.kt +++ b/controls-storage/src/commonMain/kotlin/space/kscience/controls/storage/storageCommon.kt @@ -1,13 +1,13 @@ -package ru.mipt.npm.controls.storage +package space.kscience.controls.storage import kotlinx.coroutines.Job import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onCompletion import kotlinx.coroutines.flow.onEach -import ru.mipt.npm.controls.api.DeviceMessage -import ru.mipt.npm.controls.manager.DeviceManager -import ru.mipt.npm.controls.manager.hubMessageFlow +import space.kscience.controls.api.DeviceMessage +import space.kscience.controls.manager.DeviceManager +import space.kscience.controls.manager.hubMessageFlow import space.kscience.dataforge.context.Factory import space.kscience.dataforge.context.debug import space.kscience.dataforge.context.logger diff --git a/controls-storage/src/jvmMain/kotlin/ru/mipt/npm/controls/storage/storageJvm.kt b/controls-storage/src/jvmMain/kotlin/space/kscience/controls/storage/storageJvm.kt similarity index 97% rename from controls-storage/src/jvmMain/kotlin/ru/mipt/npm/controls/storage/storageJvm.kt rename to controls-storage/src/jvmMain/kotlin/space/kscience/controls/storage/storageJvm.kt index 3960ccd..40811a4 100644 --- a/controls-storage/src/jvmMain/kotlin/ru/mipt/npm/controls/storage/storageJvm.kt +++ b/controls-storage/src/jvmMain/kotlin/space/kscience/controls/storage/storageJvm.kt @@ -1,4 +1,4 @@ -//package ru.mipt.npm.controls.storage +//package space.kscience.controls.storage // //import io.ktor.server.application.Application //import kotlinx.coroutines.InternalCoroutinesApi diff --git a/controls-storage/src/jvmMain/kotlin/ru/mipt/npm/controls/storage/workDirectory.kt b/controls-storage/src/jvmMain/kotlin/space/kscience/controls/storage/workDirectory.kt similarity index 95% rename from controls-storage/src/jvmMain/kotlin/ru/mipt/npm/controls/storage/workDirectory.kt rename to controls-storage/src/jvmMain/kotlin/space/kscience/controls/storage/workDirectory.kt index 76d8439..7e4086f 100644 --- a/controls-storage/src/jvmMain/kotlin/ru/mipt/npm/controls/storage/workDirectory.kt +++ b/controls-storage/src/jvmMain/kotlin/space/kscience/controls/storage/workDirectory.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.controls.storage +package space.kscience.controls.storage import space.kscience.dataforge.context.ContextBuilder import space.kscience.dataforge.io.IOPlugin diff --git a/controls-tcp/src/main/kotlin/ru/mipt/npm/controls/ports/KtorTcpPort.kt b/controls-tcp/src/main/kotlin/space/kscience/controls/ports/KtorTcpPort.kt similarity index 98% rename from controls-tcp/src/main/kotlin/ru/mipt/npm/controls/ports/KtorTcpPort.kt rename to controls-tcp/src/main/kotlin/space/kscience/controls/ports/KtorTcpPort.kt index ca2cf61..2c77aa5 100644 --- a/controls-tcp/src/main/kotlin/ru/mipt/npm/controls/ports/KtorTcpPort.kt +++ b/controls-tcp/src/main/kotlin/space/kscience/controls/ports/KtorTcpPort.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.controls.ports +package space.kscience.controls.ports import io.ktor.network.selector.ActorSelectorManager import io.ktor.network.sockets.aSocket diff --git a/demo/all-things/build.gradle.kts b/demo/all-things/build.gradle.kts index f4c06ef..53a57e4 100644 --- a/demo/all-things/build.gradle.kts +++ b/demo/all-things/build.gradle.kts @@ -42,5 +42,5 @@ javafx { } application { - mainClass.set("ru.mipt.npm.controls.demo.DemoControllerViewKt") + mainClass.set("space.kscience.controls.demo.DemoControllerViewKt") } \ No newline at end of file diff --git a/demo/all-things/src/main/kotlin/ru/mipt/npm/controls/demo/DemoControllerView.kt b/demo/all-things/src/main/kotlin/space/kscience/controls/demo/DemoControllerView.kt similarity index 87% rename from demo/all-things/src/main/kotlin/ru/mipt/npm/controls/demo/DemoControllerView.kt rename to demo/all-things/src/main/kotlin/space/kscience/controls/demo/DemoControllerView.kt index ba6ff8e..a37430f 100644 --- a/demo/all-things/src/main/kotlin/ru/mipt/npm/controls/demo/DemoControllerView.kt +++ b/demo/all-things/src/main/kotlin/space/kscience/controls/demo/DemoControllerView.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.controls.demo +package space.kscience.controls.demo import io.ktor.server.engine.ApplicationEngine import javafx.scene.Parent @@ -8,19 +8,19 @@ import javafx.stage.Stage import kotlinx.coroutines.launch import org.eclipse.milo.opcua.sdk.server.OpcUaServer import org.eclipse.milo.opcua.stack.core.types.builtin.LocalizedText -import ru.mipt.npm.controls.client.connectToMagix -import ru.mipt.npm.controls.demo.DemoDevice.Companion.cosScale -import ru.mipt.npm.controls.demo.DemoDevice.Companion.sinScale -import ru.mipt.npm.controls.demo.DemoDevice.Companion.timeScale -import ru.mipt.npm.controls.manager.DeviceManager -import ru.mipt.npm.controls.manager.install -import ru.mipt.npm.controls.opcua.server.OpcUaServer -import ru.mipt.npm.controls.opcua.server.endpoint -import ru.mipt.npm.controls.opcua.server.serveDevices import ru.mipt.npm.magix.api.MagixEndpoint import ru.mipt.npm.magix.rsocket.rSocketWithTcp import ru.mipt.npm.magix.rsocket.rSocketWithWebSockets import ru.mipt.npm.magix.server.startMagixServer +import space.kscience.controls.client.connectToMagix +import space.kscience.controls.demo.DemoDevice.Companion.cosScale +import space.kscience.controls.demo.DemoDevice.Companion.sinScale +import space.kscience.controls.demo.DemoDevice.Companion.timeScale +import space.kscience.controls.manager.DeviceManager +import space.kscience.controls.manager.install +import space.kscience.controls.opcua.server.OpcUaServer +import space.kscience.controls.opcua.server.endpoint +import space.kscience.controls.opcua.server.serveDevices import space.kscience.dataforge.context.* import tornadofx.* import java.awt.Desktop @@ -32,7 +32,7 @@ class DemoController : Controller(), ContextAware { var magixServer: ApplicationEngine? = null var visualizer: ApplicationEngine? = null var opcUaServer: OpcUaServer = OpcUaServer { - setApplicationName(LocalizedText.english("ru.mipt.npm.controls.opcua")) + setApplicationName(LocalizedText.english("space.kscience.controls.opcua")) endpoint { setBindPort(9999) //use default endpoint diff --git a/demo/all-things/src/main/kotlin/ru/mipt/npm/controls/demo/DemoDevice.kt b/demo/all-things/src/main/kotlin/space/kscience/controls/demo/DemoDevice.kt similarity index 95% rename from demo/all-things/src/main/kotlin/ru/mipt/npm/controls/demo/DemoDevice.kt rename to demo/all-things/src/main/kotlin/space/kscience/controls/demo/DemoDevice.kt index 9bd45cf..26ac20b 100644 --- a/demo/all-things/src/main/kotlin/ru/mipt/npm/controls/demo/DemoDevice.kt +++ b/demo/all-things/src/main/kotlin/space/kscience/controls/demo/DemoDevice.kt @@ -1,8 +1,8 @@ -package ru.mipt.npm.controls.demo +package space.kscience.controls.demo import kotlinx.coroutines.launch -import ru.mipt.npm.controls.api.metaDescriptor -import ru.mipt.npm.controls.spec.* +import space.kscience.controls.api.metaDescriptor +import space.kscience.controls.spec.* import space.kscience.dataforge.context.Context import space.kscience.dataforge.context.Factory import space.kscience.dataforge.meta.Meta diff --git a/demo/all-things/src/main/kotlin/ru/mipt/npm/controls/demo/demoDeviceServer.kt b/demo/all-things/src/main/kotlin/space/kscience/controls/demo/demoDeviceServer.kt similarity index 96% rename from demo/all-things/src/main/kotlin/ru/mipt/npm/controls/demo/demoDeviceServer.kt rename to demo/all-things/src/main/kotlin/space/kscience/controls/demo/demoDeviceServer.kt index 0794f03..29791ae 100644 --- a/demo/all-things/src/main/kotlin/ru/mipt/npm/controls/demo/demoDeviceServer.kt +++ b/demo/all-things/src/main/kotlin/space/kscience/controls/demo/demoDeviceServer.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.controls.demo +package space.kscience.controls.demo import io.ktor.server.application.install import io.ktor.server.cio.CIO @@ -11,10 +11,10 @@ import kotlinx.coroutines.flow.* import kotlinx.coroutines.launch import kotlinx.html.div import kotlinx.html.link -import ru.mipt.npm.controls.api.PropertyChangedMessage -import ru.mipt.npm.controls.client.controlsMagixFormat import ru.mipt.npm.magix.api.MagixEndpoint import ru.mipt.npm.magix.api.subscribe +import space.kscience.controls.api.PropertyChangedMessage +import space.kscience.controls.client.controlsMagixFormat import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.double import space.kscience.plotly.layout diff --git a/demo/all-things/src/main/kotlin/ru/mipt/npm/controls/demo/generateMessageSchema.kt b/demo/all-things/src/main/kotlin/space/kscience/controls/demo/generateMessageSchema.kt similarity index 72% rename from demo/all-things/src/main/kotlin/ru/mipt/npm/controls/demo/generateMessageSchema.kt rename to demo/all-things/src/main/kotlin/space/kscience/controls/demo/generateMessageSchema.kt index 85522a5..d50ec2c 100644 --- a/demo/all-things/src/main/kotlin/ru/mipt/npm/controls/demo/generateMessageSchema.kt +++ b/demo/all-things/src/main/kotlin/space/kscience/controls/demo/generateMessageSchema.kt @@ -1,8 +1,8 @@ -package ru.mipt.npm.controls.demo +package space.kscience.controls.demo //import com.github.ricky12awesome.jss.encodeToSchema //import com.github.ricky12awesome.jss.globalJson -//import ru.mipt.npm.controls.api.DeviceMessage +//import space.kscience.controls.api.DeviceMessage //fun main() { // val schema = globalJson.encodeToSchema(DeviceMessage.serializer(), generateDefinitions = false) diff --git a/demo/car/build.gradle.kts b/demo/car/build.gradle.kts index 63d48ed..09555d6 100644 --- a/demo/car/build.gradle.kts +++ b/demo/car/build.gradle.kts @@ -47,5 +47,5 @@ javafx { } application { - mainClass.set("ru.mipt.npm.controls.demo.car.VirtualCarControllerKt") + mainClass.set("space.kscience.controls.demo.car.VirtualCarControllerKt") } \ No newline at end of file diff --git a/demo/car/src/main/kotlin/ru/mipt/npm/controls/demo/car/IVirtualCar.kt b/demo/car/src/main/kotlin/space/kscience/controls/demo/car/IVirtualCar.kt similarity index 81% rename from demo/car/src/main/kotlin/ru/mipt/npm/controls/demo/car/IVirtualCar.kt rename to demo/car/src/main/kotlin/space/kscience/controls/demo/car/IVirtualCar.kt index b7a2a97..3bb8c79 100644 --- a/demo/car/src/main/kotlin/ru/mipt/npm/controls/demo/car/IVirtualCar.kt +++ b/demo/car/src/main/kotlin/space/kscience/controls/demo/car/IVirtualCar.kt @@ -1,7 +1,7 @@ -package ru.mipt.npm.controls.demo.car +package space.kscience.controls.demo.car -import ru.mipt.npm.controls.api.Device -import ru.mipt.npm.controls.spec.DeviceSpec +import space.kscience.controls.api.Device +import space.kscience.controls.spec.DeviceSpec interface IVirtualCar : Device { var speedState: Vector2D diff --git a/demo/car/src/main/kotlin/ru/mipt/npm/controls/demo/car/MagixVirtualCar.kt b/demo/car/src/main/kotlin/space/kscience/controls/demo/car/MagixVirtualCar.kt similarity index 90% rename from demo/car/src/main/kotlin/ru/mipt/npm/controls/demo/car/MagixVirtualCar.kt rename to demo/car/src/main/kotlin/space/kscience/controls/demo/car/MagixVirtualCar.kt index 0aaf7ab..48eaa15 100644 --- a/demo/car/src/main/kotlin/ru/mipt/npm/controls/demo/car/MagixVirtualCar.kt +++ b/demo/car/src/main/kotlin/space/kscience/controls/demo/car/MagixVirtualCar.kt @@ -1,11 +1,11 @@ -package ru.mipt.npm.controls.demo.car +package space.kscience.controls.demo.car import kotlinx.coroutines.launch -import ru.mipt.npm.controls.api.PropertyChangedMessage -import ru.mipt.npm.controls.client.controlsMagixFormat import ru.mipt.npm.magix.api.MagixEndpoint import ru.mipt.npm.magix.api.subscribe import ru.mipt.npm.magix.rsocket.rSocketWithWebSockets +import space.kscience.controls.api.PropertyChangedMessage +import space.kscience.controls.client.controlsMagixFormat import space.kscience.dataforge.context.Context import space.kscience.dataforge.context.Factory import space.kscience.dataforge.meta.Meta diff --git a/demo/car/src/main/kotlin/ru/mipt/npm/controls/demo/car/VirtualCar.kt b/demo/car/src/main/kotlin/space/kscience/controls/demo/car/VirtualCar.kt similarity index 96% rename from demo/car/src/main/kotlin/ru/mipt/npm/controls/demo/car/VirtualCar.kt rename to demo/car/src/main/kotlin/space/kscience/controls/demo/car/VirtualCar.kt index 18fc440..a1240a4 100644 --- a/demo/car/src/main/kotlin/ru/mipt/npm/controls/demo/car/VirtualCar.kt +++ b/demo/car/src/main/kotlin/space/kscience/controls/demo/car/VirtualCar.kt @@ -1,13 +1,13 @@ @file:OptIn(ExperimentalTime::class) -package ru.mipt.npm.controls.demo.car +package space.kscience.controls.demo.car import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlinx.datetime.Clock import kotlinx.datetime.Instant -import ru.mipt.npm.controls.spec.DeviceBySpec -import ru.mipt.npm.controls.spec.doRecurring +import space.kscience.controls.spec.DeviceBySpec +import space.kscience.controls.spec.doRecurring import space.kscience.dataforge.context.Context import space.kscience.dataforge.context.Factory import space.kscience.dataforge.meta.Meta diff --git a/demo/car/src/main/kotlin/ru/mipt/npm/controls/demo/car/VirtualCarController.kt b/demo/car/src/main/kotlin/space/kscience/controls/demo/car/VirtualCarController.kt similarity index 92% rename from demo/car/src/main/kotlin/ru/mipt/npm/controls/demo/car/VirtualCarController.kt rename to demo/car/src/main/kotlin/space/kscience/controls/demo/car/VirtualCarController.kt index 3e5d968..143969e 100644 --- a/demo/car/src/main/kotlin/ru/mipt/npm/controls/demo/car/VirtualCarController.kt +++ b/demo/car/src/main/kotlin/space/kscience/controls/demo/car/VirtualCarController.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.controls.demo.car +package space.kscience.controls.demo.car import io.ktor.server.engine.ApplicationEngine import javafx.beans.property.DoubleProperty @@ -8,16 +8,16 @@ import javafx.scene.layout.Priority import javafx.stage.Stage import kotlinx.coroutines.Job import kotlinx.coroutines.launch -import ru.mipt.npm.controls.client.connectToMagix -import ru.mipt.npm.controls.demo.car.IVirtualCar.Companion.acceleration -import ru.mipt.npm.controls.manager.DeviceManager -import ru.mipt.npm.controls.manager.install -import ru.mipt.npm.controls.storage.storeMessages -import ru.mipt.npm.controls.xodus.XodusDeviceMessageStorage import ru.mipt.npm.magix.api.MagixEndpoint import ru.mipt.npm.magix.rsocket.rSocketWithTcp import ru.mipt.npm.magix.server.startMagixServer import ru.mipt.npm.magix.storage.xodus.storeInXodus +import space.kscience.controls.client.connectToMagix +import space.kscience.controls.demo.car.IVirtualCar.Companion.acceleration +import space.kscience.controls.manager.DeviceManager +import space.kscience.controls.manager.install +import space.kscience.controls.storage.storeMessages +import space.kscience.controls.xodus.XodusDeviceMessageStorage import space.kscience.dataforge.context.* import space.kscience.dataforge.meta.Meta import tornadofx.* diff --git a/demo/echo/build.gradle.kts b/demo/echo/build.gradle.kts index e0cc749..47ac2af 100644 --- a/demo/echo/build.gradle.kts +++ b/demo/echo/build.gradle.kts @@ -28,5 +28,5 @@ tasks.withType().configureEach } application { - mainClass.set("ru.mipt.npm.controls.demo.echo.MainKt") + mainClass.set("space.kscience.controls.demo.echo.MainKt") } \ No newline at end of file diff --git a/demo/echo/src/main/kotlin/ru/mipt/npm/controls/demo/echo/main.kt b/demo/echo/src/main/kotlin/space/kscience/controls/demo/echo/main.kt similarity index 98% rename from demo/echo/src/main/kotlin/ru/mipt/npm/controls/demo/echo/main.kt rename to demo/echo/src/main/kotlin/space/kscience/controls/demo/echo/main.kt index 9467c47..05dab38 100644 --- a/demo/echo/src/main/kotlin/ru/mipt/npm/controls/demo/echo/main.kt +++ b/demo/echo/src/main/kotlin/space/kscience/controls/demo/echo/main.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.controls.demo.echo +package space.kscience.controls.demo.echo import io.ktor.server.application.log import kotlinx.coroutines.* diff --git a/demo/motors/src/main/kotlin/ru/mipt/npm/devices/pimotionmaster/PiMotionMasterApp.kt b/demo/motors/src/main/kotlin/ru/mipt/npm/devices/pimotionmaster/PiMotionMasterApp.kt index 1476201..37f7323 100644 --- a/demo/motors/src/main/kotlin/ru/mipt/npm/devices/pimotionmaster/PiMotionMasterApp.kt +++ b/demo/motors/src/main/kotlin/ru/mipt/npm/devices/pimotionmaster/PiMotionMasterApp.kt @@ -11,11 +11,11 @@ import javafx.scene.layout.VBox import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.launch -import ru.mipt.npm.controls.manager.DeviceManager -import ru.mipt.npm.controls.manager.installing import ru.mipt.npm.devices.pimotionmaster.PiMotionMasterDevice.Axis.Companion.maxPosition import ru.mipt.npm.devices.pimotionmaster.PiMotionMasterDevice.Axis.Companion.minPosition import ru.mipt.npm.devices.pimotionmaster.PiMotionMasterDevice.Axis.Companion.position +import space.kscience.controls.manager.DeviceManager +import space.kscience.controls.manager.installing import space.kscience.dataforge.context.Context import space.kscience.dataforge.context.fetch import tornadofx.* diff --git a/demo/motors/src/main/kotlin/ru/mipt/npm/devices/pimotionmaster/PiMotionMasterDevice.kt b/demo/motors/src/main/kotlin/ru/mipt/npm/devices/pimotionmaster/PiMotionMasterDevice.kt index 7bdfa9f..ff35345 100644 --- a/demo/motors/src/main/kotlin/ru/mipt/npm/devices/pimotionmaster/PiMotionMasterDevice.kt +++ b/demo/motors/src/main/kotlin/ru/mipt/npm/devices/pimotionmaster/PiMotionMasterDevice.kt @@ -11,10 +11,10 @@ import kotlinx.coroutines.runBlocking import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.withTimeout -import ru.mipt.npm.controls.api.DeviceHub -import ru.mipt.npm.controls.api.PropertyDescriptor -import ru.mipt.npm.controls.ports.* -import ru.mipt.npm.controls.spec.* +import space.kscience.controls.api.DeviceHub +import space.kscience.controls.api.PropertyDescriptor +import space.kscience.controls.ports.* +import space.kscience.controls.spec.* import space.kscience.dataforge.context.* import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.double diff --git a/demo/motors/src/main/kotlin/ru/mipt/npm/devices/pimotionmaster/PiMotionMasterVirtualDevice.kt b/demo/motors/src/main/kotlin/ru/mipt/npm/devices/pimotionmaster/PiMotionMasterVirtualDevice.kt index cb490e1..8efe4e9 100644 --- a/demo/motors/src/main/kotlin/ru/mipt/npm/devices/pimotionmaster/PiMotionMasterVirtualDevice.kt +++ b/demo/motors/src/main/kotlin/ru/mipt/npm/devices/pimotionmaster/PiMotionMasterVirtualDevice.kt @@ -5,9 +5,9 @@ import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.* import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock -import ru.mipt.npm.controls.api.Socket -import ru.mipt.npm.controls.ports.AbstractPort -import ru.mipt.npm.controls.ports.withDelimiter +import space.kscience.controls.api.Socket +import space.kscience.controls.ports.AbstractPort +import space.kscience.controls.ports.withDelimiter import space.kscience.dataforge.context.* import kotlin.math.abs import kotlin.time.Duration diff --git a/demo/motors/src/main/kotlin/ru/mipt/npm/devices/pimotionmaster/fxDeviceProperties.kt b/demo/motors/src/main/kotlin/ru/mipt/npm/devices/pimotionmaster/fxDeviceProperties.kt index 3da23f3..8e399a4 100644 --- a/demo/motors/src/main/kotlin/ru/mipt/npm/devices/pimotionmaster/fxDeviceProperties.kt +++ b/demo/motors/src/main/kotlin/ru/mipt/npm/devices/pimotionmaster/fxDeviceProperties.kt @@ -3,8 +3,8 @@ package ru.mipt.npm.devices.pimotionmaster import javafx.beans.property.ObjectPropertyBase import javafx.beans.property.Property import javafx.beans.property.ReadOnlyProperty -import ru.mipt.npm.controls.api.Device -import ru.mipt.npm.controls.spec.* +import space.kscience.controls.api.Device +import space.kscience.controls.spec.* import space.kscience.dataforge.context.info import space.kscience.dataforge.context.logger import tornadofx.* diff --git a/gradle.properties b/gradle.properties index bd1c590..1d1dcc7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,10 @@ kotlin.code.style=official kotlin.mpp.stability.nowarn=true - -kotlin.jupyter.add.scanner=false +kotlin.native.ignoreDisabledTargets=true org.gradle.parallel=true publishing.github=false publishing.sonatype=false -toolsVersion=0.11.5-kotlin-1.7.0-RC \ No newline at end of file +toolsVersion=0.11.7-kotlin-1.7.0 \ No newline at end of file diff --git a/magix/magix-storage/magix-storage-mongo/src/main/kotlin/ru/mipt/npm/controls/mongo/MongoEventStorage.kt b/magix/magix-storage/magix-storage-mongo/src/main/kotlin/ru/mipt/npm/controls/mongo/MongoEventStorage.kt index 4bfbafb..5d02e92 100644 --- a/magix/magix-storage/magix-storage-mongo/src/main/kotlin/ru/mipt/npm/controls/mongo/MongoEventStorage.kt +++ b/magix/magix-storage/magix-storage-mongo/src/main/kotlin/ru/mipt/npm/controls/mongo/MongoEventStorage.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.controls.mongo +package space.kscience.controls.mongo import kotlinx.serialization.KSerializer import kotlinx.serialization.json.Json @@ -6,9 +6,9 @@ import org.litote.kmongo.coroutine.CoroutineClient import org.litote.kmongo.coroutine.coroutine import org.litote.kmongo.coroutine.insertOne import org.litote.kmongo.reactivestreams.KMongo -import ru.mipt.npm.controls.api.DeviceMessage -import ru.mipt.npm.controls.api.PropertyChangedMessage -import ru.mipt.npm.controls.storage.EventStorage +import space.kscience.controls.api.DeviceMessage +import space.kscience.controls.api.PropertyChangedMessage +import space.kscience.controls.storage.EventStorage import ru.mipt.npm.magix.server.GenericMagixMessage import space.kscience.dataforge.context.Context import space.kscience.dataforge.context.Factory