You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cg...@apache.org on 2024/10/07 14:17:51 UTC
(plc4x-extras) branch feature/merlot updated: Fix librarys for LDAP. Working on.
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 025c495 Fix librarys for LDAP. Working on.
025c495 is described below
commit 025c495bb7fbed4d4cd46a3aad366860466f2bb2
Author: César García <ce...@ceos.com.ve>
AuthorDate: Mon Oct 7 10:17:13 2024 -0400
Fix librarys for LDAP. Working on.
---
.../{DBRecoverImpl.java => DBPersistImpl.java} | 31 +++++++-
.../src/main/feature/feature.xml | 6 ++
.../nb-configuration.xml | 20 +++++
.../merlot/org.apache.plc4x.merlot.uns/pom.xml | 91 ++++++++++++++--------
.../plc4x/merlot/uns/core/EmbeddedADSVerTrunk.java | 22 ++++--
.../plc4x/merlot/uns/core/LdapEmbeddedServer.java | 41 ++++++----
.../merlot/uns/core/LdapEmbeddedServerV2.java | 62 +++++++++++++--
.../resources/OSGI-INF/blueprint/uns-service.xml | 20 ++++-
8 files changed, 232 insertions(+), 61 deletions(-)
diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.db/src/main/java/org/apache/plc4x/merlot/db/impl/DBRecoverImpl.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.db/src/main/java/org/apache/plc4x/merlot/db/impl/DBPersistImpl.java
similarity index 72%
rename from plc4j/tools/merlot/org.apache.plc4x.merlot.db/src/main/java/org/apache/plc4x/merlot/db/impl/DBRecoverImpl.java
rename to plc4j/tools/merlot/org.apache.plc4x.merlot.db/src/main/java/org/apache/plc4x/merlot/db/impl/DBPersistImpl.java
index 16bf616..9a1cd6e 100644
--- a/plc4j/tools/merlot/org.apache.plc4x.merlot.db/src/main/java/org/apache/plc4x/merlot/db/impl/DBRecoverImpl.java
+++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.db/src/main/java/org/apache/plc4x/merlot/db/impl/DBPersistImpl.java
@@ -28,12 +28,39 @@ import org.osgi.service.event.EventHandler;
import org.osgi.service.jdbc.DataSourceFactory;
import org.slf4j.LoggerFactory;
-public class DBRecoverImpl implements EventHandler{
- private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(DBRecoverImpl.class);
+public class DBPersistImpl implements EventHandler{
+ private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(DBPersistImpl.class);
private static final String DB_URL = "jdbc:sqlite:data/boot.db";
private static final String EVENT_PERSIST = "org/apache/plc4x/merlot/PERSIST";
private static final String EVENT_RECOVER = "org/apache/plc4x/merlot/RECOVER";
+ private static final String SQL_CREATE_TABLE_PVRECORDS =
+ "CREATE TABLE IF NOT EXISTS PvRecords("
+ + "DeviceUuId TEXT NOT NULL PRIMARY KEY,"
+ + "DriverName TEXT,"
+ + "DeviceName TEXT,"
+ + "DeviceId TEXT,"
+ + "ShortName TEXT,"
+ + "Description TEXT,"
+ + "Enable TEXT,"
+ + "Md5 TEXT)";
+
+ private static final String SQL_SELECT_PVRECORDS =
+ "SELECT * FROM PvRecords WHERE DriverName = ?";
+
+ private static final String SQL_INSERT_PVRECORDS =
+ "INSERT INTO Devices(DeviceUuId, DriverName, DeviceName, DeviceId, ShortName, Description, Enable, Md5)"
+ + "VALUES(?, ?, ?, ?, ?, ?, ?, ?) "
+ + "ON CONFLICT(DeviceUuId) "
+ + "DO "
+ + "UPDATE SET "
+ + "DriverName = excluded.DriverName, "
+ + "DeviceName = excluded.DeviceName, "
+ + "DeviceId = excluded.DeviceId, "
+ + "ShortName = excluded.ShortName, "
+ + "Description =excluded.Description, "
+ + "Md5 = excluded.Md5;";
+
DataSourceFactory dsFactory = null;
Connection dbConnection = null;
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 b788900..ecd42fb 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
@@ -585,7 +585,11 @@ dataSourceName=rtdb
<bundle>mvn:org.apache.directory.server/apacheds-interceptors-exception/2.0.0.AM27</bundle>
<bundle>mvn:org.apache.directory.server/apacheds-interceptors-journal/2.0.0.AM27</bundle>
<bundle>mvn:org.apache.directory.server/apacheds-interceptors-normalization/2.0.0.AM27</bundle>
+
+
+ <!--<bundle>wrap:mvn:org.apache.directory.server/apacheds-interceptors-operational/2.0.0.AM27/$Bundle-SymbolicName=kerberos-shared&Bundle-Version=2.0.0.AM27&Bundle-ManifestVersion="2"&SPI-Consumer:*&Export-Package=*;version="2.0.0.AM27",!*</bundle>-->
<bundle>mvn:org.apache.directory.server/apacheds-interceptors-operational/2.0.0.AM27</bundle>
+
<bundle>mvn:org.apache.directory.server/apacheds-interceptors-referral/2.0.0.AM27</bundle>
<bundle>mvn:org.apache.directory.server/apacheds-interceptors-schema/2.0.0.AM27</bundle>
<bundle>mvn:org.apache.directory.server/apacheds-interceptors-subtree/2.0.0.AM27</bundle>
@@ -618,6 +622,8 @@ dataSourceName=rtdb
<bundle>mvn:org.apache.directory.server/apacheds-server-annotations/2.0.0.AM27</bundle>
<bundle>mvn:org.apache.directory.server/apacheds-server-jndi/2.0.0.AM27</bundle>
+ <bundle>wrap:mvn:org.apache.directory.server/apacheds-service/2.0.0.AM27/$Bundle-SymbolicName=apacheds-service&Bundle-Version=2.0.0.AM27&Bundle-ManifestVersion="2"&Export-Package=*;version="2.0.0.AM27",!*</bundle>
+ <!--<bundle>mvn:org.apache.directory.server/apacheds-service/2.0.0.AM27</bundle>-->
<!--<bundle>mvn:org.apache.directory.server/apacheds-server-replication/2.0.0.AM26</bundle>-->
diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.uns/nb-configuration.xml b/plc4j/tools/merlot/org.apache.plc4x.merlot.uns/nb-configuration.xml
new file mode 100644
index 0000000..39d58bd
--- /dev/null
+++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.uns/nb-configuration.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
+ <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+-->
+ <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+ <!--
+Properties that influence various parts of the IDE, especially code formatting and the like.
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
+-->
+ <com-github-philippefichet-sonarlint4netbeans.sonarlint-preference-scope>global</com-github-philippefichet-sonarlint4netbeans.sonarlint-preference-scope>
+ <com-github-philippefichet-sonarlint4netbeans.excludedRules>[{"repository":"php","rule":"S3335"},{"repository":"php","rule":"S3336"},{"repository":"php","rule":"S2002"},{"repository":"php","rule":"S2005"},{"repository":"php","rule":"S3333"},{"repository":"php","rule":"S3334"},{"repository":"Web","rule":"ImgWithoutWidthOrHeightCheck"},{"repository":"php","rule":"S1151"},{"repository":"php","rule":"S3332"},{"repository":"php","rule":"S2001"},{"repository":"php","rule":"S2000"},{"re [...]
+ <com-github-philippefichet-sonarlint4netbeans.extraProperties>{}</com-github-philippefichet-sonarlint4netbeans.extraProperties>
+ </properties>
+</project-shared-configuration>
diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.uns/pom.xml b/plc4j/tools/merlot/org.apache.plc4x.merlot.uns/pom.xml
index 436e638..5469dcb 100644
--- a/plc4j/tools/merlot/org.apache.plc4x.merlot.uns/pom.xml
+++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.uns/pom.xml
@@ -49,22 +49,11 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Version>0.13.0-SNAPSHOT</Bundle-Version>
- <Export-Package>org.apache.plc4x.merlot.uns*;version=0.13.0-SNAPSHOT</Export-Package>
- <Import-Package>*</Import-Package>
+ <Export-Package>org.apache.plc4x.merlot.uns*;version=0.13.0-SNAPSHOT,org.apache.plc4x.merlot.uns.api,org.apache.plc4x.merlot.uns.command,org.apache.plc4x.merlot.uns.core,org.apache.plc4x.merlot.uns.impl</Export-Package>
+ <Import-Package>org.apache.directory.api.ldap.model.csn.*,*</Import-Package>
<Karaf-Commands>org.apache.plc4x.merlot.uns.command*</Karaf-Commands>
- <!--<_removeheaders>Import-Service,Export-Service</_removeheaders>-->
- <Embed-Dependency>
- apacheds-all,
- api-all,
- api-ldap-model,
- commons-text,
- dom4j,
- org.apache.servicemix.bundles.antlr,
- org.apache.servicemix.bundles.dom4j,
- ommons-lang3,
- antlr-runtime
- </Embed-Dependency>
- <Embed-Transitive>true</Embed-Transitive>
+ <!--<_removeheaders>Import-Service,Export-Service</_removeheaders>-->
+ <Private-Package>org.apache.plc4x.merlot.uns.api.*,org.apache.plc4x.merlot.uns.command.*,org.apache.plc4x.merlot.uns.core.*,org.apache.plc4x.merlot.uns.impl.*</Private-Package>
</instructions>
</configuration>
</plugin>
@@ -72,8 +61,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>11</source>
+ <target>11</target>
<maxmem>256M</maxmem>
</configuration>
</plugin>
@@ -302,17 +291,6 @@
<version>2.0.0.AM26</version>
</dependency>
-->
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-all</artifactId>
- <version>2.0.0.AM27</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-schema</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-all</artifactId>
@@ -339,9 +317,60 @@
<version>3.17.0</version>
</dependency>
<dependency>
- <groupId>org.antlr</groupId>
- <artifactId>antlr-runtime</artifactId>
- <version>3.5.3</version>
+ <groupId>org.apache.aries.spifly</groupId>
+ <artifactId>spifly</artifactId>
+ <version>1.3.7</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-interceptors-operational</artifactId>
+ <version>2.0.0.AM27</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-interceptors</artifactId>
+ <version>2.0.0.AM27</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core</artifactId>
+ <version>2.0.0.AM27</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core-api</artifactId>
+ <version>2.0.0.AM27</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-all</artifactId>
+ <version>2.0.0.AM27</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap</artifactId>
+ <version>0.9.19</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-schema-data</artifactId>
+ <version>2.1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-service-builder</artifactId>
+ <version>2.0.0.AM27</version>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-service</artifactId>
+ <version>2.0.0.AM27</version>
+ <type>jar</type>
</dependency>
</dependencies>
</project>
diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.uns/src/main/java/org/apache/plc4x/merlot/uns/core/EmbeddedADSVerTrunk.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.uns/src/main/java/org/apache/plc4x/merlot/uns/core/EmbeddedADSVerTrunk.java
index 18cb98a..9417bcc 100644
--- a/plc4j/tools/merlot/org.apache.plc4x.merlot.uns/src/main/java/org/apache/plc4x/merlot/uns/core/EmbeddedADSVerTrunk.java
+++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.uns/src/main/java/org/apache/plc4x/merlot/uns/core/EmbeddedADSVerTrunk.java
@@ -165,10 +165,11 @@ public class EmbeddedADSVerTrunk
* @param workDir the directory to be used for storing the data
* @throws Exception if there were some problems while initializing the system
*/
- private void initDirectoryService( File workDir ) throws Exception
+ private void initDirectoryService(DirectoryService ds, File workDir ) throws Exception
{
// Initialize the LDAP service
- service = new DefaultDirectoryService();
+// service = new DefaultDirectoryService();
+ service = ds;
service.setInstanceLayout( new InstanceLayout( workDir ) );
// CacheService cacheService = new CacheService();
@@ -207,7 +208,16 @@ public class EmbeddedADSVerTrunk
addIndex( apachePartition, "objectClass", "ou", "uid" );
// And start the service
- service.startup();
+ try {
+ System.out.println("{**************************");
+ service.startup();
+ System.out.println("**************************}");
+ } catch (Exception ex) {
+ System.out.println("**************************");
+ ex.printStackTrace();
+ System.out.println("**************************");
+ }
+
// Inject the context entry for dc=foo,dc=com partition if it does not already exist
try
@@ -256,9 +266,9 @@ public class EmbeddedADSVerTrunk
*
* @throws Exception If something went wrong
*/
- public EmbeddedADSVerTrunk( File workDir ) throws Exception
+ public EmbeddedADSVerTrunk(DirectoryService ds, File workDir ) throws Exception
{
- initDirectoryService( workDir );
+ initDirectoryService( ds, workDir );
}
@@ -304,7 +314,7 @@ public class EmbeddedADSVerTrunk
workDir.mkdirs();
// Create the server
- EmbeddedADSVerTrunk ads = new EmbeddedADSVerTrunk( workDir );
+ EmbeddedADSVerTrunk ads = new EmbeddedADSVerTrunk( new DefaultDirectoryService(), workDir );
// Read an entry
Entry result = ads.service.getAdminSession().lookup( new Dn( "dc=apache,dc=org" ) );
diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.uns/src/main/java/org/apache/plc4x/merlot/uns/core/LdapEmbeddedServer.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.uns/src/main/java/org/apache/plc4x/merlot/uns/core/LdapEmbeddedServer.java
index 892e1e9..1c2b218 100644
--- a/plc4j/tools/merlot/org.apache.plc4x.merlot.uns/src/main/java/org/apache/plc4x/merlot/uns/core/LdapEmbeddedServer.java
+++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.uns/src/main/java/org/apache/plc4x/merlot/uns/core/LdapEmbeddedServer.java
@@ -21,42 +21,57 @@ package org.apache.plc4x.merlot.uns.core;
import java.io.File;
import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.name.Dn;
-
+import org.apache.directory.api.ldap.model.csn.Csn;
+import org.apache.directory.api.ldap.model.csn.CsnFactory;
+import org.apache.directory.server.ApacheDsService;
+import org.apache.directory.server.core.api.DirectoryService;
+import org.apache.directory.server.core.api.InstanceLayout;
public class LdapEmbeddedServer {
-
+ private final DirectoryService ds;
private EmbeddedADSVerTrunk ads;
+ private ApacheDsService dsServer = null;
+
+ public LdapEmbeddedServer(DirectoryService ds) {
+ this.ds = ds;
+ }
- public void init(){
+ public void init() throws Exception{
try
{
File workDir = new File( "./data/server-ldap" );
workDir.mkdirs();
+ InstanceLayout il = new InstanceLayout(workDir);
+
// Create the server
- ads = new EmbeddedADSVerTrunk( workDir );
-
+ //ads = new EmbeddedADSVerTrunk(ds, workDir );
+ ApacheDsService dsServer = new ApacheDsService();
+ dsServer.start(il, true);
+
// Read an entry
- Entry result = ads.getDirectoryService().getAdminSession().lookup( new Dn( "dc=apache,dc=org" ) );
-
+// Entry result = ads.getDirectoryService().getAdminSession().lookup( new Dn( "dc=apache,dc=org" ) );
+// Entry result = ds.getAdminSession().lookup( new Dn( "dc=apache,dc=org" ) );
// And print it if available
- System.out.println( "Found entry : " + result );
+// System.out.println( "Found entry : " + result);
// optionally we can start a server too
- ads.startServer();
+ //ads.startServer();
}
- catch ( Exception ex )
- {
+ catch ( Exception ex ) {
// Ok, we have something wrong going on ...
ex.printStackTrace();
- }
+
+
+ }
}
public void destroy() {
try {
- ads.stopServer();
+ dsServer.stop();
+ //ads.stopServer();
} catch (Exception ex) {
ex.printStackTrace();
}
diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.uns/src/main/java/org/apache/plc4x/merlot/uns/core/LdapEmbeddedServerV2.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.uns/src/main/java/org/apache/plc4x/merlot/uns/core/LdapEmbeddedServerV2.java
index 5048017..5834784 100644
--- a/plc4j/tools/merlot/org.apache.plc4x.merlot.uns/src/main/java/org/apache/plc4x/merlot/uns/core/LdapEmbeddedServerV2.java
+++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.uns/src/main/java/org/apache/plc4x/merlot/uns/core/LdapEmbeddedServerV2.java
@@ -18,27 +18,75 @@
*/
package org.apache.plc4x.merlot.uns.core;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.naming.ldap.LdapContext;
+import org.apache.directory.api.ldap.model.exception.LdapException;
import org.apache.directory.server.annotations.CreateLdapServer;
import org.apache.directory.server.annotations.CreateTransport;
import org.apache.directory.server.core.annotations.ApplyLdifFiles;
+import org.apache.directory.server.core.annotations.ContextEntry;
import org.apache.directory.server.core.annotations.CreateDS;
+import org.apache.directory.server.core.annotations.CreateIndex;
import org.apache.directory.server.core.annotations.CreatePartition;
+import org.apache.directory.server.core.api.DirectoryService;
+import org.apache.directory.server.core.factory.DSAnnotationProcessor;
+import org.apache.directory.server.factory.ServerAnnotationProcessor;
+import org.apache.directory.server.ldap.LdapServer;
-@CreateDS(name = "myDS",
- partitions = {
- @CreatePartition(name = "test", suffix = "dc=myorg,dc=com")
- })
+@CreateDS(name = "MethodDSWithPartitionAndServer",
+ partitions =
+ {
+ @CreatePartition(
+ name = "example",
+ suffix = "dc=example,dc=com",
+ contextEntry = @ContextEntry(
+ entryLdif =
+ "dn: dc=example,dc=com\n" +
+ "dc: example\n" +
+ "objectClass: top\n" +
+ "objectClass: domain\n\n"),
+ indexes =
+ {
+ @CreateIndex(attribute = "objectClass"),
+ @CreateIndex(attribute = "dc"),
+ @CreateIndex(attribute = "ou")
+ })
+ })
@CreateLdapServer(transports = { @CreateTransport(protocol = "LDAP", address = "localhost", port=10359)})
-@ApplyLdifFiles(value = {"data/autentia-identity-repository.ldif"})
+//@ApplyLdifFiles(value = {"./data/server-ldap/autentia-identity-repository.ldif"})
public class LdapEmbeddedServerV2 {
+ LdapServer ldapServer = null;
+ DirectoryService service = null;
+ LdapContext ctx = null;
public void init(){
+
+ try {
+ service = DSAnnotationProcessor.getDirectoryService();
+
+ Set<String> expectedNames = new HashSet<String>();
+
+ expectedNames.add( "example" );
+ expectedNames.add( "schema" );
+
+ ldapServer = ServerAnnotationProcessor.getLdapServer(service);
+
+
+ } catch (Exception ex) {
+ Logger.getLogger(LdapEmbeddedServerV2.class.getName()).log(Level.SEVERE, null, ex);
+ }
+
System.out.println("Inicalizo el servidor...");
}
- public void destroy() {
- System.out.println("Destruye el servidor...");
+ public void destroy() throws LdapException {
+ System.out.println("Destruye el servidor...");
+ ldapServer.stop();
+ service.shutdown();
}
diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.uns/src/main/resources/OSGI-INF/blueprint/uns-service.xml b/plc4j/tools/merlot/org.apache.plc4x.merlot.uns/src/main/resources/OSGI-INF/blueprint/uns-service.xml
index b6f32a0..d713018 100644
--- a/plc4j/tools/merlot/org.apache.plc4x.merlot.uns/src/main/resources/OSGI-INF/blueprint/uns-service.xml
+++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.uns/src/main/resources/OSGI-INF/blueprint/uns-service.xml
@@ -23,6 +23,16 @@
availability="mandatory"
timeout="30000"/>
+ <bean id="DummyBean"
+ class="org.apache.directory.api.ldap.model.csn.Csn"
+ scope="singleton">
+ <argument value = "0"/>
+ <argument value = "0"/>
+ <argument value = "0"/>
+ <argument value = "0"/>
+ </bean>
+
+
<bean id="MerlotModelManagedService"
class="org.apache.plc4x.merlot.uns.core.ModelManagedService"
scope="singleton">
@@ -49,10 +59,16 @@
<argument ref="MerlotModel" />
</bean>
+ <bean id="LdapDirectoryServiceBean"
+ class="org.apache.directory.server.core.DefaultDirectoryService"
+ scope="singleton">
+ </bean>
+
<bean id="LdapServerBean"
- class="org.apache.plc4x.merlot.uns.core.LdapEmbeddedServer"
+ class="org.apache.plc4x.merlot.uns.core.LdapEmbeddedServerV2"
scope="singleton"
- init-method="init" destroy-method="destroy">
+ init-method="init" destroy-method="destroy">
+ <argument ref="LdapDirectoryServiceBean" />
</bean>
<service ref="MerlotModelManagedService" auto-export="interfaces">