Update Milo to version 0.5.0-M1

digitalpetri · Sep 3, 2020 · e92e36d · e92e36d
1 parent cfea56d
commit e92e36d
Show file tree

Hide file tree

Showing 28 changed files with 1,626 additions and 1,556 deletions.
diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@ version "0.2-SNAPSHOT"
 sourceCompatibility = 1.8
 
 project.ext {
-    miloVersion = "0.4.2"
+    miloVersion = "0.5.0-M1"
     packageName = "milo-demo-server"
 }
 

diff --git a/src/main/kotlin/com/digitalpetri/opcua/server/DemoServer.kt b/src/main/kotlin/com/digitalpetri/opcua/server/DemoServer.kt
@@ -1,6 +1,6 @@
 package com.digitalpetri.opcua.server
 
-import com.digitalpetri.opcua.server.namespaces.demo.DemoNamespace
+import com.digitalpetri.opcua.server.namespaces.demo.*
 import com.digitalpetri.opcua.server.objects.ServerConfigurationObject
 import com.digitalpetri.opcua.server.util.KeyStoreManager
 import com.uchuhimo.konf.Config
@@ -68,6 +68,7 @@ class DemoServer(configDir: File, dataDir: File) : AbstractLifecycle() {
     private val serverConfigurationObject: ServerConfigurationObject
 
     private val config: Config
+
     private val demoNamespace: DemoNamespace
 
     init {
@@ -136,9 +137,65 @@ class DemoServer(configDir: File, dataDir: File) : AbstractLifecycle() {
 
         server = OpcUaServer(serverConfig)
 
-        demoNamespace = DemoNamespace(server, coroutineScope)
+        demoNamespace = DemoNamespace(server)
         demoNamespace.startup()
 
+        val complexTypesFragment = ComplexTypesFragment(
+            server,
+            demoNamespace,
+            demoNamespace.namespaceIndex
+        )
+        complexTypesFragment.startup()
+
+        val cttNodes = CttNodesFragment(
+            server,
+            demoNamespace,
+            demoNamespace.namespaceIndex
+        )
+        cttNodes.startup()
+
+        val dynamicNodes = DynamicNodesFragment(
+            server,
+            demoNamespace,
+            demoNamespace.namespaceIndex
+        )
+        dynamicNodes.startup()
+
+        val fileNodes = FileNodesFragment(
+            server,
+            demoNamespace,
+            demoNamespace.namespaceIndex
+        )
+        fileNodes.startup()
+
+        val massNodes = MassNodesFragment(
+            server,
+            demoNamespace,
+            demoNamespace.namespaceIndex
+        )
+        massNodes.startup()
+
+        val methodNodes = MethodNodesFragment(
+            server,
+            demoNamespace,
+            demoNamespace.namespaceIndex
+        )
+        methodNodes.startup()
+
+        val nullValueNodes = NullValueNodesFragment(
+            server,
+            demoNamespace,
+            demoNamespace.namespaceIndex
+        )
+        nullValueNodes.startup()
+
+        val turtleNodes = TurtleNodesFragment(
+            server,
+            demoNamespace,
+            demoNamespace.namespaceIndex
+        )
+        turtleNodes.startup()
+
         // GDS Push Support via ServerConfiguration
         val serverConfigurationNode = server.addressSpaceManager
             .getManagedNode(Identifiers.ServerConfiguration)