directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1729394 - in /directory/apacheds/trunk: ldap-client-test/ ldap-client-test/src/test/java/org/apache/directory/shared/client/api/ service/src/main/java/org/apache/directory/server/
Date Tue, 09 Feb 2016 14:34:06 GMT
Author: elecharny
Date: Tue Feb  9 14:34:05 2016
New Revision: 1729394

URL: http://svn.apache.org/viewvc?rev=1729394&view=rev
Log:
o Added the kerberos dependencies in the ldap-client-test to test the SASL bind
o Fixed a couple of tests to use the SchemaManager.getAllSchemas() method

Modified:
    directory/apacheds/trunk/ldap-client-test/pom.xml
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/ServerSchemaLoaderTest.java
    directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java

Modified: directory/apacheds/trunk/ldap-client-test/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/pom.xml?rev=1729394&r1=1729393&r2=1729394&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/pom.xml (original)
+++ directory/apacheds/trunk/ldap-client-test/pom.xml Tue Feb  9 14:34:05 2016
@@ -65,6 +65,18 @@
       <artifactId>apacheds-test-framework</artifactId>
     </dependency>
     
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-interceptor-kerberos</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-kerberos-test</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    
     <!-- Shared dependencies -->
     <dependency>
       <groupId>org.apache.directory.api</groupId>

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java?rev=1729394&r1=1729393&r2=1729394&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java
(original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java
Tue Feb  9 14:34:05 2016
@@ -265,7 +265,7 @@ public void testLookup() throws Exceptio
         assertNotNull( manager );
         assertTrue( manager.isEnabled( "system" ) );
         assertFalse( manager.isEnabled( "nis" ) );
-        assertEquals( manager.getLoader().getAllSchemas().size(), manager.getEnabled().size()
);
+        assertEquals( manager.getAllSchemas().size(), manager.getEnabled().size() );
     }
 
 

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/ServerSchemaLoaderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/ServerSchemaLoaderTest.java?rev=1729394&r1=1729393&r2=1729394&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/ServerSchemaLoaderTest.java
(original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/ServerSchemaLoaderTest.java
Tue Feb  9 14:34:05 2016
@@ -21,8 +21,8 @@
 package org.apache.directory.shared.client.api;
 
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -91,7 +91,7 @@ public class ServerSchemaLoaderTest exte
         assertTrue( schemaManager.isSchemaLoaded( "system" ) );
         assertTrue( schemaManager.isEnabled( "system" ) );
         assertFalse( schemaManager.isSchemaLoaded( "nis" ) );
-        assertEquals( schemaManager.getLoader().getAllSchemas().size(), schemaManager.getEnabled().size()
);
+        assertEquals( schemaManager.getAllSchemas().size(), schemaManager.getEnabled().size()
);
 
         assertTrue( schemaManager.getRegistries().getAttributeTypeRegistry().contains( "cn"
) );
     }

Modified: directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java?rev=1729394&r1=1729393&r2=1729394&view=diff
==============================================================================
--- directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java
(original)
+++ directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java
Tue Feb  9 14:34:05 2016
@@ -231,7 +231,7 @@ public class ApacheDsService
 
         if ( !partitionsDir.exists() )
         {
-            LOG.info( "partition directory doesn't exist, creating {}", partitionsDir.getAbsolutePath()
);
+            System.out.println( "partition directory doesn't exist, creating " + partitionsDir.getAbsolutePath()
);
 
             if ( !partitionsDir.mkdirs() )
             {
@@ -239,7 +239,7 @@ public class ApacheDsService
             }
         }
 
-        LOG.info( "Repairing partition dir {}", partitionsDir.getAbsolutePath() );
+        System.out.println( "Repairing partition dir " + partitionsDir.getAbsolutePath()
);
 
         CacheService cacheService = new CacheService();
         cacheService.initialize( instanceLayout );
@@ -290,8 +290,8 @@ public class ApacheDsService
         }
 
         SchemaLoader loader = new LdifSchemaLoader( schemaPartitionDirectory );
-        schemaManager = new DefaultSchemaManager( loader );
-
+        schemaManager = new DefaultSchemaManager( loader.getAllSchemas() );
+        
         // We have to load the schema now, otherwise we won't be able
         // to initialize the Partitions, as we won't be able to parse
         // and normalize their suffix Dn



Mime
View raw message