This is an automated email from the ASF dual-hosted git repository.
cgarcia pushed a commit to branch feature/app
in repository https://gitbox.apache.org/repos/asf/plc4x-extras.git
The following commit(s) were added to refs/heads/feature/app by this push:
new 887aeae Reorganizando la estructura del proyecto.
887aeae is described below
commit 887aeae3da81702fc24ef203503a36b4262fd787
Author: César García <[email protected]>
AuthorDate: Tue Feb 24 20:20:34 2026 -0400
Reorganizando la estructura del proyecto.
---
plc4j/tools/malbec/malbec-core/pom.xml | 2 +-
plc4j/tools/malbec/malbec-core/scheduler/pom.xml | 10 ++++++
.../malbec/core/scheduler/core/Activator.java | 10 ++----
.../core/scheduler/core/WhiteboardHandler.java | 42 ++++++----------------
.../malbec/modbus/core/Plc4xModbusAsciiDialog.form | 5 +++
.../malbec/modbus/core/Plc4xModbusAsciiDialog.java | 3 ++
.../plc4x/malbec/modbus/core/Bundle.properties | 1 +
7 files changed, 32 insertions(+), 41 deletions(-)
diff --git a/plc4j/tools/malbec/malbec-core/pom.xml
b/plc4j/tools/malbec/malbec-core/pom.xml
index d737e58..55e45c4 100644
--- a/plc4j/tools/malbec/malbec-core/pom.xml
+++ b/plc4j/tools/malbec/malbec-core/pom.xml
@@ -16,6 +16,6 @@
<module>libs</module>
<module>css</module>
<module>ctx</module>
- <module>scheduler</module>
+ <!--<module>scheduler</module>-->
</modules>
</project>
\ No newline at end of file
diff --git a/plc4j/tools/malbec/malbec-core/scheduler/pom.xml
b/plc4j/tools/malbec/malbec-core/scheduler/pom.xml
index d474e4b..fafaf00 100644
--- a/plc4j/tools/malbec/malbec-core/scheduler/pom.xml
+++ b/plc4j/tools/malbec/malbec-core/scheduler/pom.xml
@@ -66,5 +66,15 @@
<artifactId>slf4j-api</artifactId>
<version>2.0.17</version>
</dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-util-lookup</artifactId>
+ <version>RELEASE280</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ctx</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git
a/plc4j/tools/malbec/malbec-core/scheduler/src/main/java/org/apache/plc4x/malbec/core/scheduler/core/Activator.java
b/plc4j/tools/malbec/malbec-core/scheduler/src/main/java/org/apache/plc4x/malbec/core/scheduler/core/Activator.java
index a8c4f7c..f37b35d 100644
---
a/plc4j/tools/malbec/malbec-core/scheduler/src/main/java/org/apache/plc4x/malbec/core/scheduler/core/Activator.java
+++
b/plc4j/tools/malbec/malbec-core/scheduler/src/main/java/org/apache/plc4x/malbec/core/scheduler/core/Activator.java
@@ -16,13 +16,8 @@
*/
package org.apache.plc4x.malbec.core.scheduler.core;
-
-import java.util.Enumeration;
import java.util.Properties;
-import static javax.security.auth.login.Configuration.getConfiguration;
import org.apache.plc4x.malbec.core.scheduler.api.Scheduler;
-import org.apache.plc4x.malbec.core.scheduler.core.QuartzScheduler;
-import org.apache.plc4x.malbec.core.scheduler.core.WhiteboardHandler;
import org.openide.modules.ModuleInstall;
import org.openide.util.Lookup;
@@ -32,11 +27,10 @@ public class Activator extends ModuleInstall {
private WhiteboardHandler whiteboardHandler;
@Override
- public void restored() {
-
+ public void restored() {
Properties properties = new Properties();
Scheduler scheduler = Lookup.getDefault().lookup(Scheduler.class);
- whiteboardHandler = new WhiteboardHandler(bundleContext, scheduler);
+ whiteboardHandler = new WhiteboardHandler(scheduler);
// SchedulerMBeanImpl mBean = new SchedulerMBeanImpl();
// mBean.setScheduler(scheduler);
diff --git
a/plc4j/tools/malbec/malbec-core/scheduler/src/main/java/org/apache/plc4x/malbec/core/scheduler/core/WhiteboardHandler.java
b/plc4j/tools/malbec/malbec-core/scheduler/src/main/java/org/apache/plc4x/malbec/core/scheduler/core/WhiteboardHandler.java
index f39a99a..1608523 100644
---
a/plc4j/tools/malbec/malbec-core/scheduler/src/main/java/org/apache/plc4x/malbec/core/scheduler/core/WhiteboardHandler.java
+++
b/plc4j/tools/malbec/malbec-core/scheduler/src/main/java/org/apache/plc4x/malbec/core/scheduler/core/WhiteboardHandler.java
@@ -16,18 +16,17 @@
*/
package org.apache.plc4x.malbec.core.scheduler.core;
-import java.lang.System.Logger;
import java.util.ArrayList;
import java.util.Date;
-
-
+import org.apache.plc4x.malbec.core.ctx.ModuleContext;
+import org.apache.plc4x.malbec.core.scheduler.api.Job;
import org.apache.plc4x.malbec.core.scheduler.api.Scheduler;
+import org.openide.util.Lookup;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
import org.osgi.util.tracker.ServiceTracker;
import org.osgi.util.tracker.ServiceTrackerCustomizer;
-import org.quartz.Job;
import org.quartz.impl.jdbcjobstore.Constants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,48 +42,26 @@ public class WhiteboardHandler {
private Scheduler scheduler;
- private ServiceTracker<?,?> serviceTracker;
+ private Lookup.Result<Job> jobs = null;
- public WhiteboardHandler(final BundleContext context, Scheduler scheduler)
throws InvalidSyntaxException {
+ public WhiteboardHandler(Scheduler scheduler) {
this.scheduler = scheduler;
- this.serviceTracker = new ServiceTracker<>(context,
- context.createFilter("(|(" + Constants.OBJECTCLASS + "=" +
Runnable.class.getName() + ")" +
- "(" + Constants.OBJECTCLASS + "=" +
Job.class.getName() + "))"),
- new ServiceTrackerCustomizer<Object,Object>() {
-
- public synchronized void removedService(final
ServiceReference reference, final Object service) {
- context.ungetService(reference);
- unregister(reference, service);
- }
-
- public synchronized void modifiedService(final
ServiceReference reference, final Object service) {
- unregister(reference, service);
- register(reference, service);
- }
-
- public synchronized Object addingService(final
ServiceReference reference) {
- final Object obj = context.getService(reference);
- if ( obj != null ) {
- register(reference, obj);
- }
- return obj;
- }
- });
- this.serviceTracker.open();
+ ModuleContext mctx = Lookup.getDefault().lookup(ModuleContext.class);
+ jobs = mctx.lookupResult(Job.class);
}
/**
* Deactivate this component.
*/
public void deactivate() {
- this.serviceTracker.close();
+ //
}
/**
* Create unique identifier
*/
- private String getServiceIdentifier(final ServiceReference ref) {
+ private String getServiceIdentifier(final ServiceReference ref) {
String name = (String)
ref.getProperty(Scheduler.PROPERTY_SCHEDULER_NAME);
if ( name == null ) {
if (ref.getProperty(Constants.SERVICE_PID) instanceof String) {
@@ -108,6 +85,7 @@ public class WhiteboardHandler {
*/
private void register(final ServiceReference ref, final Object job) {
final String name = getServiceIdentifier(ref);
+ Job refJob = (Job) job;
Boolean concurrent = true;
if (ref.getProperty(Scheduler.PROPERTY_SCHEDULER_CONCURRENT) != null) {
if (ref.getProperty(Scheduler.PROPERTY_SCHEDULER_CONCURRENT)
instanceof Boolean) {
diff --git
a/plc4j/tools/malbec/malbec-plc4x/modbus/src/main/java/org/apache/plc4x/malbec/modbus/core/Plc4xModbusAsciiDialog.form
b/plc4j/tools/malbec/malbec-plc4x/modbus/src/main/java/org/apache/plc4x/malbec/modbus/core/Plc4xModbusAsciiDialog.form
index f8df1cd..b18be60 100644
---
a/plc4j/tools/malbec/malbec-plc4x/modbus/src/main/java/org/apache/plc4x/malbec/modbus/core/Plc4xModbusAsciiDialog.form
+++
b/plc4j/tools/malbec/malbec-plc4x/modbus/src/main/java/org/apache/plc4x/malbec/modbus/core/Plc4xModbusAsciiDialog.form
@@ -300,6 +300,11 @@
</Border>
</Property>
</Properties>
+ <AccessibilityProperties>
+ <Property name="AccessibleContext.accessibleName"
type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString
bundle="org/apache/plc4x/malbec/modbus/core/Bundle.properties" key="LBL_Device"
replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class,
"{key}")"/>
+ </Property>
+ </AccessibilityProperties>
<Layout>
<DimensionLayout dim="0">
diff --git
a/plc4j/tools/malbec/malbec-plc4x/modbus/src/main/java/org/apache/plc4x/malbec/modbus/core/Plc4xModbusAsciiDialog.java
b/plc4j/tools/malbec/malbec-plc4x/modbus/src/main/java/org/apache/plc4x/malbec/modbus/core/Plc4xModbusAsciiDialog.java
index 12b023a..2fa62e3 100644
---
a/plc4j/tools/malbec/malbec-plc4x/modbus/src/main/java/org/apache/plc4x/malbec/modbus/core/Plc4xModbusAsciiDialog.java
+++
b/plc4j/tools/malbec/malbec-plc4x/modbus/src/main/java/org/apache/plc4x/malbec/modbus/core/Plc4xModbusAsciiDialog.java
@@ -33,6 +33,7 @@ import org.openide.util.Lookup;
import org.openide.util.lookup.ServiceProvider;
import org.apache.plc4x.malbec.api.DeviceRecord;
import org.apache.plc4x.malbec.api.DriverRecord;
+import org.openide.util.NbBundle;
@ServiceProvider(service=Plc4xDialog.class, path="Plc4xDriver/modbus-ascii")
public class Plc4xModbusAsciiDialog extends JDialog implements Plc4xDialog {
@@ -363,6 +364,8 @@ public class Plc4xModbusAsciiDialog extends JDialog
implements Plc4xDialog {
.addContainerGap())
);
+
jPanel3.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(Plc4xModbusAsciiDialog.class,
"LBL_Device")); // NOI18N
+
pack();
}// </editor-fold>//GEN-END:initComponents
diff --git
a/plc4j/tools/malbec/malbec-plc4x/modbus/src/main/resources/org/apache/plc4x/malbec/modbus/core/Bundle.properties
b/plc4j/tools/malbec/malbec-plc4x/modbus/src/main/resources/org/apache/plc4x/malbec/modbus/core/Bundle.properties
new file mode 100644
index 0000000..c0adb27
--- /dev/null
+++
b/plc4j/tools/malbec/malbec-plc4x/modbus/src/main/resources/org/apache/plc4x/malbec/modbus/core/Bundle.properties
@@ -0,0 +1 @@
+LBL_Device=Device_3\n
