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 bfb7ac1 Test ClassLoader for gpclient.
bfb7ac1 is described below
commit bfb7ac106c87b4bd22ef67e4a9743b772ad2c1d1
Author: César García <[email protected]>
AuthorDate: Sat Mar 21 12:24:25 2026 -0400
Test ClassLoader for gpclient.
---
.../resources/OSGI-INF/blueprint/archiver-service.xml | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/resources/OSGI-INF/blueprint/archiver-service.xml
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/resources/OSGI-INF/blueprint/archiver-service.xml
index 8951e96..94a2326 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/resources/OSGI-INF/blueprint/archiver-service.xml
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/resources/OSGI-INF/blueprint/archiver-service.xml
@@ -95,7 +95,13 @@
destroy-method="destroy"
scope="singleton"
activation="eager">
- </bean>
+ </bean>
+
+<!-- <bean id="MerlotDataBrowserIoTDBSearchPVBean"
+
class="org.apache.plc4x.merlot.archiver.impl.MerlotDataBrowserIoTDBSearchPVImpl"
+ scope="singleton"
+ activation="eager">
+ </bean> -->
<!--
Why is this happening?
@@ -117,7 +123,8 @@
<reference-list
id="refDataSourceProvider"
interface="org.epics.gpclient.datasource.DataSourceProvider"
- ext:proxy-method="classes">
+ ext:proxy-method="classes"
+ availability="optional">
<reference-listener
bind-method="bindDataSourceProvider"
ref="MerlotHtcRTBean"/>
@@ -180,15 +187,15 @@
<service interface="javax.servlet.Servlet">
<service-properties>
<entry key="alias" value="/request/iotdb/bpl/searchForPVsRegex"/>
- <entry key="servlet-name" value="searchForPVsRegex"/>
+ <entry key="servlet-name" value="IoTDBsearchForPVsRegex"/>
</service-properties>
<bean
class="org.apache.plc4x.merlot.archiver.impl.MerlotDataBrowserIoTDBSearchPVImpl"/>
</service>
<service interface="javax.servlet.Servlet">
<service-properties>
- <entry key="alias" value="/request/iotdb/bpl/searchForPVsRegex"/>
- <entry key="servlet-name" value="searchForPVsRegex"/>
+ <entry key="alias" value="/request/rt/bpl/searchForPVsRegex"/>
+ <entry key="servlet-name" value="RTsearchForPVsRegex"/>
</service-properties>
<bean
class="org.apache.plc4x.merlot.archiver.impl.MerlotDataBrowserRTSearchPVImpl"/>
</service>