Renamed -java modules to -jre when appropriate

salmonb · salmonb · commit f779e711ed49 · 2025-10-11T14:46:09.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -91,7 +91,7 @@
         <module>webfx-stack-com-bus-json</module>
         <module>webfx-stack-com-bus-json-client</module>
         <module>webfx-stack-com-bus-json-client-websocket</module>
-        <module>webfx-stack-com-bus-json-client-websocket-java</module>
+        <module>webfx-stack-com-bus-json-client-websocket-jre</module>
         <module>webfx-stack-com-bus-json-client-websocket-web</module>
         <module>webfx-stack-com-bus-json-server</module>
         <module>webfx-stack-com-bus-json-vertx</module>
@@ -100,7 +100,7 @@
         <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-java</module>
+        <module>webfx-stack-com-websocket-jre</module>
         <module>webfx-stack-db-datascope</module>
         <module>webfx-stack-db-datasource</module>
         <module>webfx-stack-db-query</module>
@@ -113,7 +113,7 @@
         <module>webfx-stack-db-querypush-remote</module>
         <module>webfx-stack-db-querypush-server</module>
         <module>webfx-stack-db-querypush-server-simple</module>
-        <module>webfx-stack-db-querysubmit-java-jdbc</module>
+        <module>webfx-stack-db-querysubmit-jre-jdbc</module>
         <module>webfx-stack-db-querysubmit-vertx</module>
         <module>webfx-stack-db-submit</module>
         <module>webfx-stack-db-submit-buscall</module>
diff --git a/webfx-stack-cloud-image-server-plugin/pom.xml b/webfx-stack-cloud-image-server-plugin/pom.xml
@@ -45,7 +45,7 @@
 
         <dependency>
             <groupId>dev.webfx</groupId>
-            <artifactId>webfx-platform-file-java</artifactId>
+            <artifactId>webfx-platform-file-jre</artifactId>
             <version>0.1.0-SNAPSHOT</version>
         </dependency>
 
diff --git a/webfx-stack-cloud-image-server-plugin/src/main/java/dev/webfx/stack/cloud/image/impl/server/ServerCloudinaryModuleBooter.java b/webfx-stack-cloud-image-server-plugin/src/main/java/dev/webfx/stack/cloud/image/impl/server/ServerCloudinaryModuleBooter.java
@@ -2,7 +2,7 @@
 
 import dev.webfx.platform.boot.spi.ApplicationModuleBooter;
 import dev.webfx.platform.conf.ConfigLoader;
-import dev.webfx.platform.file.spi.impl.java.JavaFile;
+import dev.webfx.platform.file.spi.impl.jre.JreFile;
 import dev.webfx.platform.util.Booleans;
 import dev.webfx.platform.util.vertx.VertxInstance;
 import dev.webfx.stack.cloud.image.CloudImageService;
@@ -73,7 +73,7 @@ public void bootModule() {
                         else {
                             FileUpload fileUpload = fileUploads.get(0);
                             File file = Path.of(fileUpload.uploadedFileName()).toFile();
-                            JavaFile javaFile = new JavaFile(file, fileUpload.contentType());
+                            JreFile javaFile = new JreFile(file, fileUpload.contentType());
                             String id = ctx.request().getParam("id");
                             boolean overwrite = Booleans.parseBoolean(ctx.request().getParam("overwrite"));
                             imageService.upload(javaFile, id, overwrite)
diff --git a/webfx-stack-cloud-image-server-plugin/src/main/java/module-info.java b/webfx-stack-cloud-image-server-plugin/src/main/java/module-info.java
@@ -8,7 +8,7 @@
     requires webfx.platform.async;
     requires webfx.platform.boot;
     requires webfx.platform.conf;
-    requires webfx.platform.file.java;
+    requires webfx.platform.file.jre;
     requires webfx.platform.util;
     requires webfx.platform.util.http;
     requires webfx.platform.util.vertx;
diff --git a/webfx-stack-com-bus-json-client-websocket-java/src/main/resources/META-INF/services/dev.webfx.stack.com.bus.spi.BusServiceProvider b/webfx-stack-com-bus-json-client-websocket-java/src/main/resources/META-INF/services/dev.webfx.stack.com.bus.spi.BusServiceProvider
diff --git a/webfx-stack-com-bus-json-client-websocket-jre/pom.xml b/webfx-stack-com-bus-json-client-websocket-jre/pom.xml
@@ -11,7 +11,7 @@
         <version>0.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>webfx-stack-com-bus-json-client-websocket-java</artifactId>
+    <artifactId>webfx-stack-com-bus-json-client-websocket-jre</artifactId>
 
     <dependencies>
 
diff --git a/webfx-stack-com-bus-json-client-websocket-jre/src/main/java/dev/webfx/stack/com/bus/spi/impl/json/client/websocket/jre/JreWebsocketBusServiceProvider.java b/webfx-stack-com-bus-json-client-websocket-jre/src/main/java/dev/webfx/stack/com/bus/spi/impl/json/client/websocket/jre/JreWebsocketBusServiceProvider.java
@@ -1,10 +1,10 @@
-package dev.webfx.stack.com.bus.spi.impl.json.client.websocket.java;
+package dev.webfx.stack.com.bus.spi.impl.json.client.websocket.jre;
 
 import dev.webfx.stack.com.bus.spi.impl.json.client.websocket.WebsocketBusServiceProvider;
 
 /**
  * @author Bruno Salmon
  */
-public final class JavaWebsocketBusServiceProvider extends WebsocketBusServiceProvider {
+public final class JreWebsocketBusServiceProvider extends WebsocketBusServiceProvider {
 
 }
diff --git a/webfx-stack-com-bus-json-client-websocket-jre/src/main/java/module-info.java b/webfx-stack-com-bus-json-client-websocket-jre/src/main/java/module-info.java
@@ -1,15 +1,15 @@
 // File managed by WebFX (DO NOT EDIT MANUALLY)
 
-module webfx.stack.com.bus.json.client.websocket.java {
+module webfx.stack.com.bus.json.client.websocket.jre {
 
     // Direct dependencies modules
     requires webfx.stack.com.bus;
     requires webfx.stack.com.bus.json.client.websocket;
 
     // Exported packages
-    exports dev.webfx.stack.com.bus.spi.impl.json.client.websocket.java;
+    exports dev.webfx.stack.com.bus.spi.impl.json.client.websocket.jre;
 
     // Provided services
-    provides dev.webfx.stack.com.bus.spi.BusServiceProvider with dev.webfx.stack.com.bus.spi.impl.json.client.websocket.java.JavaWebsocketBusServiceProvider;
+    provides dev.webfx.stack.com.bus.spi.BusServiceProvider with dev.webfx.stack.com.bus.spi.impl.json.client.websocket.jre.JreWebsocketBusServiceProvider;
 
 }
diff --git a/webfx-stack-com-bus-json-client-websocket-jre/src/main/resources/META-INF/services/dev.webfx.stack.com.bus.spi.BusServiceProvider b/webfx-stack-com-bus-json-client-websocket-jre/src/main/resources/META-INF/services/dev.webfx.stack.com.bus.spi.BusServiceProvider
@@ -0,0 +1 @@
+dev.webfx.stack.com.bus.spi.impl.json.client.websocket.jre.JreWebsocketBusServiceProvider
diff --git a/webfx-stack-com-bus-json-client-websocket-jre/webfx.xml b/webfx-stack-com-bus-json-client-websocket-jre/webfx.xml
@@ -6,7 +6,7 @@
     </exported-packages>
 
     <providers>
-        <provider interface="dev.webfx.stack.com.bus.spi.BusServiceProvider">dev.webfx.stack.com.bus.spi.impl.json.client.websocket.java.JavaWebsocketBusServiceProvider</provider>
+        <provider interface="dev.webfx.stack.com.bus.spi.BusServiceProvider">dev.webfx.stack.com.bus.spi.impl.json.client.websocket.jre.JreWebsocketBusServiceProvider</provider>
     </providers>
 
     <dependencies>
diff --git a/webfx-stack-com-websocket-java/src/main/resources/META-INF/services/dev.webfx.stack.com.websocket.spi.WebSocketServiceProvider b/webfx-stack-com-websocket-java/src/main/resources/META-INF/services/dev.webfx.stack.com.websocket.spi.WebSocketServiceProvider
diff --git a/webfx-stack-com-websocket-jre/pom.xml b/webfx-stack-com-websocket-jre/pom.xml
@@ -11,7 +11,7 @@
         <version>0.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>webfx-stack-com-websocket-java</artifactId>
+    <artifactId>webfx-stack-com-websocket-jre</artifactId>
 
     <dependencies>
 
diff --git a/webfx-stack-com-websocket-jre/src/main/java/dev/webfx/stack/com/websocket/spi/impl/jre/JreWebSocket.java b/webfx-stack-com-websocket-jre/src/main/java/dev/webfx/stack/com/websocket/spi/impl/jre/JreWebSocket.java
@@ -15,7 +15,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package dev.webfx.stack.com.websocket.spi.impl.java;
+package dev.webfx.stack.com.websocket.spi.impl.jre;
 
 import dev.webfx.platform.ast.AstObject;
 import org.java_websocket.client.WebSocketClient;
@@ -35,12 +35,9 @@
 import java.nio.charset.StandardCharsets;
 
 /*
- * @author 田传武 (aka Larry Tin) - author of Goodow realtime-android project
- * @author Bruno Salmon - fork, refactor & update for the webfx project
- *
- * <a href="https://github.com/goodow/realtime-android/blob/master/src/main/java/com/goodow/realtime/core/WebSocket.java">Original Goodow class</a>
+ * @author Bruno Salmon
  */
-public final class JavaWebSocket implements WebSocket {
+public final class JreWebSocket implements WebSocket {
     private static final Charset charset = StandardCharsets.UTF_8;
     private static final CharsetDecoder decoder = charset.newDecoder();
 
@@ -55,7 +52,7 @@ private static String toString(ByteBuffer buffer) throws CharacterCodingExceptio
     private final WebSocketClient socket;
     private WebSocketListener listener;
 
-    public JavaWebSocket(String uri) {
+    public JreWebSocket(String uri) {
         URI serverUri;
         try {
             serverUri = new URI(uri);
@@ -80,7 +77,7 @@ public void onMessage(String msg) {
             public void onMessage(ByteBuffer buffer) {
                 try {
                     if (listener != null)
-                        listener.onMessage(JavaWebSocket.toString(buffer));
+                        listener.onMessage(JreWebSocket.toString(buffer));
                 } catch (CharacterCodingException e) {
                     Console.log("Websocket Failed when Charset Decoding", e);
                 }
diff --git a/webfx-stack-com-websocket-jre/src/main/java/dev/webfx/stack/com/websocket/spi/impl/jre/JreWebSocketServiceProvider.java b/webfx-stack-com-websocket-jre/src/main/java/dev/webfx/stack/com/websocket/spi/impl/jre/JreWebSocketServiceProvider.java
@@ -15,7 +15,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package dev.webfx.stack.com.websocket.spi.impl.java;
+package dev.webfx.stack.com.websocket.spi.impl.jre;
 
 import dev.webfx.stack.com.websocket.WebSocket;
 import dev.webfx.stack.com.websocket.spi.WebSocketServiceProvider;
@@ -24,10 +24,10 @@
 /*
  * @author Bruno Salmon
  */
-public final class JavaWebSocketServiceProvider implements WebSocketServiceProvider {
+public final class JreWebSocketServiceProvider implements WebSocketServiceProvider {
 
     @Override
     public WebSocket createWebSocket(String url, ReadOnlyAstObject options) {
-        return new JavaWebSocket(url);
+        return new JreWebSocket(url);
     }
 }
diff --git a/webfx-stack-com-websocket-jre/src/main/java/module-info.java b/webfx-stack-com-websocket-jre/src/main/java/module-info.java
@@ -1,6 +1,6 @@
 // File managed by WebFX (DO NOT EDIT MANUALLY)
 
-module webfx.stack.com.websocket.java {
+module webfx.stack.com.websocket.jre {
 
     // Direct dependencies modules
     requires org.java_websocket;
@@ -9,9 +9,9 @@
     requires webfx.stack.com.websocket;
 
     // Exported packages
-    exports dev.webfx.stack.com.websocket.spi.impl.java;
+    exports dev.webfx.stack.com.websocket.spi.impl.jre;
 
     // Provided services
-    provides dev.webfx.stack.com.websocket.spi.WebSocketServiceProvider with dev.webfx.stack.com.websocket.spi.impl.java.JavaWebSocketServiceProvider;
+    provides dev.webfx.stack.com.websocket.spi.WebSocketServiceProvider with dev.webfx.stack.com.websocket.spi.impl.jre.JreWebSocketServiceProvider;
 
 }
diff --git a/webfx-stack-com-websocket-jre/src/main/resources/META-INF/services/dev.webfx.stack.com.websocket.spi.WebSocketServiceProvider b/webfx-stack-com-websocket-jre/src/main/resources/META-INF/services/dev.webfx.stack.com.websocket.spi.WebSocketServiceProvider
@@ -0,0 +1 @@
+dev.webfx.stack.com.websocket.spi.impl.jre.JreWebSocketServiceProvider
diff --git a/webfx-stack-com-websocket-jre/webfx.xml b/webfx-stack-com-websocket-jre/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.java.JavaWebSocketServiceProvider</provider>
+        <provider interface="dev.webfx.stack.com.websocket.spi.WebSocketServiceProvider">dev.webfx.stack.com.websocket.spi.impl.jre.JreWebSocketServiceProvider</provider>
     </providers>
 
     <dependencies>
diff --git a/webfx-stack-db-querysubmit-jre-jdbc/pom.xml b/webfx-stack-db-querysubmit-jre-jdbc/pom.xml
@@ -11,7 +11,7 @@
         <version>0.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>webfx-stack-db-querysubmit-java-jdbc</artifactId>
+    <artifactId>webfx-stack-db-querysubmit-jre-jdbc</artifactId>
 
     <dependencies>
 
diff --git a/webfx-stack-db-querysubmit-jre-jdbc/src/main/java/dev/webfx/stack/db/query/spi/impl/jdbc/JdbcQueryServiceProvider.java b/webfx-stack-db-querysubmit-jre-jdbc/src/main/java/dev/webfx/stack/db/query/spi/impl/jdbc/JdbcQueryServiceProvider.java
diff --git a/webfx-stack-db-querysubmit-jre-jdbc/src/main/java/dev/webfx/stack/db/querysubmit/jdbc/JdbcLocalConnectedQuerySubmitServiceProvider.java b/webfx-stack-db-querysubmit-jre-jdbc/src/main/java/dev/webfx/stack/db/querysubmit/jdbc/JdbcLocalConnectedQuerySubmitServiceProvider.java
diff --git a/webfx-stack-db-querysubmit-jre-jdbc/src/main/java/dev/webfx/stack/db/submit/spi/impl/jdbc/JdbcSubmitServiceProvider.java b/webfx-stack-db-querysubmit-jre-jdbc/src/main/java/dev/webfx/stack/db/submit/spi/impl/jdbc/JdbcSubmitServiceProvider.java
diff --git a/webfx-stack-db-querysubmit-jre-jdbc/src/main/java/module-info.java b/webfx-stack-db-querysubmit-jre-jdbc/src/main/java/module-info.java
@@ -1,6 +1,6 @@
 // File managed by WebFX (DO NOT EDIT MANUALLY)
 
-module webfx.stack.db.querysubmit.java.jdbc {
+module webfx.stack.db.querysubmit.jre.jdbc {
 
     // Direct dependencies modules
     requires static com.zaxxer.hikari;
diff --git a/webfx-stack-db-querysubmit-jre-jdbc/src/main/resources/META-INF/services/dev.webfx.stack.db.query.spi.QueryServiceProvider b/webfx-stack-db-querysubmit-jre-jdbc/src/main/resources/META-INF/services/dev.webfx.stack.db.query.spi.QueryServiceProvider
diff --git a/webfx-stack-db-querysubmit-jre-jdbc/src/main/resources/META-INF/services/dev.webfx.stack.db.submit.spi.SubmitServiceProvider b/webfx-stack-db-querysubmit-jre-jdbc/src/main/resources/META-INF/services/dev.webfx.stack.db.submit.spi.SubmitServiceProvider
diff --git a/webfx-stack-db-querysubmit-jre-jdbc/webfx.xml b/webfx-stack-db-querysubmit-jre-jdbc/webfx.xml

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+dev.webfx.stack.com.bus.spi.impl.json.client.websocket.jre.JreWebsocketBusServiceProvider`