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 d230822 Fix project.
d230822 is described below
commit d230822e03d87bd01d18f164a9c406869a054d60
Author: César García <[email protected]>
AuthorDate: Wed Feb 25 02:40:44 2026 -0400
Fix project.
---
plc4j/tools/malbec/application/pom.xml | 62 ++----
plc4j/tools/malbec/branding/pom.xml | 3 +-
plc4j/tools/malbec/malbec-core/css/pom.xml | 27 +--
plc4j/tools/malbec/malbec-core/ctx/pom.xml | 2 +-
plc4j/tools/malbec/malbec-core/libs/pom.xml | 4 +-
plc4j/tools/malbec/malbec-core/scheduler/pom.xml | 8 +
.../malbec/core/scheduler/core/Activator.java | 5 +-
.../malbec/core/scheduler/core/Installer.java | 17 ++
.../core/scheduler/core/WhiteboardHandler.java | 217 +++++++++++----------
.../malbec-core/scheduler/src/main/nbm/manifest.mf | 1 +
plc4j/tools/malbec/malbec-plc4x/eip/pom.xml | 18 +-
plc4j/tools/malbec/malbec-plc4x/modbus/pom.xml | 18 +-
plc4j/tools/malbec/malbec-plc4x/s7/pom.xml | 18 +-
plc4j/tools/malbec/malbec-plc4x/services/pom.xml | 12 +-
.../plc4x/malbec/services/model/Bundle.properties | 8 +-
.../tools/malbec/malbec-projecttype/comms/pom.xml | 4 +-
.../tools/malbec/malbec-projecttype/events/pom.xml | 4 +-
plc4j/tools/malbec/malbec-projecttype/hmi/pom.xml | 24 +--
plc4j/tools/malbec/malbec-projecttype/htc/pom.xml | 4 +-
.../malbec/malbec-projecttype/information/pom.xml | 4 +-
.../malbec-projecttype/malbec-projecttype/pom.xml | 24 +--
.../malbec/projecttype/impl/Plc4xProjectImpl.java | 3 -
plc4j/tools/malbec/malbec-projecttype/pics/pom.xml | 4 +-
.../malbec/malbec-projecttype/recipes/pom.xml | 4 +-
.../malbec/malbec-projecttype/scripts/pom.xml | 4 +-
.../malbec/malbec-projecttype/securities/pom.xml | 4 +-
plc4j/tools/malbec/malbec-projecttype/tgl/pom.xml | 4 +-
plc4j/tools/malbec/malbec-projecttype/udt/pom.xml | 4 +-
28 files changed, 252 insertions(+), 259 deletions(-)
diff --git a/plc4j/tools/malbec/application/pom.xml
b/plc4j/tools/malbec/application/pom.xml
index debb972..d8158ef 100644
--- a/plc4j/tools/malbec/application/pom.xml
+++ b/plc4j/tools/malbec/application/pom.xml
@@ -26,6 +26,7 @@
<version>0.13.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.plc4x.malbec</groupId>
<artifactId>malbec</artifactId>
<packaging>nbm-application</packaging>
@@ -75,31 +76,6 @@
<artifactId>plc4x-services</artifactId>
<version>${project.version}</version>
</dependency> -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>malbec-branding</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>malbec-services</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>malbec-libs</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>malbec-modbus</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>malbec-s7</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-modules-jemmy</artifactId>
@@ -162,33 +138,37 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>plc4j-driver-eip</artifactId>
- <version>${plc4x.version}</version>
- <type>kar</type>
+ <artifactId>branding</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>malbec-eip</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.plc4x.malbec.plc4x</groupId>
+ <artifactId>s7</artifactId>
+ <version>0.13.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>projecttype</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.plc4x.malbec.plc4x</groupId>
+ <artifactId>services</artifactId>
+ <version>0.13.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.plc4x.malbec.hmi</groupId>
- <artifactId>hmi</artifactId>
+ <groupId>org.apache.plc4x.malbec.plc4x</groupId>
+ <artifactId>modbus</artifactId>
<version>0.13.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.plc4x.malbec.comms</groupId>
- <artifactId>comms</artifactId>
+ <groupId>org.apache.plc4x.malbec.plc4x</groupId>
+ <artifactId>eip</artifactId>
+ <version>0.13.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.plc4x.malbec.projecttype</groupId>
+ <artifactId>hmi</artifactId>
<version>0.13.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.plc4x.malbec.core.css</groupId>
- <artifactId>core-css</artifactId>
+ <groupId>org.apache.plc4x.malbec.projecttype</groupId>
+ <artifactId>type</artifactId>
<version>0.13.0-SNAPSHOT</version>
</dependency>
</dependencies>
@@ -203,7 +183,7 @@
<etcConfFile>src/main/resources/malbec.conf</etcConfFile>
<moduleDependencies>
<dependency>
- <id>${project.groupId}:malbec-libs</id>
+ <id>org.apache.plc4x.malbec.core:libs</id>
<type>impl</type>
</dependency>
</moduleDependencies>
diff --git a/plc4j/tools/malbec/branding/pom.xml
b/plc4j/tools/malbec/branding/pom.xml
index fafb420..1ef54b0 100644
--- a/plc4j/tools/malbec/branding/pom.xml
+++ b/plc4j/tools/malbec/branding/pom.xml
@@ -26,7 +26,8 @@
<version>0.13.0-SNAPSHOT</version>
</parent>
- <artifactId>malbec-branding</artifactId>
+ <groupId>org.apache.plc4x.malbec</groupId>
+ <artifactId>branding</artifactId>
<version>0.13.0-SNAPSHOT</version>
<name>${project.groupId}:${project.artifactId}</name>
<packaging>nbm</packaging>
diff --git a/plc4j/tools/malbec/malbec-core/css/pom.xml
b/plc4j/tools/malbec/malbec-core/css/pom.xml
index ea827b0..4b0f932 100644
--- a/plc4j/tools/malbec/malbec-core/css/pom.xml
+++ b/plc4j/tools/malbec/malbec-core/css/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.plc4x.malbec.core</groupId>
- <artifactId>malbec-core</artifactId>
+ <artifactId>core</artifactId>
<version>0.13.0-SNAPSHOT</version>
</parent>
@@ -126,31 +126,6 @@
<artifactId>org-openide-awt</artifactId>
<version>${netbeans.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.plc4x.malbec.comms</groupId>
- <artifactId>comms</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.plc4x.malbec.recipes</groupId>
- <artifactId>recipes</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.plc4x.malbec.events</groupId>
- <artifactId>events</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.plc4x.malbec.pics</groupId>
- <artifactId>pics</artifactId>
- <version>0.13.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.plc4x.malbec.htc</groupId>
- <artifactId>htc</artifactId>
- <version>0.13.0-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-modules-options-api</artifactId>
diff --git a/plc4j/tools/malbec/malbec-core/ctx/pom.xml
b/plc4j/tools/malbec/malbec-core/ctx/pom.xml
index ac6218a..07b46c0 100644
--- a/plc4j/tools/malbec/malbec-core/ctx/pom.xml
+++ b/plc4j/tools/malbec/malbec-core/ctx/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.plc4x.malbec.core</groupId>
- <artifactId>malbec-core</artifactId>
+ <artifactId>core</artifactId>
<version>0.13.0-SNAPSHOT</version>
</parent>
diff --git a/plc4j/tools/malbec/malbec-core/libs/pom.xml
b/plc4j/tools/malbec/malbec-core/libs/pom.xml
index 364eae0..08411ca 100644
--- a/plc4j/tools/malbec/malbec-core/libs/pom.xml
+++ b/plc4j/tools/malbec/malbec-core/libs/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>malbec-parent</artifactId>
+ <groupId>org.apache.plc4x.malbec.core</groupId>
+ <artifactId>core</artifactId>
<version>0.13.0-SNAPSHOT</version>
</parent>
diff --git a/plc4j/tools/malbec/malbec-core/scheduler/pom.xml
b/plc4j/tools/malbec/malbec-core/scheduler/pom.xml
index fafaf00..234bb99 100644
--- a/plc4j/tools/malbec/malbec-core/scheduler/pom.xml
+++ b/plc4j/tools/malbec/malbec-core/scheduler/pom.xml
@@ -18,6 +18,9 @@
<groupId>org.apache.netbeans.utilities</groupId>
<artifactId>nbm-maven-plugin</artifactId>
<extensions>true</extensions>
+ <configuration>
+ <moduleType>eager</moduleType>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -76,5 +79,10 @@
<artifactId>ctx</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-util-ui</artifactId>
+ <version>${netbeans.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 f37b35d..9912aad 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
@@ -27,7 +27,8 @@ public class Activator extends ModuleInstall {
private WhiteboardHandler whiteboardHandler;
@Override
- public void restored() {
+ public void restored() {
+ System.out.println("ACTIVO");
Properties properties = new Properties();
Scheduler scheduler = Lookup.getDefault().lookup(Scheduler.class);
whiteboardHandler = new WhiteboardHandler(scheduler);
@@ -40,7 +41,7 @@ public class Activator extends ModuleInstall {
@Override
public void close() {
super.close();
-
+ System.out.println("CERRO");
if (whiteboardHandler != null) {
whiteboardHandler.deactivate();
whiteboardHandler = null;
diff --git
a/plc4j/tools/malbec/malbec-core/scheduler/src/main/java/org/apache/plc4x/malbec/core/scheduler/core/Installer.java
b/plc4j/tools/malbec/malbec-core/scheduler/src/main/java/org/apache/plc4x/malbec/core/scheduler/core/Installer.java
new file mode 100644
index 0000000..f25cb21
--- /dev/null
+++
b/plc4j/tools/malbec/malbec-core/scheduler/src/main/java/org/apache/plc4x/malbec/core/scheduler/core/Installer.java
@@ -0,0 +1,17 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt
to change this license
+ * Click
nbfs://nbhost/SystemFileSystem/Templates/NetBeansModuleDevelopment-files/moduleInstall.java
to edit this template
+ */
+package org.apache.plc4x.malbec.core.scheduler.core;
+
+import org.openide.modules.ModuleInstall;
+
+public class Installer extends ModuleInstall {
+
+ @Override
+ public void restored() {
+ // TODO
+ System.out.println("RESTORED");
+ }
+
+}
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 1608523..13da3e7 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
@@ -22,6 +22,8 @@ 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.openide.util.LookupEvent;
+import org.openide.util.LookupListener;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
@@ -35,7 +37,7 @@ import org.slf4j.LoggerFactory;
* The quartz based implementation of the scheduler.
*
*/
-public class WhiteboardHandler {
+public class WhiteboardHandler implements LookupListener {
/** Default logger. */
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -48,7 +50,11 @@ public class WhiteboardHandler {
this.scheduler = scheduler;
ModuleContext mctx = Lookup.getDefault().lookup(ModuleContext.class);
jobs = mctx.lookupResult(Job.class);
+ jobs.addLookupListener(this);
+ jobs.allInstances();
}
+
+
/**
* Deactivate this component.
@@ -57,108 +63,117 @@ public class WhiteboardHandler {
//
}
+ @Override
+ public void resultChanged(LookupEvent ev) {
+ System.out.println("Clase: " + ev.getClass().getName());
+ System.out.println("Object: " + ev.getSource().getClass().getName());
+ }
+
+
- /**
- * Create unique identifier
- */
- 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) {
- name = (String) ref.getProperty(Constants.SERVICE_PID);
- } else if (ref.getProperty(Constants.SERVICE_PID) instanceof
ArrayList) {
- if (((ArrayList)
ref.getProperty(Constants.SERVICE_PID)).size() > 0) {
- name = ((ArrayList)
ref.getProperty(Constants.SERVICE_PID)).get(0).toString();
- }
- }
- if (name == null) {
- name = "Registered Service";
- }
- }
- // now append service id to create a unique identifier
- name = name + "." + ref.getProperty(Constants.SERVICE_ID);
- return name;
- }
+// /**
+// * Create unique identifier
+// */
+// 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) {
+// name = (String) ref.getProperty(Constants.SERVICE_PID);
+// } else if (ref.getProperty(Constants.SERVICE_PID) instanceof
ArrayList) {
+// if (((ArrayList)
ref.getProperty(Constants.SERVICE_PID)).size() > 0) {
+// name = ((ArrayList)
ref.getProperty(Constants.SERVICE_PID)).get(0).toString();
+// }
+// }
+// if (name == null) {
+// name = "Registered Service";
+// }
+// }
+// // now append service id to create a unique identifier
+// name = name + "." + ref.getProperty(Constants.SERVICE_ID);
+// return name;
+// }
- /**
- * Register a job or task
- */
- 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) {
- concurrent = (Boolean)
ref.getProperty(Scheduler.PROPERTY_SCHEDULER_CONCURRENT);
- } else {
- concurrent = Boolean.valueOf((String)
ref.getProperty(Scheduler.PROPERTY_SCHEDULER_CONCURRENT));
- }
- }
- final String expression = (String)
ref.getProperty(Scheduler.PROPERTY_SCHEDULER_EXPRESSION);
- try {
- if (expression != null) {
- this.scheduler.schedule(job, this.scheduler.EXPR(expression)
- .name(name)
- .canRunConcurrently(concurrent));
- } else {
- Integer times = -1;
- {
- final Object v =
ref.getProperty(Scheduler.PROPERTY_SCHEDULER_TIMES);
- if (null != v) {
- if (v instanceof Integer) {
- times = (Integer) v;
- } else if (v instanceof Long) {
- times = ((Long) v).intValue();
- } else if (v instanceof Number) {
- times = ((Number) v).intValue();
- } else {
- times = Integer.valueOf(v.toString());
- }
- }
- }
+// /**
+// * Register a job or task
+// */
+// 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) {
+// concurrent = (Boolean)
ref.getProperty(Scheduler.PROPERTY_SCHEDULER_CONCURRENT);
+// } else {
+// concurrent = Boolean.valueOf((String)
ref.getProperty(Scheduler.PROPERTY_SCHEDULER_CONCURRENT));
+// }
+// }
+// final String expression = (String)
ref.getProperty(Scheduler.PROPERTY_SCHEDULER_EXPRESSION);
+// try {
+// if (expression != null) {
+// this.scheduler.schedule(job, this.scheduler.EXPR(expression)
+// .name(name)
+// .canRunConcurrently(concurrent));
+// } else {
+// Integer times = -1;
+// {
+// final Object v =
ref.getProperty(Scheduler.PROPERTY_SCHEDULER_TIMES);
+// if (null != v) {
+// if (v instanceof Integer) {
+// times = (Integer) v;
+// } else if (v instanceof Long) {
+// times = ((Long) v).intValue();
+// } else if (v instanceof Number) {
+// times = ((Number) v).intValue();
+// } else {
+// times = Integer.valueOf(v.toString());
+// }
+// }
+// }
+//
+// Long period = null;
+// if (ref.getProperty(Scheduler.PROPERTY_SCHEDULER_PERIOD) !=
null) {
+// if (ref.getProperty(Scheduler.PROPERTY_SCHEDULER_PERIOD)
instanceof Long) {
+// period = (Long)
ref.getProperty(Scheduler.PROPERTY_SCHEDULER_PERIOD);
+// } else {
+// period = Long.valueOf((String)
ref.getProperty(Scheduler.PROPERTY_SCHEDULER_PERIOD));
+// }
+// if (period < 1) {
+// this.logger.debug("Ignoring service {} : scheduler
period is less than 1.", ref);
+// } else if (times < -1) {
+// this.logger.debug("Ignoring service {} : scheduler
times is defined but is less than -1.", ref);
+// } else {
+// boolean immediate = false;
+// if
(ref.getProperty(Scheduler.PROPERTY_SCHEDULER_IMMEDIATE) != null) {
+// if
(ref.getProperty(Scheduler.PROPERTY_SCHEDULER_IMMEDIATE) instanceof Boolean) {
+// immediate = (Boolean)
ref.getProperty(Scheduler.PROPERTY_SCHEDULER_IMMEDIATE);
+// } else {
+// immediate = Boolean.valueOf((String)
ref.getProperty(Scheduler.PROPERTY_SCHEDULER_IMMEDIATE));
+// }
+// }
+// final Date date = new Date();
+// if (!immediate) {
+// date.setTime(System.currentTimeMillis() + period
* 1000);
+// }
+// this.scheduler.schedule(job, this.scheduler.AT(date,
times, period)
+// .name(name)
+// .canRunConcurrently((concurrent != null ?
concurrent : true)));
+// }
+// } else {
+// this.logger.debug("Ignoring service {} : no scheduling
property found.", ref);
+// }
+// }
+// } catch (Exception e) {
+// logger.warn("Error scheduling job", e);
+// }
+// }
+//
+// /**
+// * Unregister a service.
+// */
+// private void unregister(final ServiceReference reference, final Object
service) {
+// final String name = getServiceIdentifier(reference);
+// this.scheduler.unschedule(name);
+// }
- Long period = null;
- if (ref.getProperty(Scheduler.PROPERTY_SCHEDULER_PERIOD) !=
null) {
- if (ref.getProperty(Scheduler.PROPERTY_SCHEDULER_PERIOD)
instanceof Long) {
- period = (Long)
ref.getProperty(Scheduler.PROPERTY_SCHEDULER_PERIOD);
- } else {
- period = Long.valueOf((String)
ref.getProperty(Scheduler.PROPERTY_SCHEDULER_PERIOD));
- }
- if (period < 1) {
- this.logger.debug("Ignoring service {} : scheduler
period is less than 1.", ref);
- } else if (times < -1) {
- this.logger.debug("Ignoring service {} : scheduler
times is defined but is less than -1.", ref);
- } else {
- boolean immediate = false;
- if
(ref.getProperty(Scheduler.PROPERTY_SCHEDULER_IMMEDIATE) != null) {
- if
(ref.getProperty(Scheduler.PROPERTY_SCHEDULER_IMMEDIATE) instanceof Boolean) {
- immediate = (Boolean)
ref.getProperty(Scheduler.PROPERTY_SCHEDULER_IMMEDIATE);
- } else {
- immediate = Boolean.valueOf((String)
ref.getProperty(Scheduler.PROPERTY_SCHEDULER_IMMEDIATE));
- }
- }
- final Date date = new Date();
- if (!immediate) {
- date.setTime(System.currentTimeMillis() + period *
1000);
- }
- this.scheduler.schedule(job, this.scheduler.AT(date,
times, period)
- .name(name)
- .canRunConcurrently((concurrent != null ?
concurrent : true)));
- }
- } else {
- this.logger.debug("Ignoring service {} : no scheduling
property found.", ref);
- }
- }
- } catch (Exception e) {
- logger.warn("Error scheduling job", e);
- }
- }
- /**
- * Unregister a service.
- */
- private void unregister(final ServiceReference reference, final Object
service) {
- final String name = getServiceIdentifier(reference);
- this.scheduler.unschedule(name);
- }
}
diff --git a/plc4j/tools/malbec/malbec-core/scheduler/src/main/nbm/manifest.mf
b/plc4j/tools/malbec/malbec-core/scheduler/src/main/nbm/manifest.mf
index d47d5a1..e989670 100644
--- a/plc4j/tools/malbec/malbec-core/scheduler/src/main/nbm/manifest.mf
+++ b/plc4j/tools/malbec/malbec-core/scheduler/src/main/nbm/manifest.mf
@@ -1,3 +1,4 @@
Manifest-Version: 1.0
+OpenIDE-Module-Install:
org/apache/plc4x/malbec/core/scheduler/core/Installer.class
OpenIDE-Module-Localizing-Bundle:
org/apache/plc4x/malbec/core/scheduler/Bundle.properties
diff --git a/plc4j/tools/malbec/malbec-plc4x/eip/pom.xml
b/plc4j/tools/malbec/malbec-plc4x/eip/pom.xml
index 74e271d..fd71325 100644
--- a/plc4j/tools/malbec/malbec-plc4x/eip/pom.xml
+++ b/plc4j/tools/malbec/malbec-plc4x/eip/pom.xml
@@ -2,13 +2,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>malbec-parent</artifactId>
+ <groupId>org.apache.plc4x.malbec.plc4x</groupId>
+ <artifactId>plc4x</artifactId>
<version>0.13.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.plc4x.malbec.plc4x</groupId>
- <artifactId>plc4x-eip</artifactId>
+ <artifactId>eip</artifactId>
<name>${project.groupId}:${project.artifactId}</name>
<packaging>nbm</packaging>
@@ -21,7 +21,7 @@
<configuration>
<moduleDependencies>
<dependency>
- <id>org.apache.plc4x.malbec.core:malbec-libs</id>
+ <id>org.apache.plc4x.malbec.core:libs</id>
<type>impl</type>
</dependency>
<dependency>
@@ -100,16 +100,16 @@
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util-lookup</artifactId>
<version>${netbeans.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.plc4x.malbec.core</groupId>
- <artifactId>malbec-libs</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-driver-eip</artifactId>
<version>${plc4x.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.plc4x.malbec.core</groupId>
+ <artifactId>libs</artifactId>
+ <version>0.13.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/plc4j/tools/malbec/malbec-plc4x/modbus/pom.xml
b/plc4j/tools/malbec/malbec-plc4x/modbus/pom.xml
index d224b16..b5d0beb 100644
--- a/plc4j/tools/malbec/malbec-plc4x/modbus/pom.xml
+++ b/plc4j/tools/malbec/malbec-plc4x/modbus/pom.xml
@@ -20,13 +20,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>malbec-parent</artifactId>
+ <groupId>org.apache.plc4x.malbec.plc4x</groupId>
+ <artifactId>plc4x</artifactId>
<version>0.13.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.plc4x.malbec.plc4x</groupId>
- <artifactId>plc4x-modbus</artifactId>
+ <artifactId>modbus</artifactId>
<name>${project.groupId}:${project.artifactId}</name>
<packaging>nbm</packaging>
@@ -39,7 +39,7 @@
<configuration>
<moduleDependencies>
<dependency>
- <id>org.apache.plc4x.malbec.core:malbec-libs</id>
+ <id>org.apache.plc4x.malbec.core:libs</id>
<type>impl</type>
</dependency>
<dependency>
@@ -115,16 +115,16 @@
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util-lookup</artifactId>
<version>${netbeans.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.plc4x.malbec.core</groupId>
- <artifactId>malbec-libs</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-driver-modbus</artifactId>
<version>${plc4x.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.plc4x.malbec.core</groupId>
+ <artifactId>libs</artifactId>
+ <version>0.13.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/plc4j/tools/malbec/malbec-plc4x/s7/pom.xml
b/plc4j/tools/malbec/malbec-plc4x/s7/pom.xml
index 4392b34..698a1b5 100644
--- a/plc4j/tools/malbec/malbec-plc4x/s7/pom.xml
+++ b/plc4j/tools/malbec/malbec-plc4x/s7/pom.xml
@@ -20,13 +20,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>malbec-parent</artifactId>
+ <groupId>org.apache.plc4x.malbec.plc4x</groupId>
+ <artifactId>plc4x</artifactId>
<version>0.13.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.plc4x.malbec.plc4x</groupId>
- <artifactId>plc4x-s7</artifactId>
+ <artifactId>s7</artifactId>
<name>${project.groupId}:${project.artifactId}</name>
<packaging>nbm</packaging>
@@ -39,7 +39,7 @@
<configuration>
<moduleDependencies>
<dependency>
- <id>org.apache.plc4x.malbec.core:malbec-libs</id>
+ <id>org.apache.plc4x.malbec.core:libs</id>
<type>impl</type>
</dependency>
<dependency>
@@ -115,16 +115,16 @@
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util-lookup</artifactId>
<version>${netbeans.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.plc4x.malbec.core</groupId>
- <artifactId>malbec-libs</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-driver-s7</artifactId>
<version>${plc4x.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.plc4x.malbec.core</groupId>
+ <artifactId>libs</artifactId>
+ <version>0.13.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/plc4j/tools/malbec/malbec-plc4x/services/pom.xml
b/plc4j/tools/malbec/malbec-plc4x/services/pom.xml
index ec063d7..b42694c 100644
--- a/plc4j/tools/malbec/malbec-plc4x/services/pom.xml
+++ b/plc4j/tools/malbec/malbec-plc4x/services/pom.xml
@@ -20,13 +20,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>malbec-parent</artifactId>
+ <groupId>org.apache.plc4x.malbec.plc4x</groupId>
+ <artifactId>plc4x</artifactId>
<version>0.13.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.plc4x.malbec.plc4x</groupId>
- <artifactId>plc4x-services</artifactId>
+ <artifactId>services</artifactId>
<name>${project.groupId}:${project.artifactId}</name>
<packaging>nbm</packaging>
@@ -39,7 +39,7 @@
<configuration>
<moduleDependencies>
<dependency>
- <id>org.apache.plc4x.malbec.core:malbec-libs</id>
+ <id>org.apache.plc4x.malbec.core:libs</id>
<type>impl</type>
</dependency>
<dependency>
@@ -182,8 +182,8 @@
</dependency>
<dependency>
<groupId>org.apache.plc4x.malbec.core</groupId>
- <artifactId>malbec-libs</artifactId>
- <version>${project.version}</version>
+ <artifactId>libs</artifactId>
+ <version>0.13.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git
a/plc4j/tools/malbec/malbec-plc4x/services/src/main/resources/org/apache/plc4x/malbec/services/model/Bundle.properties
b/plc4j/tools/malbec/malbec-plc4x/services/src/main/resources/org/apache/plc4x/malbec/services/model/Bundle.properties
index 88d2991..a4a6fc4 100644
---
a/plc4j/tools/malbec/malbec-plc4x/services/src/main/resources/org/apache/plc4x/malbec/services/model/Bundle.properties
+++
b/plc4j/tools/malbec/malbec-plc4x/services/src/main/resources/org/apache/plc4x/malbec/services/model/Bundle.properties
@@ -1,5 +1,3 @@
-
-# Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt
to change this license
-# Click nbfs://nbhost/SystemFileSystem/Templates/Other/properties.properties
to edit this template
-
-
+Plc4xAddDeviceDialog.jButton1.text=jButton1
+Plc4xAddDeviceDialog.jButton2.text=jButton2
+Plc4xAddDeviceDialog.title=Add Device
diff --git a/plc4j/tools/malbec/malbec-projecttype/comms/pom.xml
b/plc4j/tools/malbec/malbec-projecttype/comms/pom.xml
index 0f4d373..f0c2b8b 100644
--- a/plc4j/tools/malbec/malbec-projecttype/comms/pom.xml
+++ b/plc4j/tools/malbec/malbec-projecttype/comms/pom.xml
@@ -2,8 +2,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>malbec-projecttype</artifactId>
+ <groupId>org.apache.plc4x.malbec.projecttype</groupId>
+ <artifactId>projecttype</artifactId>
<version>0.13.0-SNAPSHOT</version>
</parent>
diff --git a/plc4j/tools/malbec/malbec-projecttype/events/pom.xml
b/plc4j/tools/malbec/malbec-projecttype/events/pom.xml
index 215e4af..7eb9fc7 100644
--- a/plc4j/tools/malbec/malbec-projecttype/events/pom.xml
+++ b/plc4j/tools/malbec/malbec-projecttype/events/pom.xml
@@ -2,8 +2,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>malbec-projecttype</artifactId>
+ <groupId>org.apache.plc4x.malbec.projecttype</groupId>
+ <artifactId>projecttype</artifactId>
<version>0.13.0-SNAPSHOT</version>
</parent>
diff --git a/plc4j/tools/malbec/malbec-projecttype/hmi/pom.xml
b/plc4j/tools/malbec/malbec-projecttype/hmi/pom.xml
index e106652..daee33f 100644
--- a/plc4j/tools/malbec/malbec-projecttype/hmi/pom.xml
+++ b/plc4j/tools/malbec/malbec-projecttype/hmi/pom.xml
@@ -2,8 +2,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>malbec-projecttype</artifactId>
+ <groupId>org.apache.plc4x.malbec.projecttype</groupId>
+ <artifactId>projecttype</artifactId>
<version>0.13.0-SNAPSHOT</version>
</parent>
@@ -133,29 +133,29 @@
<version>${netbeans.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.plc4x.malbec.comms</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>comms</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.plc4x.malbec.recipes</groupId>
- <artifactId>recipes</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>events</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.plc4x.malbec.events</groupId>
- <artifactId>events</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>pics</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.plc4x.malbec.pics</groupId>
- <artifactId>pics</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>recipes</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.plc4x.malbec.htc</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>htc</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/plc4j/tools/malbec/malbec-projecttype/htc/pom.xml
b/plc4j/tools/malbec/malbec-projecttype/htc/pom.xml
index b0c7a85..13c2e58 100644
--- a/plc4j/tools/malbec/malbec-projecttype/htc/pom.xml
+++ b/plc4j/tools/malbec/malbec-projecttype/htc/pom.xml
@@ -2,8 +2,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>malbec-projecttype</artifactId>
+ <groupId>org.apache.plc4x.malbec.projecttype</groupId>
+ <artifactId>projecttype</artifactId>
<version>0.13.0-SNAPSHOT</version>
</parent>
diff --git a/plc4j/tools/malbec/malbec-projecttype/information/pom.xml
b/plc4j/tools/malbec/malbec-projecttype/information/pom.xml
index b22ca10..c41fd11 100644
--- a/plc4j/tools/malbec/malbec-projecttype/information/pom.xml
+++ b/plc4j/tools/malbec/malbec-projecttype/information/pom.xml
@@ -2,8 +2,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>malbec-projecttype</artifactId>
+ <groupId>org.apache.plc4x.malbec.projecttype</groupId>
+ <artifactId>projecttype</artifactId>
<version>0.13.0-SNAPSHOT</version>
</parent>
diff --git a/plc4j/tools/malbec/malbec-projecttype/malbec-projecttype/pom.xml
b/plc4j/tools/malbec/malbec-projecttype/malbec-projecttype/pom.xml
index d4eaafe..1952033 100644
--- a/plc4j/tools/malbec/malbec-projecttype/malbec-projecttype/pom.xml
+++ b/plc4j/tools/malbec/malbec-projecttype/malbec-projecttype/pom.xml
@@ -2,8 +2,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>malbec-projecttype</artifactId>
+ <groupId>org.apache.plc4x.malbec.projecttype</groupId>
+ <artifactId>projecttype</artifactId>
<version>0.13.0-SNAPSHOT</version>
</parent>
@@ -112,24 +112,24 @@
<version>${netbeans.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.plc4x.malbec.hmi</groupId>
- <artifactId>hmi</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>comms</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.plc4x.malbec.comms</groupId>
- <artifactId>comms</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>recipes</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.plc4x.malbec.events</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>events</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.plc4x.malbec.recipes</groupId>
- <artifactId>recipes</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>hmi</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git
a/plc4j/tools/malbec/malbec-projecttype/malbec-projecttype/src/main/java/org/apache/plc4x/malbec/projecttype/impl/Plc4xProjectImpl.java
b/plc4j/tools/malbec/malbec-projecttype/malbec-projecttype/src/main/java/org/apache/plc4x/malbec/projecttype/impl/Plc4xProjectImpl.java
index e5253d2..fc2f9fe 100644
---
a/plc4j/tools/malbec/malbec-projecttype/malbec-projecttype/src/main/java/org/apache/plc4x/malbec/projecttype/impl/Plc4xProjectImpl.java
+++
b/plc4j/tools/malbec/malbec-projecttype/malbec-projecttype/src/main/java/org/apache/plc4x/malbec/projecttype/impl/Plc4xProjectImpl.java
@@ -21,11 +21,8 @@ package org.apache.plc4x.malbec.projecttype.impl;
import java.beans.PropertyChangeListener;
import javax.swing.Icon;
import javax.swing.ImageIcon;
-import org.apache.plc4x.malbec.comms.impl.Plc4xCommsSubProjectProviderImpl;
-import org.apache.plc4x.malbec.events.impl.Plc4xEventsSubProjectProviderImpl;
import org.apache.plc4x.malbec.hmi.impl.Plc4xHMISubProjectProviderImpl;
import org.apache.plc4x.malbec.projecttype.panels.Plc4xGeneralPropertiesImpl;
-import org.apache.plc4x.malbec.recipes.impl.Plc4xRecipesSubProjectProviderImpl;
import org.netbeans.api.annotations.common.StaticResource;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectInformation;
diff --git a/plc4j/tools/malbec/malbec-projecttype/pics/pom.xml
b/plc4j/tools/malbec/malbec-projecttype/pics/pom.xml
index 8a21e1d..505d4cd 100644
--- a/plc4j/tools/malbec/malbec-projecttype/pics/pom.xml
+++ b/plc4j/tools/malbec/malbec-projecttype/pics/pom.xml
@@ -2,8 +2,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>malbec-projecttype</artifactId>
+ <groupId>org.apache.plc4x.malbec.projecttype</groupId>
+ <artifactId>projecttype</artifactId>
<version>0.13.0-SNAPSHOT</version>
</parent>
diff --git a/plc4j/tools/malbec/malbec-projecttype/recipes/pom.xml
b/plc4j/tools/malbec/malbec-projecttype/recipes/pom.xml
index 8d1fb92..d426e86 100644
--- a/plc4j/tools/malbec/malbec-projecttype/recipes/pom.xml
+++ b/plc4j/tools/malbec/malbec-projecttype/recipes/pom.xml
@@ -2,8 +2,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>malbec-projecttype</artifactId>
+ <groupId>org.apache.plc4x.malbec.projecttype</groupId>
+ <artifactId>projecttype</artifactId>
<version>0.13.0-SNAPSHOT</version>
</parent>
diff --git a/plc4j/tools/malbec/malbec-projecttype/scripts/pom.xml
b/plc4j/tools/malbec/malbec-projecttype/scripts/pom.xml
index eeea863..90445a0 100644
--- a/plc4j/tools/malbec/malbec-projecttype/scripts/pom.xml
+++ b/plc4j/tools/malbec/malbec-projecttype/scripts/pom.xml
@@ -2,8 +2,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>malbec-projecttype</artifactId>
+ <groupId>org.apache.plc4x.malbec.projecttype</groupId>
+ <artifactId>projecttype</artifactId>
<version>0.13.0-SNAPSHOT</version>
</parent>
diff --git a/plc4j/tools/malbec/malbec-projecttype/securities/pom.xml
b/plc4j/tools/malbec/malbec-projecttype/securities/pom.xml
index 34516a0..83ad3d6 100644
--- a/plc4j/tools/malbec/malbec-projecttype/securities/pom.xml
+++ b/plc4j/tools/malbec/malbec-projecttype/securities/pom.xml
@@ -2,8 +2,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>malbec-projecttype</artifactId>
+ <groupId>org.apache.plc4x.malbec.projecttype</groupId>
+ <artifactId>projecttype</artifactId>
<version>0.13.0-SNAPSHOT</version>
</parent>
diff --git a/plc4j/tools/malbec/malbec-projecttype/tgl/pom.xml
b/plc4j/tools/malbec/malbec-projecttype/tgl/pom.xml
index e1c4579..0668855 100644
--- a/plc4j/tools/malbec/malbec-projecttype/tgl/pom.xml
+++ b/plc4j/tools/malbec/malbec-projecttype/tgl/pom.xml
@@ -2,8 +2,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>malbec-projecttype</artifactId>
+ <groupId>org.apache.plc4x.malbec.projecttype</groupId>
+ <artifactId>projecttype</artifactId>
<version>0.13.0-SNAPSHOT</version>
</parent>
diff --git a/plc4j/tools/malbec/malbec-projecttype/udt/pom.xml
b/plc4j/tools/malbec/malbec-projecttype/udt/pom.xml
index ba2c86e..c4d57bd 100644
--- a/plc4j/tools/malbec/malbec-projecttype/udt/pom.xml
+++ b/plc4j/tools/malbec/malbec-projecttype/udt/pom.xml
@@ -2,8 +2,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>malbec-projecttype</artifactId>
+ <groupId>org.apache.plc4x.malbec.projecttype</groupId>
+ <artifactId>projecttype</artifactId>
<version>0.13.0-SNAPSHOT</version>
</parent>
