Renamed -gwt-j2cl modules to -elemental2

salmonb · salmonb · commit f60e45bba2b3 · 2025-10-16T11:37:54.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -63,8 +63,8 @@
         <module>webfx-stack-authn-login-ui-gateway-mojoauth-plugin</module>
         <module>webfx-stack-authn-login-ui-gateway-password-plugin</module>
         <module>webfx-stack-authn-login-ui-gateway-webviewbased</module>
-        <module>webfx-stack-authn-login-ui-gateway-webviewbased-gwt</module>
         <module>webfx-stack-authn-login-ui-gateway-webviewbased-openjfx</module>
+        <module>webfx-stack-authn-login-ui-gateway-webviewbased-web</module>
         <module>webfx-stack-authn-login-ui-portal</module>
         <module>webfx-stack-authn-logout-client</module>
         <module>webfx-stack-authn-logout-server</module>
@@ -98,8 +98,8 @@
         <module>webfx-stack-com-bus-simple</module>
         <module>webfx-stack-com-serial</module>
         <module>webfx-stack-com-websocket</module>
-        <module>webfx-stack-com-websocket-gwt-j2cl-native</module>
-        <module>webfx-stack-com-websocket-gwt-j2cl-sockjs</module>
+        <module>webfx-stack-com-websocket-elemental2-native</module>
+        <module>webfx-stack-com-websocket-elemental2-sockjs</module>
         <module>webfx-stack-com-websocket-jre</module>
         <module>webfx-stack-db-datascope</module>
         <module>webfx-stack-db-datasource</module>
@@ -161,7 +161,7 @@
         <module>webfx-stack-shareddata</module>
         <module>webfx-stack-shareddata-ast</module>
         <module>webfx-stack-shareddata-cache</module>
-        <module>webfx-stack-shareddata-cache-cachestorage-gwt-j2cl</module>
+        <module>webfx-stack-shareddata-cache-cachestorage-elemental2</module>
         <module>webfx-stack-shareddata-cache-localstorage-plugin</module>
         <module>webfx-stack-shareddata-cache-serial</module>
         <module>webfx-stack-shareddata-cache-storage</module>
diff --git a/webfx-stack-authn-login-ui-gateway-webviewbased-openjfx/src/main/java/dev/webfx/stack/authn/login/ui/spi/impl/gateway/webview/spi/impl/openjfx/HttpCookieSerialCodec.java b/webfx-stack-authn-login-ui-gateway-webviewbased-openjfx/src/main/java/dev/webfx/stack/authn/login/ui/spi/impl/gateway/webview/spi/impl/openjfx/HttpCookieSerialCodec.java
@@ -34,7 +34,7 @@ public void encode(HttpCookie c, AstObject serial) {
         // We need to know the cookie creation time to serialize the expiration time (see below). HttpCookie has a
         // whenCreated field for that, but we can't use it as it's a private & inaccessible field. Instead, we use an
         // alternative solution provided by FXLoginCookieStore that keeps an internal record of the cookie creation date.
-        long whenCreated = FXLoginCookieStore.getWhenCreated(c); // cookie creation time in millis
+        long whenCreated = OpenJFXLoginCookieStore.getWhenCreated(c); // cookie creation time in millis
         encodeString( serial, NAME_KEY,       c.getName(), NullEncoding.NULL_VALUE_NOT_ALLOWED);
         encodeString( serial, VALUE_KEY,      c.getValue());
         encodeBoolean(serial, SECURE_KEY,     c.getSecure());
@@ -55,7 +55,7 @@ public HttpCookie decode(ReadOnlyAstObject serial) {
         HttpCookie cookie = new HttpCookie(
                 decodeString(serial, NAME_KEY, NullEncoding.NULL_VALUE_NOT_ALLOWED),
                 decodeString(serial, VALUE_KEY));
-        long whenCreated = FXLoginCookieStore.getWhenCreated(cookie); // will return 'now', as it's a new cookie
+        long whenCreated = OpenJFXLoginCookieStore.getWhenCreated(cookie); // will return 'now', as it's a new cookie
         cookie.setSecure(    decodeBoolean(serial, SECURE_KEY));
         cookie.setDomain(    decodeString( serial, DOMAIN_KEY));
         // We recalculate maxAge, which is the difference between the expiration and the creation time
diff --git a/webfx-stack-authn-login-ui-gateway-webviewbased-openjfx/src/main/java/dev/webfx/stack/authn/login/ui/spi/impl/gateway/webview/spi/impl/openjfx/OpenJFXLoginCookieStore.java b/webfx-stack-authn-login-ui-gateway-webviewbased-openjfx/src/main/java/dev/webfx/stack/authn/login/ui/spi/impl/gateway/webview/spi/impl/openjfx/OpenJFXLoginCookieStore.java
@@ -22,12 +22,12 @@
 /**
  * @author Bruno Salmon
  */
-public class FXLoginCookieStore implements CookieStore {
+public class OpenJFXLoginCookieStore implements CookieStore {
 
     protected final Path cookieFilePath = Paths.get(StorageLocation.getInternalStorageLocation(), "login-cookies.json");
     private final CookieStore memoryStore = new CookieManager().getCookieStore();
 
-    public FXLoginCookieStore() {
+    public OpenJFXLoginCookieStore() {
         try {
             // Reading the json file as text
             String jsonText = new String(Files.readAllBytes(cookieFilePath));
diff --git a/webfx-stack-authn-login-ui-gateway-webviewbased-openjfx/src/main/java/dev/webfx/stack/authn/login/ui/spi/impl/gateway/webview/spi/impl/openjfx/OpenJFXLoginWebViewProvider.java b/webfx-stack-authn-login-ui-gateway-webviewbased-openjfx/src/main/java/dev/webfx/stack/authn/login/ui/spi/impl/gateway/webview/spi/impl/openjfx/OpenJFXLoginWebViewProvider.java
@@ -18,7 +18,7 @@
 /**
  * @author Bruno Salmon
  */
-public class FXLoginWebViewProvider implements LoginWebViewProvider {
+public class OpenJFXLoginWebViewProvider implements LoginWebViewProvider {
 
     private DialogCallback popupDialogCallback;
 
@@ -61,7 +61,7 @@ public WebView createLoginWebView() {
 
         // Setting a cookie handler with a persistent cookie store. This is mainly for the Facebook login which prompts
         // an annoying cookie window. Thanks to the cookie persistence, this should now happen only once, on first time.
-        CookieHandler.setDefault(new CookieManager(new FXLoginCookieStore(), CookiePolicy.ACCEPT_ALL));
+        CookieHandler.setDefault(new CookieManager(new OpenJFXLoginCookieStore(), CookiePolicy.ACCEPT_ALL));
 
         return webView;
     }
diff --git a/webfx-stack-authn-login-ui-gateway-webviewbased-openjfx/src/main/java/module-info.java b/webfx-stack-authn-login-ui-gateway-webviewbased-openjfx/src/main/java/module-info.java
@@ -18,7 +18,7 @@
     exports dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.impl.openjfx;
 
     // Provided services
-    provides dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.LoginWebViewProvider with dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.impl.openjfx.FXLoginWebViewProvider;
+    provides dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.LoginWebViewProvider with dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.impl.openjfx.OpenJFXLoginWebViewProvider;
     provides dev.webfx.stack.com.serial.spi.SerialCodec with dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.impl.openjfx.HttpCookieSerialCodec;
 
 }
diff --git a/webfx-stack-authn-login-ui-gateway-webviewbased-openjfx/src/main/resources/META-INF/services/dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.LoginWebViewProvider b/webfx-stack-authn-login-ui-gateway-webviewbased-openjfx/src/main/resources/META-INF/services/dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.LoginWebViewProvider
@@ -1 +1 @@
-dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.impl.openjfx.FXLoginWebViewProvider
+dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.impl.openjfx.OpenJFXLoginWebViewProvider
diff --git a/webfx-stack-authn-login-ui-gateway-webviewbased-openjfx/webfx.xml b/webfx-stack-authn-login-ui-gateway-webviewbased-openjfx/webfx.xml
@@ -10,7 +10,7 @@
     </dependencies>
 
     <providers>
-        <provider interface="dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.LoginWebViewProvider">dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.impl.openjfx.FXLoginWebViewProvider</provider>
+        <provider interface="dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.LoginWebViewProvider">dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.impl.openjfx.OpenJFXLoginWebViewProvider</provider>
         <provider interface="dev.webfx.stack.com.serial.spi.SerialCodec">dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.impl.openjfx.HttpCookieSerialCodec</provider>
     </providers>
 
diff --git a/webfx-stack-authn-login-ui-gateway-webviewbased-web/pom.xml b/webfx-stack-authn-login-ui-gateway-webviewbased-web/pom.xml
@@ -11,14 +11,14 @@
         <version>0.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>webfx-stack-authn-login-ui-gateway-webviewbased-gwt</artifactId>
+    <artifactId>webfx-stack-authn-login-ui-gateway-webviewbased-web</artifactId>
 
     <dependencies>
 
         <dependency>
-            <groupId>dev.webfx</groupId>
-            <artifactId>webfx-kit-javafxweb-emul</artifactId>
-            <version>0.1.0-SNAPSHOT</version>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-web</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
diff --git a/webfx-stack-authn-login-ui-gateway-webviewbased-web/src/main/java/dev/webfx/stack/authn/login/ui/spi/impl/gateway/webview/spi/impl/web/WebLoginWebViewProvider.java b/webfx-stack-authn-login-ui-gateway-webviewbased-web/src/main/java/dev/webfx/stack/authn/login/ui/spi/impl/gateway/webview/spi/impl/web/WebLoginWebViewProvider.java
@@ -1,12 +1,12 @@
-package dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.impl.gwt;
+package dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.impl.web;
 
 import dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.LoginWebViewProvider;
 import javafx.scene.web.WebView;
 
 /**
  * @author Bruno Salmon
  */
-public class GwtLoginWebViewProvider implements LoginWebViewProvider {
+public class WebLoginWebViewProvider implements LoginWebViewProvider {
 
     @Override
     public WebView createLoginWebView() {
diff --git a/webfx-stack-authn-login-ui-gateway-webviewbased-web/src/main/resources/META-INF/services/dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.LoginWebViewProvider b/webfx-stack-authn-login-ui-gateway-webviewbased-web/src/main/resources/META-INF/services/dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.LoginWebViewProvider
@@ -0,0 +1 @@
+dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.impl.web.WebLoginWebViewProvider
diff --git a/webfx-stack-authn-login-ui-gateway-webviewbased-web/webfx.xml b/webfx-stack-authn-login-ui-gateway-webviewbased-web/webfx.xml
@@ -10,7 +10,7 @@
     </dependencies>
 
     <providers>
-        <provider interface="dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.LoginWebViewProvider">dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.impl.gwt.GwtLoginWebViewProvider</provider>
+        <provider interface="dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.LoginWebViewProvider">dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.impl.web.WebLoginWebViewProvider</provider>
     </providers>
 
 </project>
diff --git a/webfx-stack-com-bus-json-client-websocket-web/src/main/java/module-info.java b/webfx-stack-com-bus-json-client-websocket-web/src/main/java/module-info.java
diff --git a/webfx-stack-com-websocket-elemental2-native/pom.xml b/webfx-stack-com-websocket-elemental2-native/pom.xml
@@ -11,7 +11,7 @@
         <version>0.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>webfx-stack-com-websocket-gwt-j2cl-native</artifactId>
+    <artifactId>webfx-stack-com-websocket-elemental2-native</artifactId>
 
     <dependencies>
 
@@ -49,7 +49,7 @@
             <groupId>dev.webfx</groupId>
             <artifactId>webfx-platform-javatime-emul-j2cl</artifactId>
             <version>0.1.0-SNAPSHOT</version>
-            <scope>provided</scope>
+            <scope>runtime</scope>
             <optional>true</optional>
         </dependency>
 
diff --git a/webfx-stack-com-websocket-elemental2-native/src/main/java/dev/webfx/stack/com/websocket/spi/impl/elemental2/nativ/Elemental2NativeWebSocket.java b/webfx-stack-com-websocket-elemental2-native/src/main/java/dev/webfx/stack/com/websocket/spi/impl/elemental2/nativ/Elemental2NativeWebSocket.java
@@ -1,4 +1,4 @@
-package dev.webfx.stack.com.websocket.spi.impl.gwtj2cl.nativ;
+package dev.webfx.stack.com.websocket.spi.impl.elemental2.nativ;
 
 import dev.webfx.platform.ast.AST;
 import dev.webfx.platform.console.Console;
@@ -12,11 +12,11 @@
 /**
  * @author Bruno Salmon
  */
-final class GwtJ2clNativeWebSocket implements WebSocket {
+final class Elemental2NativeWebSocket implements WebSocket {
 
     private final elemental2.dom.WebSocket nativeWebSocket;
 
-    public GwtJ2clNativeWebSocket(elemental2.dom.WebSocket nativeWebSocket) {
+    public Elemental2NativeWebSocket(elemental2.dom.WebSocket nativeWebSocket) {
         this.nativeWebSocket = nativeWebSocket;
     }
 
diff --git a/webfx-stack-com-websocket-elemental2-native/src/main/java/dev/webfx/stack/com/websocket/spi/impl/elemental2/nativ/Elemental2NativeWebSocketServiceProvider.java b/webfx-stack-com-websocket-elemental2-native/src/main/java/dev/webfx/stack/com/websocket/spi/impl/elemental2/nativ/Elemental2NativeWebSocketServiceProvider.java
@@ -0,0 +1,17 @@
+package dev.webfx.stack.com.websocket.spi.impl.elemental2.nativ;
+
+import dev.webfx.platform.ast.ReadOnlyAstObject;
+import dev.webfx.stack.com.websocket.spi.WebSocketServiceProvider;
+
+/**
+ * @author Bruno Salmon
+ */
+public final class Elemental2NativeWebSocketServiceProvider implements WebSocketServiceProvider {
+
+    @Override
+    public Elemental2NativeWebSocket createWebSocket(String url, ReadOnlyAstObject options) {
+        // Otherwise we create a brand new SockJS connection
+        return new Elemental2NativeWebSocket(new elemental2.dom.WebSocket(url));
+    };
+
+}
diff --git a/webfx-stack-com-websocket-elemental2-native/src/main/resources/META-INF/services/dev.webfx.stack.com.websocket.spi.WebSocketServiceProvider b/webfx-stack-com-websocket-elemental2-native/src/main/resources/META-INF/services/dev.webfx.stack.com.websocket.spi.WebSocketServiceProvider
@@ -0,0 +1 @@
+dev.webfx.stack.com.websocket.spi.impl.elemental2.nativ.Elemental2NativeWebSocketServiceProvider
diff --git a/webfx-stack-com-websocket-elemental2-native/webfx.xml b/webfx-stack-com-websocket-elemental2-native/webfx.xml
@@ -6,7 +6,7 @@
     </exported-packages>
 
     <providers>
-        <provider interface="dev.webfx.stack.com.websocket.spi.WebSocketServiceProvider">dev.webfx.stack.com.websocket.spi.impl.gwtj2cl.nativ.GwtJ2clNativeWebSocketServiceProvider</provider>
+        <provider interface="dev.webfx.stack.com.websocket.spi.WebSocketServiceProvider">dev.webfx.stack.com.websocket.spi.impl.elemental2.nativ.Elemental2NativeWebSocketServiceProvider</provider>
     </providers>
 
     <dependencies>
diff --git a/webfx-stack-com-websocket-elemental2-sockjs/pom.xml b/webfx-stack-com-websocket-elemental2-sockjs/pom.xml
@@ -11,7 +11,7 @@
         <version>0.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>webfx-stack-com-websocket-gwt-j2cl-sockjs</artifactId>
+    <artifactId>webfx-stack-com-websocket-elemental2-sockjs</artifactId>
 
     <dependencies>
 
@@ -49,7 +49,7 @@
             <groupId>dev.webfx</groupId>
             <artifactId>webfx-platform-javatime-emul-j2cl</artifactId>
             <version>0.1.0-SNAPSHOT</version>
-            <scope>provided</scope>
+            <scope>runtime</scope>
             <optional>true</optional>
         </dependency>
 
diff --git a/webfx-stack-com-websocket-elemental2-sockjs/src/main/java/dev/webfx/stack/com/websocket/spi/impl/elemental2/sockjs/Elemental2SockJSWebSocket.java b/webfx-stack-com-websocket-elemental2-sockjs/src/main/java/dev/webfx/stack/com/websocket/spi/impl/elemental2/sockjs/Elemental2SockJSWebSocket.java
@@ -1,4 +1,4 @@
-package dev.webfx.stack.com.websocket.spi.impl.gwtj2cl.sockjs;
+package dev.webfx.stack.com.websocket.spi.impl.elemental2.sockjs;
 
 import dev.webfx.platform.ast.AST;
 import dev.webfx.stack.com.websocket.WebSocket;
@@ -7,11 +7,11 @@
 /**
  * @author Bruno Salmon
  */
-final class GwtJ2clSockJSWebSocket implements WebSocket {
+final class Elemental2SockJSWebSocket implements WebSocket {
 
     private final SockJS sockJS;
 
-    public GwtJ2clSockJSWebSocket(SockJS sockJS) {
+    public Elemental2SockJSWebSocket(SockJS sockJS) {
         this.sockJS = sockJS;
     }
 
diff --git a/webfx-stack-com-websocket-elemental2-sockjs/src/main/java/dev/webfx/stack/com/websocket/spi/impl/elemental2/sockjs/Elemental2SockJSWebSocketServiceProvider.java b/webfx-stack-com-websocket-elemental2-sockjs/src/main/java/dev/webfx/stack/com/websocket/spi/impl/elemental2/sockjs/Elemental2SockJSWebSocketServiceProvider.java
@@ -1,4 +1,4 @@
-package dev.webfx.stack.com.websocket.spi.impl.gwtj2cl.sockjs;
+package dev.webfx.stack.com.websocket.spi.impl.elemental2.sockjs;
 
 import dev.webfx.platform.ast.ReadOnlyAstObject;
 import dev.webfx.platform.console.Console;
@@ -13,10 +13,10 @@
 /**
  * @author Bruno Salmon
  */
-public final class GwtJ2clSockJSWebSocketServiceProvider implements WebSocketServiceProvider {
+public final class Elemental2SockJSWebSocketServiceProvider implements WebSocketServiceProvider {
 
     @Override
-    public GwtJ2clSockJSWebSocket createWebSocket(String url, ReadOnlyAstObject options) {
+    public Elemental2SockJSWebSocket createWebSocket(String url, ReadOnlyAstObject options) {
         // SockJS requires the protocol to be http or https (and not ws or wss) and assumes the websocket suffix to be /websocket
         String sockJSUrl = Strings.removeSuffix(url, "/websocket")
             .replace("wss:", "https:")
@@ -28,11 +28,11 @@ public GwtJ2clSockJSWebSocket createWebSocket(String url, ReadOnlyAstObject opti
         if (sockJS != null) { // Yes the script was included, so a sockJS has already been started
             w.delete("quickStartSockJS"); // Used only once on first call
             if (options == null && Objects.equals(w.get("quickStartSockJSUrl"), url)) // Checking the parameters are the same
-                return new GwtJ2clSockJSWebSocket(sockJS); // Yes! The connection is probably already established (we gained a few seconds!)
+                return new Elemental2SockJSWebSocket(sockJS); // Yes! The connection is probably already established (we gained a few seconds!)
             sockJS.close(); // The started connection is not the requested one! We close it.
         }
         // Otherwise we create a brand new SockJS connection
-        return new GwtJ2clSockJSWebSocket(new SockJS(sockJSUrl, null, options));
+        return new Elemental2SockJSWebSocket(new SockJS(sockJSUrl, null, options));
     }
 
 }
diff --git a/webfx-stack-com-websocket-elemental2-sockjs/src/main/java/dev/webfx/stack/com/websocket/spi/impl/elemental2/sockjs/SockJS.externs.js b/webfx-stack-com-websocket-elemental2-sockjs/src/main/java/dev/webfx/stack/com/websocket/spi/impl/elemental2/sockjs/SockJS.externs.js
diff --git a/webfx-stack-com-websocket-elemental2-sockjs/src/main/java/dev/webfx/stack/com/websocket/spi/impl/elemental2/sockjs/SockJS.java b/webfx-stack-com-websocket-elemental2-sockjs/src/main/java/dev/webfx/stack/com/websocket/spi/impl/elemental2/sockjs/SockJS.java
@@ -1,4 +1,4 @@
-package dev.webfx.stack.com.websocket.spi.impl.gwtj2cl.sockjs;
+package dev.webfx.stack.com.websocket.spi.impl.elemental2.sockjs;
 
 import elemental2.dom.Event;
 import jsinterop.annotations.JsConstructor;
diff --git a/webfx-stack-com-websocket-elemental2-sockjs/src/main/java/dev/webfx/stack/com/websocket/spi/impl/elemental2/sockjs/TransportMessageEvent.externs.js b/webfx-stack-com-websocket-elemental2-sockjs/src/main/java/dev/webfx/stack/com/websocket/spi/impl/elemental2/sockjs/TransportMessageEvent.externs.js
diff --git a/webfx-stack-com-websocket-elemental2-sockjs/src/main/java/dev/webfx/stack/com/websocket/spi/impl/elemental2/sockjs/TransportMessageEvent.java b/webfx-stack-com-websocket-elemental2-sockjs/src/main/java/dev/webfx/stack/com/websocket/spi/impl/elemental2/sockjs/TransportMessageEvent.java
@@ -1,4 +1,4 @@
-package dev.webfx.stack.com.websocket.spi.impl.gwtj2cl.sockjs;
+package dev.webfx.stack.com.websocket.spi.impl.elemental2.sockjs;
 
 import elemental2.dom.Event;
 import jsinterop.annotations.JsConstructor;
diff --git a/webfx-stack-com-websocket-elemental2-sockjs/src/main/resources/META-INF/services/dev.webfx.stack.com.websocket.spi.WebSocketServiceProvider b/webfx-stack-com-websocket-elemental2-sockjs/src/main/resources/META-INF/services/dev.webfx.stack.com.websocket.spi.WebSocketServiceProvider
@@ -0,0 +1 @@
+dev.webfx.stack.com.websocket.spi.impl.elemental2.sockjs.Elemental2SockJSWebSocketServiceProvider
diff --git a/webfx-stack-com-websocket-elemental2-sockjs/src/main/resources/public/dev/webfx/stack/com/websocket/spi/impl/gwtj2cl/sockjs/sockjs-quickstart.js b/webfx-stack-com-websocket-elemental2-sockjs/src/main/resources/public/dev/webfx/stack/com/websocket/spi/impl/gwtj2cl/sockjs/sockjs-quickstart.js
diff --git a/webfx-stack-com-websocket-elemental2-sockjs/src/main/resources/public/dev/webfx/stack/com/websocket/spi/impl/gwtj2cl/sockjs/sockjs.js b/webfx-stack-com-websocket-elemental2-sockjs/src/main/resources/public/dev/webfx/stack/com/websocket/spi/impl/gwtj2cl/sockjs/sockjs.js
diff --git a/webfx-stack-com-websocket-elemental2-sockjs/src/main/resources/public/dev/webfx/stack/com/websocket/spi/impl/gwtj2cl/sockjs/sockjs.min.js b/webfx-stack-com-websocket-elemental2-sockjs/src/main/resources/public/dev/webfx/stack/com/websocket/spi/impl/gwtj2cl/sockjs/sockjs.min.js
diff --git a/webfx-stack-com-websocket-elemental2-sockjs/webfx.xml b/webfx-stack-com-websocket-elemental2-sockjs/webfx.xml
@@ -6,7 +6,7 @@
     </exported-packages>
 
     <providers>
-        <provider interface="dev.webfx.stack.com.websocket.spi.WebSocketServiceProvider">dev.webfx.stack.com.websocket.spi.impl.gwtj2cl.sockjs.GwtJ2clSockJSWebSocketServiceProvider</provider>
+        <provider interface="dev.webfx.stack.com.websocket.spi.WebSocketServiceProvider">dev.webfx.stack.com.websocket.spi.impl.elemental2.sockjs.Elemental2SockJSWebSocketServiceProvider</provider>
     </providers>
 
     <dependencies>
diff --git a/webfx-stack-com-websocket-gwt-j2cl-native/src/main/java/dev/webfx/stack/com/websocket/spi/impl/gwtj2cl/nativ/GwtJ2clNativeWebSocketServiceProvider.java b/webfx-stack-com-websocket-gwt-j2cl-native/src/main/java/dev/webfx/stack/com/websocket/spi/impl/gwtj2cl/nativ/GwtJ2clNativeWebSocketServiceProvider.java
diff --git a/webfx-stack-shareddata-cache-cachestorage-elemental2/pom.xml b/webfx-stack-shareddata-cache-cachestorage-elemental2/pom.xml
@@ -11,7 +11,7 @@
         <version>0.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>webfx-stack-shareddata-cache-cachestorage-gwt-j2cl</artifactId>
+    <artifactId>webfx-stack-shareddata-cache-cachestorage-elemental2</artifactId>
 
     <dependencies>
 
@@ -51,6 +51,12 @@
             <version>0.1.0-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>dev.webfx</groupId>
+            <artifactId>webfx-platform-util-elemental2-async</artifactId>
+            <version>0.1.0-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>dev.webfx</groupId>
             <artifactId>webfx-stack-shareddata</artifactId>
diff --git a/webfx-stack-shareddata-cache-cachestorage-elemental2/src/main/java/dev/webfx/stack/shareddata/cache/cachestorage/gwtj2cl/CacheStorageAsyncMap.java b/webfx-stack-shareddata-cache-cachestorage-elemental2/src/main/java/dev/webfx/stack/shareddata/cache/cachestorage/gwtj2cl/CacheStorageAsyncMap.java
diff --git a/webfx-stack-shareddata-cache-cachestorage-elemental2/src/main/java/dev/webfx/stack/shareddata/cache/cachestorage/gwtj2cl/Elemental2CacheStorageCachesProvider.java b/webfx-stack-shareddata-cache-cachestorage-elemental2/src/main/java/dev/webfx/stack/shareddata/cache/cachestorage/gwtj2cl/Elemental2CacheStorageCachesProvider.java
diff --git a/webfx-stack-shareddata-cache-cachestorage-elemental2/src/main/resources/META-INF/services/dev.webfx.stack.shareddata.cache.spi.CachesProvider b/webfx-stack-shareddata-cache-cachestorage-elemental2/src/main/resources/META-INF/services/dev.webfx.stack.shareddata.cache.spi.CachesProvider
diff --git a/webfx-stack-shareddata-cache-cachestorage-elemental2/webfx.xml b/webfx-stack-shareddata-cache-cachestorage-elemental2/webfx.xml
diff --git a/webfx-stack-shareddata-cache-cachestorage-gwt-j2cl/src/main/java/dev/webfx/stack/shareddata/cache/cachestorage/gwtj2cl/GwtJ2clUtil.java b/webfx-stack-shareddata-cache-cachestorage-gwt-j2cl/src/main/java/dev/webfx/stack/shareddata/cache/cachestorage/gwtj2cl/GwtJ2clUtil.java

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`exports dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.impl.openjfx;`
`19`	`19`
`20`	`20`	`// Provided services`
`21`		`- provides dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.LoginWebViewProvider with dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.impl.openjfx.FXLoginWebViewProvider;`
	`21`	`+ provides dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.LoginWebViewProvider with dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.impl.openjfx.OpenJFXLoginWebViewProvider;`
`22`	`22`	`provides dev.webfx.stack.com.serial.spi.SerialCodec with dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.impl.openjfx.HttpCookieSerialCodec;`
`23`	`23`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.impl.openjfx.FXLoginWebViewProvider`
	`1`	`+dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.impl.openjfx.OpenJFXLoginWebViewProvider`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+dev.webfx.stack.authn.login.ui.spi.impl.gateway.webview.spi.impl.web.WebLoginWebViewProvider`