svn commit: r1043594 - /directory/sandbox/kayyagari/kerberos-client/src/test/java/org/apache/directory/kerberos/client/KerberosConnectionTest.java

[ka...@apache.org]

Author: kayyagari
Date: Wed Dec  8 18:47:50 2010
New Revision: 1043594

URL: http://svn.apache.org/viewvc?rev=1043594&view=rev
Log:
o removed the CreateLdapServer annotation
o added ldif entries needed by the KDC

Modified:
    directory/sandbox/kayyagari/kerberos-client/src/test/java/org/apache/directory/kerberos/client/KerberosConnectionTest.java

Modified: directory/sandbox/kayyagari/kerberos-client/src/test/java/org/apache/directory/kerberos/client/KerberosConnectionTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/kayyagari/kerberos-client/src/test/java/org/apache/directory/kerberos/client/KerberosConnectionTest.java?rev=1043594&r1=1043593&r2=1043594&view=diff
==============================================================================
--- directory/sandbox/kayyagari/kerberos-client/src/test/java/org/apache/directory/kerberos/client/KerberosConnectionTest.java (original)
+++ directory/sandbox/kayyagari/kerberos-client/src/test/java/org/apache/directory/kerberos/client/KerberosConnectionTest.java Wed Dec  8 18:47:50 2010
@@ -24,9 +24,7 @@ package org.apache.directory.kerberos.cl
 import javax.security.auth.kerberos.KerberosPrincipal;
 
 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.ApplyLdifs;
 import org.apache.directory.server.core.annotations.ContextEntry;
 import org.apache.directory.server.core.annotations.CreateDS;
@@ -35,12 +33,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.core.kerberos.KeyDerivationInterceptor;
-import org.apache.directory.server.ldap.handlers.bind.cramMD5.CramMd5MechanismHandler;
-import org.apache.directory.server.ldap.handlers.bind.digestMD5.DigestMd5MechanismHandler;
-import org.apache.directory.server.ldap.handlers.bind.gssapi.GssapiMechanismHandler;
-import org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler;
-import org.apache.directory.server.ldap.handlers.bind.plain.PlainMechanismHandler;
-import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -73,22 +65,6 @@ import org.junit.runner.RunWith;
         {
                 KeyDerivationInterceptor.class
         })
-@CreateLdapServer(
-    transports =
-    {
-        @CreateTransport(protocol = "LDAP")
-    },
-    saslHost = "localhost",
-    saslPrincipal = "ldap/localhost@EXAMPLE.COM",
-        saslMechanisms =
-            {
-                @SaslMechanism(name = SupportedSaslMechanisms.PLAIN, implClass = PlainMechanismHandler.class),
-                @SaslMechanism(name = SupportedSaslMechanisms.CRAM_MD5, implClass = CramMd5MechanismHandler.class),
-                @SaslMechanism(name = SupportedSaslMechanisms.DIGEST_MD5, implClass = DigestMd5MechanismHandler.class),
-                @SaslMechanism(name = SupportedSaslMechanisms.GSSAPI, implClass = GssapiMechanismHandler.class),
-                @SaslMechanism(name = SupportedSaslMechanisms.NTLM, implClass = NtlmMechanismHandler.class),
-                @SaslMechanism(name = SupportedSaslMechanisms.GSS_SPNEGO, implClass = NtlmMechanismHandler.class)
-            })
 @CreateKdcServer(
     transports =
     {
@@ -126,6 +102,19 @@ import org.junit.runner.RunWith;
     "uid: krbtgt",
     "userPassword: secret",
     "krb5PrincipalName: krbtgt/EXAMPLE.COM@EXAMPLE.COM",
+    "krb5KeyVersionNumber: 0",
+    
+    "dn: uid=ldap,ou=Users,dc=example,dc=com",
+    "objectClass: top",
+    "objectClass: person",
+    "objectClass: inetOrgPerson",
+    "objectClass: krb5principal",
+    "objectClass: krb5kdcentry",
+    "cn: LDAP",
+    "sn: Service",
+    "uid: ldap",
+    "userPassword: randall",
+    "krb5PrincipalName: ldap/localhost@EXAMPLE.COM",
     "krb5KeyVersionNumber: 0"
  })
 public class KerberosConnectionTest extends AbstractLdapTestUnit