[jboss-cvs] JBossAS SVN: r114801 - in branches/JBPAPP_5: testsuite/src/main/org/jboss/test/security/ldapext and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Apr 10 16:53:24 EDT 2014
Author: dpospisil
Date: 2014-04-10 16:53:24 -0400 (Thu, 10 Apr 2014)
New Revision: 114801
Modified:
branches/JBPAPP_5/component-matrix/pom.xml
branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/ldapext/LDAPServerControl.java
branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/DSAnnotationProcessor.java
branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/KDCServerAnnotationProcessor.java
branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/KerberosServerControl.java
branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/ManagedCreateLdapServer.java
branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/NoReplayKdcServer.java
Log:
JBPAPP-11111 Update ApacheDS to 2.0.0-M15
Modified: branches/JBPAPP_5/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5/component-matrix/pom.xml 2014-04-10 13:11:36 UTC (rev 114800)
+++ branches/JBPAPP_5/component-matrix/pom.xml 2014-04-10 20:53:24 UTC (rev 114801)
@@ -108,7 +108,7 @@
<version.sun.jaxb.api>2.1</version.sun.jaxb.api>
<version.xdoclet>1.2.3</version.xdoclet>
<version.xjavadoc>1.1</version.xjavadoc>
- <version.apacheds>2.0.0-M7</version.apacheds>
+ <version.apacheds>2.0.0-M15</version.apacheds>
<version.org.apache.httpcomponents>4.2.1</version.org.apache.httpcomponents>
<version.org.apache.santuario>1.5.6</version.org.apache.santuario>
<version.commons-cli.commons-cli>1.2</version.commons-cli.commons-cli>
Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/ldapext/LDAPServerControl.java
===================================================================
--- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/ldapext/LDAPServerControl.java 2014-04-10 13:11:36 UTC (rev 114800)
+++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/ldapext/LDAPServerControl.java 2014-04-10 20:53:24 UTC (rev 114801)
@@ -32,16 +32,16 @@
import org.apache.directory.server.core.kerberos.KeyDerivationInterceptor;
import org.apache.directory.server.factory.ServerAnnotationProcessor;
import org.apache.directory.server.ldap.LdapServer;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.ldif.LdifEntry;
-import org.apache.directory.shared.ldap.model.ldif.LdifReader;
-import org.apache.directory.shared.ldap.model.schema.SchemaManager;
import org.jboss.logging.Logger;
import java.io.*;
import java.net.*;
import java.util.HashMap;
import java.util.Map;
+import org.apache.directory.api.ldap.model.entry.DefaultEntry;
+import org.apache.directory.api.ldap.model.ldif.LdifEntry;
+import org.apache.directory.api.ldap.model.ldif.LdifReader;
+import org.apache.directory.api.ldap.model.schema.SchemaManager;
/**
* Small application which starts/stops ApacheDS and LDAP and imports LDIFs provided as program
Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/DSAnnotationProcessor.java
===================================================================
--- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/DSAnnotationProcessor.java 2014-04-10 13:11:36 UTC (rev 114800)
+++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/DSAnnotationProcessor.java 2014-04-10 20:53:24 UTC (rev 114801)
@@ -23,7 +23,12 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-
+import org.apache.directory.api.ldap.model.entry.DefaultEntry;
+import org.apache.directory.api.ldap.model.exception.LdapException;
+import org.apache.directory.api.ldap.model.ldif.LdifEntry;
+import org.apache.directory.api.ldap.model.ldif.LdifReader;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.schema.SchemaManager;
import org.apache.directory.server.core.annotations.AnnotationUtils;
import org.apache.directory.server.core.annotations.ContextEntry;
import org.apache.directory.server.core.annotations.CreateAuthenticator;
@@ -41,12 +46,6 @@
import org.apache.directory.server.core.partition.impl.btree.AbstractBTreePartition;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.model.ldif.LdifEntry;
-import org.apache.directory.shared.ldap.model.ldif.LdifReader;
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.schema.SchemaManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -158,9 +157,9 @@
partition.setId(createPartition.name());
partition.setSuffixDn(new Dn(service.getSchemaManager(), createPartition.suffix()));
- if (partition instanceof AbstractBTreePartition<?>)
+ if (partition instanceof AbstractBTreePartition)
{
- AbstractBTreePartition<?> btreePartition = (AbstractBTreePartition<?>) partition;
+ AbstractBTreePartition btreePartition = (AbstractBTreePartition) partition;
btreePartition.setCacheSize(createPartition.cacheSize());
btreePartition.setPartitionPath(new File(service.getInstanceLayout().getPartitionsDirectory(),
createPartition.name()).toURI());
@@ -173,9 +172,9 @@
// The annotation does not specify a specific index
// type.
// We use the generic index implementation.
- JdbmIndex index = new JdbmIndex();
- index.setAttributeId(createIndex.attribute());
+ JdbmIndex index = new JdbmIndex(createIndex.attribute(), true);
+
btreePartition.addIndexedAttributes(index);
}
}
Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/KDCServerAnnotationProcessor.java
===================================================================
--- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/KDCServerAnnotationProcessor.java 2014-04-10 13:11:36 UTC (rev 114800)
+++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/KDCServerAnnotationProcessor.java 2014-04-10 20:53:24 UTC (rev 114801)
@@ -25,6 +25,7 @@
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.KerberosConfig;
import org.apache.directory.server.kerberos.kdc.KdcServer;
import org.apache.directory.server.protocol.shared.transport.TcpTransport;
import org.apache.directory.server.protocol.shared.transport.Transport;
@@ -79,14 +80,16 @@
{
return null;
}
- KdcServer kdcServer = new NoReplayKdcServer();
- kdcServer.setServiceName(createKdcServer.name());
- kdcServer.setKdcPrincipal(createKdcServer.kdcPrincipal());
- kdcServer.setPrimaryRealm(createKdcServer.primaryRealm());
- kdcServer.setMaximumTicketLifetime(createKdcServer.maxTicketLifetime());
- kdcServer.setMaximumRenewableLifetime(createKdcServer.maxRenewableLifetime());
- kdcServer.setSearchBaseDn(createKdcServer.searchBaseDn());
- kdcServer.setPaEncTimestampRequired(false);
+
+ KerberosConfig kdcConfig = new KerberosConfig();
+ kdcConfig.setServicePrincipal(createKdcServer.kdcPrincipal());
+ kdcConfig.setPrimaryRealm(createKdcServer.primaryRealm());
+ kdcConfig.setMaximumTicketLifetime(createKdcServer.maxTicketLifetime());
+ kdcConfig.setMaximumRenewableLifetime(createKdcServer.maxRenewableLifetime());
+ kdcConfig.setPaEncTimestampRequired(false);
+ kdcConfig.setSearchBaseDn(createKdcServer.searchBaseDn());
+
+ KdcServer kdcServer = new NoReplayKdcServer(kdcConfig);
CreateTransport[] transportBuilders = createKdcServer.transports();
Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/KerberosServerControl.java
===================================================================
--- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/KerberosServerControl.java 2014-04-10 13:11:36 UTC (rev 114800)
+++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/KerberosServerControl.java 2014-04-10 20:53:24 UTC (rev 114801)
@@ -37,6 +37,10 @@
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.text.StrSubstitutor;
+import org.apache.directory.api.ldap.model.entry.DefaultEntry;
+import org.apache.directory.api.ldap.model.ldif.LdifEntry;
+import org.apache.directory.api.ldap.model.ldif.LdifReader;
+import org.apache.directory.api.ldap.model.schema.SchemaManager;
import org.apache.directory.server.annotations.CreateTransport;
import org.apache.directory.server.core.annotations.ContextEntry;
import org.apache.directory.server.core.annotations.CreateDS;
@@ -45,10 +49,6 @@
import org.apache.directory.server.core.api.DirectoryService;
import org.apache.directory.server.core.kerberos.KeyDerivationInterceptor;
import org.apache.directory.server.kerberos.kdc.KdcServer;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.ldif.LdifEntry;
-import org.apache.directory.shared.ldap.model.ldif.LdifReader;
-import org.apache.directory.shared.ldap.model.schema.SchemaManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/ManagedCreateLdapServer.java
===================================================================
--- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/ManagedCreateLdapServer.java 2014-04-10 13:11:36 UTC (rev 114800)
+++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/ManagedCreateLdapServer.java 2014-04-10 20:53:24 UTC (rev 114801)
@@ -74,6 +74,8 @@
/** The service principal, used by GSSAPI. */
private String saslPrincipal;
+ private String[] saslRealms;
+
// Constructors ----------------------------------------------------------
/**
@@ -98,6 +100,7 @@
ntlmProvider = createLdapServer.ntlmProvider();
saslHost = createLdapServer.saslHost();
saslPrincipal = createLdapServer.saslPrincipal();
+ saslRealms = createLdapServer.saslRealms();
}
// Public methods --------------------------------------------------------
@@ -362,4 +365,8 @@
this.saslPrincipal = saslPrincipal;
}
+ public String[] saslRealms() {
+ return saslRealms;
+ }
+
}
Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/NoReplayKdcServer.java
===================================================================
--- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/NoReplayKdcServer.java 2014-04-10 13:11:36 UTC (rev 114800)
+++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/NoReplayKdcServer.java 2014-04-10 20:53:24 UTC (rev 114801)
@@ -24,8 +24,9 @@
import java.io.IOException;
import java.lang.reflect.Field;
+import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
+import org.apache.directory.server.kerberos.KerberosConfig;
import org.apache.directory.server.kerberos.kdc.KdcServer;
-import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,6 +40,9 @@
private static Logger LOGGER = LoggerFactory.getLogger(NoReplayKdcServer.class);
+ NoReplayKdcServer(KerberosConfig kdcConfig) {
+ super(kdcConfig);
+ }
/**
* @throws IOException if we cannot bind to the sockets
More information about the jboss-cvs-commits
mailing list