From b1a235695e876269172d9db401eb0a25af938a30 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 19 Jul 2022 13:05:08 +0200
Subject: [PATCH] Introduce CMS client

---
 .../{internal/http => }/client/SpnegoHttpClient.java  |  2 +-
 .../org/argeo/cms/client}/WebSocketEventClient.java   | 11 ++++++++---
 .../org/argeo/cms/{internal/http => }/client/jaas.cfg |  0
 3 files changed, 9 insertions(+), 4 deletions(-)
 rename org.argeo.cms/src/org/argeo/cms/{internal/http => }/client/SpnegoHttpClient.java (98%)
 rename {org.argeo.cms.ee/src/org/argeo/cms/websocket/server => org.argeo.cms/src/org/argeo/cms/client}/WebSocketEventClient.java (83%)
 rename org.argeo.cms/src/org/argeo/cms/{internal/http => }/client/jaas.cfg (100%)

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/http/client/SpnegoHttpClient.java b/org.argeo.cms/src/org/argeo/cms/client/SpnegoHttpClient.java
similarity index 98%
rename from org.argeo.cms/src/org/argeo/cms/internal/http/client/SpnegoHttpClient.java
rename to org.argeo.cms/src/org/argeo/cms/client/SpnegoHttpClient.java
index 42b2a2d12..e530f5550 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/http/client/SpnegoHttpClient.java
+++ b/org.argeo.cms/src/org/argeo/cms/client/SpnegoHttpClient.java
@@ -1,4 +1,4 @@
-package org.argeo.cms.internal.http.client;
+package org.argeo.cms.client;
 
 import java.net.MalformedURLException;
 import java.net.URL;
diff --git a/org.argeo.cms.ee/src/org/argeo/cms/websocket/server/WebSocketEventClient.java b/org.argeo.cms/src/org/argeo/cms/client/WebSocketEventClient.java
similarity index 83%
rename from org.argeo.cms.ee/src/org/argeo/cms/websocket/server/WebSocketEventClient.java
rename to org.argeo.cms/src/org/argeo/cms/client/WebSocketEventClient.java
index c6cb88aea..aab806a46 100644
--- a/org.argeo.cms.ee/src/org/argeo/cms/websocket/server/WebSocketEventClient.java
+++ b/org.argeo.cms/src/org/argeo/cms/client/WebSocketEventClient.java
@@ -1,4 +1,4 @@
-package org.argeo.cms.websocket.server;
+package org.argeo.cms.client;
 
 import java.net.URI;
 import java.net.http.HttpClient;
@@ -11,6 +11,12 @@ import java.util.concurrent.CompletionStage;
 public class WebSocketEventClient {
 
 	public static void main(String[] args) throws Exception {
+		if (args.length == 0) {
+			System.err.println("usage: java " + WebSocketEventClient.class.getName() + " <url>");
+			System.exit(1);
+			return;
+		}
+		URI uri = URI.create(args[0]);
 		WebSocket.Listener listener = new WebSocket.Listener() {
 
 			public CompletionStage<?> onText(WebSocket webSocket, CharSequence message, boolean last) {
@@ -28,8 +34,7 @@ public class WebSocketEventClient {
 		};
 
 		HttpClient client = HttpClient.newHttpClient();
-		CompletableFuture<WebSocket> ws = client.newWebSocketBuilder()
-				.buildAsync(URI.create("ws://localhost:7070/cms/status/event/cms"), listener);
+		CompletableFuture<WebSocket> ws = client.newWebSocketBuilder().buildAsync(uri, listener);
 		WebSocket webSocket = ws.get();
 		webSocket.request(Long.MAX_VALUE);
 
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/http/client/jaas.cfg b/org.argeo.cms/src/org/argeo/cms/client/jaas.cfg
similarity index 100%
rename from org.argeo.cms/src/org/argeo/cms/internal/http/client/jaas.cfg
rename to org.argeo.cms/src/org/argeo/cms/client/jaas.cfg
-- 
2.30.2