This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 70d189a189d CAMEL-22258 Upgrade Apache Directory Server to 2.0.0.AM27
(#18671)
70d189a189d is described below
commit 70d189a189d9a668791310fefe81e89d48a5c042
Author: Tom Cunningham <[email protected]>
AuthorDate: Mon Jul 21 15:09:14 2025 -0400
CAMEL-22258 Upgrade Apache Directory Server to 2.0.0.AM27 (#18671)
---
.../server/core/integ5/DirectoryExtension.java | 35 ---------
.../core/integ5/ServerAnnotationProcessor.java | 87 ----------------------
.../server/core/integ5/DirectoryExtension.java | 34 ---------
.../core/integ5/ServerAnnotationProcessor.java | 87 ----------------------
parent/pom.xml | 2 +-
5 files changed, 1 insertion(+), 244 deletions(-)
diff --git
a/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java
b/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java
index 6728221735e..4a4f9861862 100644
---
a/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java
+++
b/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java
@@ -34,7 +34,6 @@ import
org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory;
import org.apache.directory.server.core.factory.DirectoryServiceFactory;
import org.apache.directory.server.core.factory.PartitionFactory;
import org.apache.directory.server.core.security.TlsKeyGenerator;
-import org.apache.directory.server.kerberos.kdc.KdcServer;
import org.apache.directory.server.ldap.LdapServer;
import org.junit.jupiter.api.extension.AfterAllCallback;
import org.junit.jupiter.api.extension.AfterEachCallback;
@@ -68,11 +67,6 @@ public class DirectoryExtension implements
BeforeAllCallback, AfterAllCallback,
*/
private static final String SET_LDAP_SERVER_METHOD_NAME = "setLdapServer";
- /**
- * The 'kdcServer' field in the run tests
- */
- private static final String SET_KDC_SERVER_METHOD_NAME = "setKdcServer";
-
public static class State {
DirectoryService classDirectoryService;
DirectoryService methodDirectoryService;
@@ -80,11 +74,7 @@ public class DirectoryExtension implements
BeforeAllCallback, AfterAllCallback,
LdapServer classLdapServer;
LdapServer methodLdapServer;
LdapServer ldapServer;
- KdcServer classKdcServer;
- KdcServer methodKdcServer;
- KdcServer kdcServer;
DirectoryService oldLdapServerDirService;
- DirectoryService oldKdcServerDirService;
long revision;
public void beforeAll(ExtensionContext context) throws Exception {
@@ -111,8 +101,6 @@ public class DirectoryExtension implements
BeforeAllCallback, AfterAllCallback,
// check if it has a LdapServerBuilder, then use the DS created
above
classLdapServer =
ServerAnnotationProcessor.createLdapServer(description, classDirectoryService);
- classKdcServer =
ServerAnnotationProcessor.getKdcServer(description, classDirectoryService);
-
// print out information which partition factory we use
DirectoryServiceFactory dsFactory = new
DefaultDirectoryServiceFactory();
PartitionFactory partitionFactory =
dsFactory.getPartitionFactory();
@@ -135,8 +123,6 @@ public class DirectoryExtension implements
BeforeAllCallback, AfterAllCallback,
directoryService = classDirectoryService;
} else if (classLdapServer != null) {
directoryService = classLdapServer.getDirectoryService();
- } else if (classKdcServer != null) {
- directoryService = classKdcServer.getDirectoryService();
}
// apply the method LDIFs, and tag for reversion
revision = getCurrentRevision(directoryService);
@@ -153,36 +139,18 @@ public class DirectoryExtension implements
BeforeAllCallback, AfterAllCallback,
ldapServer.setDirectoryService(directoryService);
}
- methodKdcServer =
ServerAnnotationProcessor.getKdcServer(methodDescription, directoryService);
- if (methodKdcServer != null) {
- kdcServer = methodKdcServer;
- } else if (classKdcServer != null) {
- kdcServer = classKdcServer;
- }
- if (kdcServer != null) {
- oldKdcServerDirService = kdcServer.getDirectoryService();
- kdcServer.setDirectoryService(directoryService);
- }
-
// At this point, we know which services to use, so inject them
into the test instance
inject(context, SET_SERVICE_METHOD_NAME, DirectoryService.class,
directoryService);
inject(context, SET_LDAP_SERVER_METHOD_NAME, LdapServer.class,
ldapServer);
- inject(context, SET_KDC_SERVER_METHOD_NAME, KdcServer.class,
kdcServer);
}
public void afterEach(ExtensionContext context) throws Exception {
if (oldLdapServerDirService != null) {
ldapServer.setDirectoryService(oldLdapServerDirService);
}
- if (oldKdcServerDirService != null) {
- kdcServer.setDirectoryService(oldKdcServerDirService);
- }
if (methodLdapServer != null) {
methodLdapServer.stop();
}
- if (methodKdcServer != null) {
- methodKdcServer.stop();
- }
// Cleanup the methodDS if it has been created
if (methodDirectoryService != null) {
LOG.debug("Shuting down DS for {}",
methodDirectoryService.getInstanceId());
@@ -198,9 +166,6 @@ public class DirectoryExtension implements
BeforeAllCallback, AfterAllCallback,
if (classLdapServer != null) {
classLdapServer.stop();
}
- if (classKdcServer != null) {
- classKdcServer.stop();
- }
if (classDirectoryService != null) {
LOG.debug("Shuting down DS for {}",
classDirectoryService.getInstanceId());
classDirectoryService.shutdown();
diff --git
a/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
b/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
index 00aca1668b8..a3a7279948a 100644
---
a/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
+++
b/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
@@ -29,19 +29,13 @@ import org.apache.camel.RuntimeCamelException;
import org.apache.directory.api.ldap.model.constants.SupportedSaslMechanisms;
import org.apache.directory.api.util.Network;
import org.apache.directory.api.util.Strings;
-import org.apache.directory.server.annotations.CreateChngPwdServer;
import org.apache.directory.server.annotations.CreateConsumer;
-import org.apache.directory.server.annotations.CreateKdcServer;
import org.apache.directory.server.annotations.CreateLdapServer;
import org.apache.directory.server.annotations.CreateTransport;
import org.apache.directory.server.annotations.SaslMechanism;
import org.apache.directory.server.core.annotations.AnnotationUtils;
import org.apache.directory.server.core.api.DirectoryService;
import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.server.kerberos.ChangePasswordConfig;
-import org.apache.directory.server.kerberos.KerberosConfig;
-import org.apache.directory.server.kerberos.changepwd.ChangePasswordServer;
-import org.apache.directory.server.kerberos.kdc.KdcServer;
import org.apache.directory.server.ldap.ExtendedOperationHandler;
import org.apache.directory.server.ldap.LdapServer;
import org.apache.directory.server.ldap.handlers.sasl.MechanismHandler;
@@ -313,81 +307,6 @@ public final class ServerAnnotationProcessor {
return classCaller.getAnnotation(annotationClass);
}
- public static KdcServer getKdcServer(DirectoryService directoryService,
int startPort) throws Exception {
- CreateKdcServer createKdcServer = (CreateKdcServer)
getAnnotation(CreateKdcServer.class);
- return createKdcServer(createKdcServer, directoryService);
- }
-
- private static KdcServer createKdcServer(CreateKdcServer createKdcServer,
DirectoryService directoryService) {
- if (createKdcServer == null) {
- return null;
- }
-
- KerberosConfig kdcConfig = new KerberosConfig();
- kdcConfig.setServicePrincipal(createKdcServer.kdcPrincipal());
- kdcConfig.setPrimaryRealm(createKdcServer.primaryRealm());
-
kdcConfig.setMaximumTicketLifetime(createKdcServer.maxTicketLifetime());
-
kdcConfig.setMaximumRenewableLifetime(createKdcServer.maxRenewableLifetime());
-
- KdcServer kdcServer = new KdcServer(kdcConfig);
-
- kdcServer.setSearchBaseDn(createKdcServer.searchBaseDn());
-
- CreateTransport[] transportBuilders = createKdcServer.transports();
-
- if (transportBuilders == null) {
- // create only UDP transport if none specified
- int port = 0;
- try {
- port = getFreePort();
- } catch (IOException ioe) {
- // Don't know what to do here...
- }
- UdpTransport defaultTransport = new UdpTransport(port);
- kdcServer.addTransports(defaultTransport);
- } else if (transportBuilders.length > 0) {
- for (CreateTransport transportBuilder : transportBuilders) {
- List<Transport> transports =
createTransports(transportBuilder);
- for (Transport t : transports) {
- kdcServer.addTransports(t);
- }
- }
- }
-
- CreateChngPwdServer[] createChngPwdServers =
createKdcServer.chngPwdServer();
-
- if (createChngPwdServers.length > 0) {
-
- CreateChngPwdServer createChngPwdServer = createChngPwdServers[0];
- ChangePasswordConfig config = new ChangePasswordConfig(kdcConfig);
- config.setServicePrincipal(createChngPwdServer.srvPrincipal());
-
- ChangePasswordServer chngPwdServer = new
ChangePasswordServer(config);
-
- for (CreateTransport transportBuilder :
createChngPwdServer.transports()) {
- List<Transport> transports =
createTransports(transportBuilder);
- for (Transport t : transports) {
- chngPwdServer.addTransports(t);
- }
- }
-
- chngPwdServer.setDirectoryService(directoryService);
-
- kdcServer.setChangePwdServer(chngPwdServer);
- }
-
- kdcServer.setDirectoryService(directoryService);
-
- // Launch the server
- try {
- kdcServer.start();
- } catch (Exception e) {
- LOG.warn("Failed to start the KDC server: {}", e.getMessage(), e);
- }
-
- return kdcServer;
- }
-
private static List<Transport> createTransports(CreateTransport
transportBuilder) {
String protocol = transportBuilder.protocol();
int port = transportBuilder.port();
@@ -438,10 +357,4 @@ public final class ServerAnnotationProcessor {
return port;
}
- public static KdcServer getKdcServer(Description description,
DirectoryService directoryService) {
- CreateKdcServer createLdapServer =
description.getAnnotation(CreateKdcServer.class);
-
- return createKdcServer(createLdapServer, directoryService);
- }
-
}
diff --git
a/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java
b/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java
index 6728221735e..0e63c92fb6e 100644
---
a/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java
+++
b/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java
@@ -34,7 +34,6 @@ import
org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory;
import org.apache.directory.server.core.factory.DirectoryServiceFactory;
import org.apache.directory.server.core.factory.PartitionFactory;
import org.apache.directory.server.core.security.TlsKeyGenerator;
-import org.apache.directory.server.kerberos.kdc.KdcServer;
import org.apache.directory.server.ldap.LdapServer;
import org.junit.jupiter.api.extension.AfterAllCallback;
import org.junit.jupiter.api.extension.AfterEachCallback;
@@ -68,11 +67,6 @@ public class DirectoryExtension implements
BeforeAllCallback, AfterAllCallback,
*/
private static final String SET_LDAP_SERVER_METHOD_NAME = "setLdapServer";
- /**
- * The 'kdcServer' field in the run tests
- */
- private static final String SET_KDC_SERVER_METHOD_NAME = "setKdcServer";
-
public static class State {
DirectoryService classDirectoryService;
DirectoryService methodDirectoryService;
@@ -80,9 +74,6 @@ public class DirectoryExtension implements BeforeAllCallback,
AfterAllCallback,
LdapServer classLdapServer;
LdapServer methodLdapServer;
LdapServer ldapServer;
- KdcServer classKdcServer;
- KdcServer methodKdcServer;
- KdcServer kdcServer;
DirectoryService oldLdapServerDirService;
DirectoryService oldKdcServerDirService;
long revision;
@@ -111,8 +102,6 @@ public class DirectoryExtension implements
BeforeAllCallback, AfterAllCallback,
// check if it has a LdapServerBuilder, then use the DS created
above
classLdapServer =
ServerAnnotationProcessor.createLdapServer(description, classDirectoryService);
- classKdcServer =
ServerAnnotationProcessor.getKdcServer(description, classDirectoryService);
-
// print out information which partition factory we use
DirectoryServiceFactory dsFactory = new
DefaultDirectoryServiceFactory();
PartitionFactory partitionFactory =
dsFactory.getPartitionFactory();
@@ -135,8 +124,6 @@ public class DirectoryExtension implements
BeforeAllCallback, AfterAllCallback,
directoryService = classDirectoryService;
} else if (classLdapServer != null) {
directoryService = classLdapServer.getDirectoryService();
- } else if (classKdcServer != null) {
- directoryService = classKdcServer.getDirectoryService();
}
// apply the method LDIFs, and tag for reversion
revision = getCurrentRevision(directoryService);
@@ -153,36 +140,18 @@ public class DirectoryExtension implements
BeforeAllCallback, AfterAllCallback,
ldapServer.setDirectoryService(directoryService);
}
- methodKdcServer =
ServerAnnotationProcessor.getKdcServer(methodDescription, directoryService);
- if (methodKdcServer != null) {
- kdcServer = methodKdcServer;
- } else if (classKdcServer != null) {
- kdcServer = classKdcServer;
- }
- if (kdcServer != null) {
- oldKdcServerDirService = kdcServer.getDirectoryService();
- kdcServer.setDirectoryService(directoryService);
- }
-
// At this point, we know which services to use, so inject them
into the test instance
inject(context, SET_SERVICE_METHOD_NAME, DirectoryService.class,
directoryService);
inject(context, SET_LDAP_SERVER_METHOD_NAME, LdapServer.class,
ldapServer);
- inject(context, SET_KDC_SERVER_METHOD_NAME, KdcServer.class,
kdcServer);
}
public void afterEach(ExtensionContext context) throws Exception {
if (oldLdapServerDirService != null) {
ldapServer.setDirectoryService(oldLdapServerDirService);
}
- if (oldKdcServerDirService != null) {
- kdcServer.setDirectoryService(oldKdcServerDirService);
- }
if (methodLdapServer != null) {
methodLdapServer.stop();
}
- if (methodKdcServer != null) {
- methodKdcServer.stop();
- }
// Cleanup the methodDS if it has been created
if (methodDirectoryService != null) {
LOG.debug("Shuting down DS for {}",
methodDirectoryService.getInstanceId());
@@ -198,9 +167,6 @@ public class DirectoryExtension implements
BeforeAllCallback, AfterAllCallback,
if (classLdapServer != null) {
classLdapServer.stop();
}
- if (classKdcServer != null) {
- classKdcServer.stop();
- }
if (classDirectoryService != null) {
LOG.debug("Shuting down DS for {}",
classDirectoryService.getInstanceId());
classDirectoryService.shutdown();
diff --git
a/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
b/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
index 00aca1668b8..a3a7279948a 100644
---
a/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
+++
b/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
@@ -29,19 +29,13 @@ import org.apache.camel.RuntimeCamelException;
import org.apache.directory.api.ldap.model.constants.SupportedSaslMechanisms;
import org.apache.directory.api.util.Network;
import org.apache.directory.api.util.Strings;
-import org.apache.directory.server.annotations.CreateChngPwdServer;
import org.apache.directory.server.annotations.CreateConsumer;
-import org.apache.directory.server.annotations.CreateKdcServer;
import org.apache.directory.server.annotations.CreateLdapServer;
import org.apache.directory.server.annotations.CreateTransport;
import org.apache.directory.server.annotations.SaslMechanism;
import org.apache.directory.server.core.annotations.AnnotationUtils;
import org.apache.directory.server.core.api.DirectoryService;
import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.server.kerberos.ChangePasswordConfig;
-import org.apache.directory.server.kerberos.KerberosConfig;
-import org.apache.directory.server.kerberos.changepwd.ChangePasswordServer;
-import org.apache.directory.server.kerberos.kdc.KdcServer;
import org.apache.directory.server.ldap.ExtendedOperationHandler;
import org.apache.directory.server.ldap.LdapServer;
import org.apache.directory.server.ldap.handlers.sasl.MechanismHandler;
@@ -313,81 +307,6 @@ public final class ServerAnnotationProcessor {
return classCaller.getAnnotation(annotationClass);
}
- public static KdcServer getKdcServer(DirectoryService directoryService,
int startPort) throws Exception {
- CreateKdcServer createKdcServer = (CreateKdcServer)
getAnnotation(CreateKdcServer.class);
- return createKdcServer(createKdcServer, directoryService);
- }
-
- private static KdcServer createKdcServer(CreateKdcServer createKdcServer,
DirectoryService directoryService) {
- if (createKdcServer == null) {
- return null;
- }
-
- KerberosConfig kdcConfig = new KerberosConfig();
- kdcConfig.setServicePrincipal(createKdcServer.kdcPrincipal());
- kdcConfig.setPrimaryRealm(createKdcServer.primaryRealm());
-
kdcConfig.setMaximumTicketLifetime(createKdcServer.maxTicketLifetime());
-
kdcConfig.setMaximumRenewableLifetime(createKdcServer.maxRenewableLifetime());
-
- KdcServer kdcServer = new KdcServer(kdcConfig);
-
- kdcServer.setSearchBaseDn(createKdcServer.searchBaseDn());
-
- CreateTransport[] transportBuilders = createKdcServer.transports();
-
- if (transportBuilders == null) {
- // create only UDP transport if none specified
- int port = 0;
- try {
- port = getFreePort();
- } catch (IOException ioe) {
- // Don't know what to do here...
- }
- UdpTransport defaultTransport = new UdpTransport(port);
- kdcServer.addTransports(defaultTransport);
- } else if (transportBuilders.length > 0) {
- for (CreateTransport transportBuilder : transportBuilders) {
- List<Transport> transports =
createTransports(transportBuilder);
- for (Transport t : transports) {
- kdcServer.addTransports(t);
- }
- }
- }
-
- CreateChngPwdServer[] createChngPwdServers =
createKdcServer.chngPwdServer();
-
- if (createChngPwdServers.length > 0) {
-
- CreateChngPwdServer createChngPwdServer = createChngPwdServers[0];
- ChangePasswordConfig config = new ChangePasswordConfig(kdcConfig);
- config.setServicePrincipal(createChngPwdServer.srvPrincipal());
-
- ChangePasswordServer chngPwdServer = new
ChangePasswordServer(config);
-
- for (CreateTransport transportBuilder :
createChngPwdServer.transports()) {
- List<Transport> transports =
createTransports(transportBuilder);
- for (Transport t : transports) {
- chngPwdServer.addTransports(t);
- }
- }
-
- chngPwdServer.setDirectoryService(directoryService);
-
- kdcServer.setChangePwdServer(chngPwdServer);
- }
-
- kdcServer.setDirectoryService(directoryService);
-
- // Launch the server
- try {
- kdcServer.start();
- } catch (Exception e) {
- LOG.warn("Failed to start the KDC server: {}", e.getMessage(), e);
- }
-
- return kdcServer;
- }
-
private static List<Transport> createTransports(CreateTransport
transportBuilder) {
String protocol = transportBuilder.protocol();
int port = transportBuilder.port();
@@ -438,10 +357,4 @@ public final class ServerAnnotationProcessor {
return port;
}
- public static KdcServer getKdcServer(Description description,
DirectoryService directoryService) {
- CreateKdcServer createLdapServer =
description.getAnnotation(CreateKdcServer.class);
-
- return createKdcServer(createLdapServer, directoryService);
- }
-
}
diff --git a/parent/pom.xml b/parent/pom.xml
index 6f18ba430bd..eb387222c6b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -62,7 +62,7 @@
<allegro-converter-version>0.3.0</allegro-converter-version>
<amazon-kinesis-client-version>2.6.0</amazon-kinesis-client-version>
<angus-mail-version>2.0.3</angus-mail-version>
- <apacheds-version>2.0.0.AM26</apacheds-version>
+ <apacheds-version>2.0.0.AM27</apacheds-version>
<apache-drill-version>1.22.0</apache-drill-version>
<arangodb-java-version>7.20.0</arangodb-java-version>
<as2-lib-version>5.1.5</as2-lib-version>
