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
The following commit(s) were added to refs/heads/feature/merlot by this push:
new 61f40f7 Access to the JDK HttpServer has been corrected, and the
system now uses pax-web.
61f40f7 is described below
commit 61f40f711060052f73fa6f7b5225737366512071
Author: César García <[email protected]>
AuthorDate: Mon Mar 16 19:38:12 2026 -0400
Access to the JDK HttpServer has been corrected, and the system now uses
pax-web.
---
.../org.apache.plc4x.merlot.archiver/pom.xml | 1 +
.../impl/MerlotDataBrowserSupportImpl.java | 26 +++++++++++-----------
.../src/main/feature/feature.xml | 16 ++++++++++++-
.../org.apache.plc4x.merlot/config.properties | 3 ++-
plc4j/tools/merlot/pom.xml | 4 ++--
5 files changed, 33 insertions(+), 17 deletions(-)
diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/pom.xml
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/pom.xml
index b0ba0d2..3f0633d 100644
--- a/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/pom.xml
+++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/pom.xml
@@ -49,6 +49,7 @@
<Import-Package>org.epics.gpclient.datasource.sim,
org.epics.gpclient.datasource.pva,
com.sun.net.httpserver.*,
+ java.nio.file.spi,
*
</Import-Package>
<Karaf-Commands>org.apache.plc4x.merlot.api.command*</Karaf-Commands>
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/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
index 6198ba9..69dfacb 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/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
@@ -39,7 +39,7 @@ public class MerlotDataBrowserSupportImpl extends
MerlotPvHtcCollectorImpl {
private static final org.slf4j.Logger LOGGER =
LoggerFactory.getLogger(MerlotDataBrowserSupportImpl.class);
- private HttpServer server;
+// private HttpServer server;
public MerlotDataBrowserSupportImpl(Scheduler scheduler, EventAdmin
eventAdmin, MerlotGPClient gpClient) {
@@ -49,23 +49,23 @@ public class MerlotDataBrowserSupportImpl extends
MerlotPvHtcCollectorImpl {
@Override
public void start() {
super.start();
- 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/data/getData.raw", new
MyHandler());
- server.setExecutor(null); // Use the default executor
- server.start();
- System.out.println("Server is running on port 2000");
- } catch (IOException e) {
- System.out.println("Error starting the server: " + e.getMessage());
- }
+// 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/data/getData.raw", new
MyHandler());
+// server.setExecutor(null); // Use the default executor
+// server.start();
+// System.out.println("Server is running on port 2000");
+// } catch (IOException e) {
+// System.out.println("Error starting the server: " +
e.getMessage());
+// }
}
@Override
public void stop() {
super.stop();
- server.stop(10);
+// server.stop(10);
}
@Override
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.features/src/main/feature/feature.xml
b/plc4j/tools/merlot/org.apache.plc4x.merlot.features/src/main/feature/feature.xml
index 870e8cb..4b826f0 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.features/src/main/feature/feature.xml
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.features/src/main/feature/feature.xml
@@ -28,6 +28,13 @@
<feature prerequisite="true">aries-blueprint</feature>
<feature prerequisite="true">spifly</feature>
<feature prerequisite="true">pax-jdbc-sqlite</feature>
+ <!-- Http services -->
+ <feature prerequisite="true">pax-web-jetty</feature>
+ <feature prerequisite="true">pax-web-http</feature>
+ <feature prerequisite="true">pax-web-http-whiteboard</feature>
+ <feature prerequisite="true">pax-web-war</feature>
+ <feature prerequisite="true">pax-web-karaf</feature>
+
<feature>plc4x-epics-gpclient</feature>
<bundle>wrap:mvn:org.osgi/org.osgi.service.device/1.1.0/$Export-Package=*;version="1.1.0",!*</bundle>
@@ -46,7 +53,14 @@
<bundle
start-level="30">wrap:mvn:org.apache.commons/commons-lang3/${commons-lang3.version}/$Export-Package=*;version="${commons-lang3.version}",!*</bundle>
<bundle
start-level="28">mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
<bundle
start-level="28">mvn:commons-io/commons-io/${commons-io.version}</bundle>
- <bundle
start-level="28">mvn:commons-net/commons-net/${commons-net.version}</bundle>
+ <!--<bundle
start-level="32">wrap:mvn:org.apache.commons/commons-io/${commons-io.version}/$Bundle-SymbolicName=commons-io&Bundle-Version=${commons-io.version}&Export-Package=*;version="${commons-io.version}",!*</bundle>-->
+
+
+ <bundle
start-level="28">mvn:commons-net/commons-net/${commons-net.version}</bundle>
+ <!--<bundle
start-level="32">wrap:mvn:org.apache.commons/commons-net/${commons-net.version}/$Bundle-SymbolicName=commons-net&Bundle-Version=${commons-net.version}&Export-Package=*;version="${commons-net.version}",!*</bundle>-->
+ <bundle
start-level="28">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-net/1.4.1_6</bundle>
+ <bundle
start-level="28">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/1.4_3</bundle>
+
<bundle
start-level="28">mvn:org.apache.aries.spifly/org.apache.aries.spifly.static.bundle/${spifly.version}</bundle>
<!-- Netty librarys -->
diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot/config.properties
b/plc4j/tools/merlot/org.apache.plc4x.merlot/config.properties
index c54f1d8..d029df8 100644
--- a/plc4j/tools/merlot/org.apache.plc4x.merlot/config.properties
+++ b/plc4j/tools/merlot/org.apache.plc4x.merlot/config.properties
@@ -93,6 +93,7 @@ org.osgi.framework.system.packages.extra = \
com.sun.jmx.remote.protocol, \
com.sun.jmx.remote.protocol.jmxmp, \
com.sun.net.httpserver, \
+ java.nio.file.spi, \
org.apache.karaf.jaas.boot;uses:=\"javax.security.auth,javax.security.auth.callback,javax.security.auth.login,javax.security.auth.spi,org.osgi.framework\";version=4.4.6,
\
org.apache.karaf.jaas.boot.principal;uses:=javax.security.auth;version=4.4.6, \
org.apache.karaf.diagnostic.core;uses:=org.osgi.framework;version=4.4.6, \
@@ -242,7 +243,7 @@ org.osgi.framework.bootdelegation = \
#
# YourKit support
# in order to use Karaf with YourKit, the org.osgi.framework.bootdelegation
property has to contain the com.yourkit.* packages
-# and, so, it should look like:
+#\u00c2\u00a0and, so, it should look like:
#
#
org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,org.apache.karaf.jaas.boot.principal,sun.*,com.sun.*,javax.transaction,javax.transaction.*,javax.xml.crypto,javax.xml.crypto.*,org.apache.xerces.jaxp.datatype,org.apache.xerces.stax,org.apache.xerces.parsers,org.apache.xerces.jaxp,org.apache.xerces.jaxp.validation,org.apache.xerces.dom,com.yourkit.*
#
diff --git a/plc4j/tools/merlot/pom.xml b/plc4j/tools/merlot/pom.xml
index ff5492a..c63ceb5 100644
--- a/plc4j/tools/merlot/pom.xml
+++ b/plc4j/tools/merlot/pom.xml
@@ -60,7 +60,7 @@ under the License.
<bit-io.version>1.4.3</bit-io.version>
<c3p0.version>0.9.5.5</c3p0.version>
<commons-codec.version>1.19.0</commons-codec.version>
- <commons-net.version>3.12.0</commons-net.version>
+ <commons-net.version>3.12.0</commons-net.version>
<commons-lang3.version>3.20.0</commons-lang3.version>
<commons-io.version>2.21.0</commons-io.version>
<hikaricp.version>2.7.9</hikaricp.version>
@@ -92,7 +92,7 @@ under the License.
<javaluator.version>3.0.3</javaluator.version>
<!-- Integration version -->
- <karaf.version>4.4.6</karaf.version>
+ <karaf.version>4.4.10</karaf.version>
<decanter.version>2.10.0</decanter.version>
<org.osgi.core.version>6.0.0</org.osgi.core.version>
<osgi.core.version>8.0.0</osgi.core.version>
