vmario/docs
1
0
Fork 0
mirror of https://github.com/sismics/docs.git synced 2025-01-03 08:43:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

use org.apache.directory.api for LDAP instead of apacheds

Browse Source
This commit is contained in:
bgamard 2020-08-29 19:10:14 +02:00
parent 113ec78c67
commit 3ad0554a7d
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs-core/pom.xml
View File

@ -133,14 +133,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.directory.server</groupId> <groupId>org.apache.directory.api</groupId>
<artifactId>apacheds-core</artifactId> <artifactId>api-all</artifactId>
<exclusions>
<exclusion>
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- Only there to read old index and rebuild them --> <!-- Only there to read old index and rebuild them -->

4
docs-core/src/main/java/com/sismics/docs/core/util/authentication/LdapAuthenticationHandler.java
View File

@ -17,7 +17,7 @@ import org.apache.directory.api.ldap.model.message.SearchScope;
import org.apache.directory.ldap.client.api.DefaultLdapConnectionFactory; import org.apache.directory.ldap.client.api.DefaultLdapConnectionFactory;
import org.apache.directory.ldap.client.api.LdapConnectionConfig; import org.apache.directory.ldap.client.api.LdapConnectionConfig;
import org.apache.directory.ldap.client.api.LdapConnectionPool; import org.apache.directory.ldap.client.api.LdapConnectionPool;
import org.apache.directory.ldap.client.api.PoolableLdapConnectionFactory; import org.apache.directory.ldap.client.api.ValidatingPoolableLdapConnectionFactory;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -74,7 +74,7 @@ public class LdapAuthenticationHandler implements AuthenticationHandler {
GenericObjectPool.Config poolConfig = new GenericObjectPool.Config(); GenericObjectPool.Config poolConfig = new GenericObjectPool.Config();
poolConfig.whenExhaustedAction = GenericObjectPool.WHEN_EXHAUSTED_GROW; poolConfig.whenExhaustedAction = GenericObjectPool.WHEN_EXHAUSTED_GROW;
poolConfig.maxWait = 500; poolConfig.maxWait = 500;
pool = new LdapConnectionPool(new PoolableLdapConnectionFactory(factory), poolConfig); pool = new LdapConnectionPool(new ValidatingPoolableLdapConnectionFactory(factory), poolConfig);
} }
@Override @Override

8
pom.xml
View File

@ -50,7 +50,7 @@
<com.sun.mail.javax.mail.version>1.6.2</com.sun.mail.javax.mail.version> <com.sun.mail.javax.mail.version>1.6.2</com.sun.mail.javax.mail.version>
<org.jsoup.jsoup.version>1.11.3</org.jsoup.jsoup.version> <org.jsoup.jsoup.version>1.11.3</org.jsoup.jsoup.version>
<com.squareup.okhttp3.okhttp.version>3.11.0</com.squareup.okhttp3.okhttp.version> <com.squareup.okhttp3.okhttp.version>3.11.0</com.squareup.okhttp3.okhttp.version>
<org.apache.directory.server.apacheds.version>2.0.0-M17</org.apache.directory.server.apacheds.version> <org.apache.directory.api.api-all.version>1.0.0</org.apache.directory.api.api-all.version>
<org.eclipse.jetty.jetty-server.version>9.4.17.v20190418</org.eclipse.jetty.jetty-server.version> <org.eclipse.jetty.jetty-server.version>9.4.17.v20190418</org.eclipse.jetty.jetty-server.version>
<org.eclipse.jetty.jetty-webapp.version>9.4.17.v20190418</org.eclipse.jetty.jetty-webapp.version> <org.eclipse.jetty.jetty-webapp.version>9.4.17.v20190418</org.eclipse.jetty.jetty-webapp.version>
@ -461,9 +461,9 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.directory.server</groupId> <groupId>org.apache.directory.api</groupId>
<artifactId>apacheds-core</artifactId> <artifactId>api-all</artifactId>
<version>${org.apache.directory.server.apacheds.version}</version> <version>${org.apache.directory.api.api-all.version}</version>
</dependency> </dependency>
<!-- Servlet listener to register SPI ImageIO plugins --> <!-- Servlet listener to register SPI ImageIO plugins -->