Use the latest swim core java libraries (3.10.1-SNAPSHOT) and modify server code based on the new APIs

Use the latest javascript libraries (3.10.1) for the index.html page

Author: ajay-gov

server/README.md

@@ -2,7 +2,7 @@
 
 Swim unifies the traditionally disparate roles of database, message broker, job manager, and application server, into a few simple constructs.
 
-*Read this in other languages: [English](README.md), [简体中文](README.zh-cn.md)*
+*Read this in other languages: [简体中文](README.zh-cn.md)*
 
 ## Web Agents
 
@@ -26,20 +26,20 @@ Visit the [documentation](https://developer.swim.ai/concepts/lanes/) for further
 
 A Swim server is loaded with a **plane**, which provides the runtime for Web Agents and routes messages to the correct lanes.
 
-A plane must [declare an `AgentType` field](http://github.com/swimos/tutorial/tree/master/server/src/main/java/swim/tutorial/TutorialPlane.java#L13-L14) for each Web Agent type.
+A plane must [declare a `SwimRoute` field](http://github.com/swimos/tutorial/tree/master/server/src/main/java/swim/tutorial/TutorialPlane.java#L13-L14) for each Web Agent type.
 
-Use the `ServerLoader` utility class to [load a plane into a Swim server](http://github.com/swimos/tutorial/tree/master/server/src/main/java/swim/tutorial/TutorialPlane.java#L18). Note that your module must [`provide` `swim.api.plane.Plane` with your custom plane class](http://github.com/swimos/tutorial/tree/master/server/src/main/java/module-info.java#L8).
+Use the `ServerLoader` utility class to [load the default kernel modules](http://github.com/swimos/tutorial/tree/master/server/src/main/java/swim/tutorial/TutorialPlane.java#L19).
 
 Visit the [documentation](https://developer.swim.ai/concepts) for further details about these concepts.
 
 ## Populating a Swim Server With Your Data
 
-Every Swim server can be written to and read from by external processes using the Swim API. The simplest way to utilize this API is to use a **Swim client** instance to [send commands to command lanes](http://github.com/swimos/tutorial/blob/master/server/src/main/java/swim/tutorial/DataSource.java#L40).
+Every Swim server can be written to and read from by external processes using the Swim API. The simplest way to utilize this API is to use a **Swim client** instance to [send commands to command lanes](http://github.com/swimos/tutorial/blob/master/server/src/main/java/swim/tutorial/DataSource.java#L42).
 
 Visit the [documentation](https://developer.swim.ai/concepts) for further details about these concepts.
 
 ## Subscribing to Swim Server Data
 
-Swim client instances use Swim **links** to pull data from a Swim lanes. Like their corresponding lanes, links have overridable callback functions that can be used to [populate UIs](http://github.com/swimos/tutorial/tree/master/ui/index.html#L111-L133).
+Swim client instances use Swim **links** to pull data from a Swim lanes. Like their corresponding lanes, links have overridable callback functions that can be used to [populate UIs](http://github.com/swimos/tutorial/tree/master/ui/index.html#L116-L141).
 
 Visit the [documentation](https://developer.swim.ai/concepts/links/) for further details about links.

server/build.gradle

@@ -36,7 +36,6 @@ repositories {
 }
 
 dependencies {
-  api group: 'ai.swim', name: 'swim-loader', version: version
   api group: 'ai.swim', name: 'swim-server', version: version
   api group: 'ai.swim', name: 'swim-client', version: version
 }

server/gradle.properties

@@ -1 +1 @@
-application.version=3.9.3
+application.version=3.10.1-SNAPSHOT

server/src/main/java/module-info.java

@@ -1,9 +1,7 @@
 open module swim.tutorial {
-  requires transitive swim.loader;
+  requires transitive swim.api;
+  requires swim.server;
   requires swim.client;
 
   exports swim.tutorial;
-
-  // Allow ServerLoader to load a Swim server with a TutorialPlane
-  provides swim.api.plane.Plane with swim.tutorial.TutorialPlane;
 }

server/src/main/java/swim/tutorial/DataSource.java

@@ -1,9 +1,7 @@
 package swim.tutorial;
 
-import swim.api.downlink.ListDownlink;
 import swim.api.ref.SwimRef;
 import swim.structure.Record;
-import swim.structure.Value;
 
 /**
  * Simple wrapper around some {@code SwimRef}, e.g. a {@code SwimClient} handle,

server/src/main/java/swim/tutorial/TutorialPlane.java

@@ -1,25 +1,25 @@
 package swim.tutorial;
 
-import java.io.IOException;
 import swim.api.SwimRoute;
-import swim.api.agent.AgentType;
+import swim.api.agent.AgentRoute;
 import swim.api.plane.AbstractPlane;
-import swim.api.server.ServerContext;
 import swim.client.ClientRuntime;
-import swim.loader.ServerLoader;
+import swim.fabric.Fabric;
+import swim.kernel.Kernel;
+import swim.server.ServerLoader;
 
 public class TutorialPlane extends AbstractPlane {
 
   @SwimRoute("/unit/:id")
-  final AgentType<UnitAgent> unitAgent = agentClass(UnitAgent.class);
+  AgentRoute<UnitAgent> unitAgent;
 
-  public static void main(String[] args) throws IOException, InterruptedException {
+  public static void main(String[] args) throws InterruptedException {
+    final Kernel kernel = ServerLoader.loadServer();
+    final Fabric fabric = (Fabric) kernel.getSpace("basic");
 
-    final ServerContext server = ServerLoader.load(TutorialPlane.class.getModule()).serverContext();
-    server.start();
-    System.out.println("Running TutorialPlane...");
-    // Runs asynchronously (relative to the main thread) until termination
-    server.run();
+    kernel.start();
+    System.out.println("Running Tutorial plane...");
+    kernel.run();
 
     // Send data to the above Swim server. Could (and in practice, usually will)
     // be done in external processes instead

server/src/main/resources/server.recon

@@ -1,13 +1,12 @@
-@server {
-  @plane("tutorial") {
-    class: "swim.tutorial.TutorialPlane"
-  }
-  @http(port: 9001) {
-    plane: "tutorial"
-    #documentRoot: "./ui/"
-    @websocket {
-      serverCompressionLevel: 0# -1 = default; 0 = off; 1-9 = deflate level
-      clientCompressionLevel: 0# -1 = default; 0 = off; 1-9 = deflate level
-    }
-  }
+tutorial: @fabric {
+  @plane(class: "swim.tutorial.TutorialPlane")
 }
+
+@web(port: 9001) {
+  space: "tutorial"
+  documentRoot: "./ui/"
+  @websocket {
+    serverCompressionLevel: 0# -1 = default; 0 = off; 1-9 = deflate level
+    clientCompressionLevel: 0# -1 = default; 0 = off; 1-9 = deflate level
+  }
+}

ui/index.html

@@ -1,15 +1,16 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Swim Gauge</title>
+    <title>Swim Gauge, Pie and Chart</title>
     <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, shrink-to-fit=no, viewport-fit=cover" />
   </head>
   <body style="display: flex; justify-content: center; align-items: center; width: 100vw; height: 100vh; margin: 0;">
     <div id="app" style="display: flex; width: 67%; height: 67%; flex-direction: column;">
     </div>
-    <script src="https://cdn.swim.ai/js/3.9.0/swim-core.js"></script>
-    <script src="https://cdn.swim.ai/js/3.9.0/swim-ui.js"></script>
-    <script src="https://cdn.swim.ai/js/3.9.0/swim-ux.js"></script>
+    <script src="https://cdn.swimos.org/js/3.10.1/swim-core.js"></script>
+    <script src="https://cdn.swimos.org/js/3.10.1/swim-mesh.js"></script>
+    <script src="https://cdn.swimos.org/js/3.10.1/swim-ui.js"></script>
+    <script src="https://cdn.swimos.org/js/3.10.1/swim-ux.js"></script>
     <script>
 
 const app = new swim.HtmlAppView(document.getElementById("app"));
@@ -26,7 +27,7 @@
 /* Gauge View */
 const gauge = new swim.GaugeView()
     .startAngle(swim.Angle.rad(3 * Math.PI / 4))
-    .deltaAngle(swim.Angle.rad(3 * Math.PI / 2))
+    .sweepAngle(swim.Angle.rad(3 * Math.PI / 2))
     .dialColor("#cccccc")
     .meterColor("#989898")
     .title(new swim.TextRunView("Foo, Bar, Baz").font("20px sans-serif"))