This is an automated email from the ASF dual-hosted git repository. cgarcia pushed a commit to branch feature/merlot in repository https://gitbox.apache.org/repos/asf/plc4x-extras.git
commit 092dcc0ea0a030652489e7e7d7a8222d59b20c3a Author: César García <[email protected]> AuthorDate: Mon Jan 5 16:25:56 2026 -0400 Working on DataBrowser support. --- .../plc4x/merlot/archiver/impl/BorrarImpl.java | 34 ---------------------- .../pom.xml | 5 ++++ .../main/cfg/org.apache.plc4x.merlot.archiver.cfg | 0 .../org.apache.plc4x.merlot.decanter-grafana.cfg | 0 .../cfg/org.apache.plc4x.merlot.decanter-iotdb.cfg | 0 .../src/main/cfg/org.apache.plc4x.merlot.pvhtc.cfg | 0 .../plc4x/merlot/archiver/api/BrokerService.java | 0 .../plc4x/merlot/archiver/api/MerlotAppender.java | 0 .../plc4x/merlot/archiver/api/MerlotCollector.java | 0 .../archiver/api/MerlotDataBrowserSupport.java | 0 .../merlot/archiver/api/MerlotDecanterFactory.java | 0 .../plc4x/merlot/archiver/api/MerlotGPClient.java | 0 .../merlot/archiver/api/MerlotIoTDBWrapper.java | 0 .../core/MerlotDecanterManagedService.java | 0 .../archiver/core/MerlotHtcManagedService.java | 0 .../merlot/archiver/impl/BrokerServiceImpl.java | 0 .../impl/MerlotDataBrowserSupportImpl.java | 23 +++++++++++++-- .../merlot/archiver/impl/MerlotGPClientImpl.java | 0 .../archiver/impl/MerlotMqttAppenderFactory.java | 0 .../archiver/impl/MerlotMqttAppenderImpl.java | 0 .../archiver/impl/MerlotPvHtcCollectorImpl.java | 0 .../archiver/impl/MerlotPvRtCollectorImpl.java | 0 .../OSGI-INF/blueprint/archiver-service.xml} | 0 plc4j/tools/merlot/pom.xml | 2 +- 24 files changed, 26 insertions(+), 38 deletions(-) diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/BorrarImpl.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/BorrarImpl.java deleted file mode 100644 index 22a78c4..0000000 --- a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/BorrarImpl.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template - */ -package org.apache.plc4x.merlot.archiver.impl; - -import java.io.IOException; -import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * - * @author cgarcia - */ -public class BorrarImpl extends HttpServlet{ - - @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - try (PrintWriter writer = resp.getWriter()) { - writer.println("<html>"); - writer.println("<head>"); - writer.println("<title>Example</title>"); - writer.println("</head>"); - writer.println("<body align='center'>"); - writer.println("<h1>Example Servlet</h1>"); - writer.println("</body>"); - writer.println("</html>"); - } - } - -} diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/pom.xml b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/pom.xml similarity index 97% rename from plc4j/tools/merlot/org.apache.plc4x.merlot.archive/pom.xml rename to plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/pom.xml index 5e90013..b0ba0d2 100644 --- a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/pom.xml +++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/pom.xml @@ -177,5 +177,10 @@ <version>${javax.servlet.version}</version> <type>jar</type> </dependency> + <dependency> + <groupId>org.apache.iotdb</groupId> + <artifactId>iotdb-session</artifactId> + <version>2.0.5</version> + </dependency> </dependencies> </project> diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/cfg/org.apache.plc4x.merlot.archiver.cfg b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/cfg/org.apache.plc4x.merlot.archiver.cfg similarity index 100% rename from plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/cfg/org.apache.plc4x.merlot.archiver.cfg rename to plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/cfg/org.apache.plc4x.merlot.archiver.cfg diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/cfg/org.apache.plc4x.merlot.decanter-grafana.cfg b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/cfg/org.apache.plc4x.merlot.decanter-grafana.cfg similarity index 100% rename from plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/cfg/org.apache.plc4x.merlot.decanter-grafana.cfg rename to plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/cfg/org.apache.plc4x.merlot.decanter-grafana.cfg diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/cfg/org.apache.plc4x.merlot.decanter-iotdb.cfg b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/cfg/org.apache.plc4x.merlot.decanter-iotdb.cfg similarity index 100% rename from plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/cfg/org.apache.plc4x.merlot.decanter-iotdb.cfg rename to plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/cfg/org.apache.plc4x.merlot.decanter-iotdb.cfg diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/cfg/org.apache.plc4x.merlot.pvhtc.cfg b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/cfg/org.apache.plc4x.merlot.pvhtc.cfg similarity index 100% rename from plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/cfg/org.apache.plc4x.merlot.pvhtc.cfg rename to plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/cfg/org.apache.plc4x.merlot.pvhtc.cfg diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/BrokerService.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/api/BrokerService.java similarity index 100% rename from plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/BrokerService.java rename to plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/api/BrokerService.java diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotAppender.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotAppender.java similarity index 100% rename from plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotAppender.java rename to plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotAppender.java diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotCollector.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotCollector.java similarity index 100% rename from plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotCollector.java rename to plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotCollector.java diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotDataBrowserSupport.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotDataBrowserSupport.java similarity index 100% rename from plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotDataBrowserSupport.java rename to plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotDataBrowserSupport.java diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotDecanterFactory.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotDecanterFactory.java similarity index 100% rename from plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotDecanterFactory.java rename to plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotDecanterFactory.java diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotGPClient.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotGPClient.java similarity index 100% rename from plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotGPClient.java rename to plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotGPClient.java diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotIoTDBWrapper.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotIoTDBWrapper.java similarity index 100% rename from plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotIoTDBWrapper.java rename to plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotIoTDBWrapper.java diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/core/MerlotDecanterManagedService.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/core/MerlotDecanterManagedService.java similarity index 100% rename from plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/core/MerlotDecanterManagedService.java rename to plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/core/MerlotDecanterManagedService.java diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/core/MerlotHtcManagedService.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/core/MerlotHtcManagedService.java similarity index 100% rename from plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/core/MerlotHtcManagedService.java rename to plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/core/MerlotHtcManagedService.java diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/BrokerServiceImpl.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/BrokerServiceImpl.java similarity index 100% rename from plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/BrokerServiceImpl.java rename to plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/BrokerServiceImpl.java diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotDataBrowserSupportImpl.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotDataBrowserSupportImpl.java similarity index 80% rename from plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotDataBrowserSupportImpl.java rename to plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotDataBrowserSupportImpl.java index 5728ae1..88b85ff 100644 --- a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotDataBrowserSupportImpl.java +++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotDataBrowserSupportImpl.java @@ -52,7 +52,8 @@ public class MerlotDataBrowserSupportImpl extends MerlotPvHtcCollectorImpl { try { server = HttpServer.create(new InetSocketAddress(2000), 0); // Create a context for a specific path and set the handler - server.createContext("/request/bpl/searchForPVsRegex", new MyHandler()); + server.createContext("/request/bpl/searchForPVsRegex", new MyHandler()); + server.createContext("/request/data/getData.raw", new MyHandler()); server.setExecutor(null); // Use the default executor server.start(); System.out.println("Server is running on port 8000"); @@ -93,12 +94,28 @@ public class MerlotDataBrowserSupportImpl extends MerlotPvHtcCollectorImpl { System.out.println("Protocol: " + exchange.getProtocol()); System.out.println("Method : " + exchange.getRequestMethod()); System.out.println("URI : " + exchange.getRequestURI().toString()); - String response = "uno\ndos\ntres"; + String response = "uno\r\ndos\r\ntres\r\n"; exchange.sendResponseHeaders(200, response.length()); OutputStream os = exchange.getResponseBody(); os.write(response.getBytes()); os.close(); } - } + } + + static class MyHandler2 implements HttpHandler { + @Override + public void handle(HttpExchange exchange) throws IOException + { + // Handle the request + System.out.println("2 Protocol: " + exchange.getProtocol()); + System.out.println("2 Method : " + exchange.getRequestMethod()); + System.out.println("2 URI : " + exchange.getRequestURI().toString()); + String response = "uno\r\ndos\r\ntres\r\n"; + exchange.sendResponseHeaders(200, response.length()); + OutputStream os = exchange.getResponseBody(); + os.write(response.getBytes()); + os.close(); + } + } } diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotGPClientImpl.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotGPClientImpl.java similarity index 100% rename from plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotGPClientImpl.java rename to plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotGPClientImpl.java diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotMqttAppenderFactory.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotMqttAppenderFactory.java similarity index 100% rename from plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotMqttAppenderFactory.java rename to plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotMqttAppenderFactory.java diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotMqttAppenderImpl.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotMqttAppenderImpl.java similarity index 100% rename from plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotMqttAppenderImpl.java rename to plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotMqttAppenderImpl.java diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotPvHtcCollectorImpl.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotPvHtcCollectorImpl.java similarity index 100% rename from plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotPvHtcCollectorImpl.java rename to plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotPvHtcCollectorImpl.java diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotPvRtCollectorImpl.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotPvRtCollectorImpl.java similarity index 100% rename from plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotPvRtCollectorImpl.java rename to plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotPvRtCollectorImpl.java diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/resources/OSGI-INF/blueprint/decanter-service.xml b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/resources/OSGI-INF/blueprint/archiver-service.xml similarity index 100% rename from plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/resources/OSGI-INF/blueprint/decanter-service.xml rename to plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/resources/OSGI-INF/blueprint/archiver-service.xml diff --git a/plc4j/tools/merlot/pom.xml b/plc4j/tools/merlot/pom.xml index 4811139..ff5492a 100644 --- a/plc4j/tools/merlot/pom.xml +++ b/plc4j/tools/merlot/pom.xml @@ -157,7 +157,7 @@ under the License. <!-- <module>org.apache.plc4x.merlot.ui</module> --> <module>org.apache.plc4x.merlot.drv.s7</module> <module>org.apache.plc4x.merlot.drv.mb</module> - <module>org.apache.plc4x.merlot.archive</module> + <module>org.apache.plc4x.merlot.archiver</module> <module>org.apache.plc4x.merlot</module> </modules>
