directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r923891 - in /directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations: add/AddingEntriesWithSpecialCharactersInRDNIT.java extended/DITUtilitiesSP.java modify/ModifyAddIT.java search/PersistentSearchIT.java
Date Tue, 16 Mar 2010 17:34:40 GMT
Author: kayyagari
Date: Tue Mar 16 17:34:39 2010
New Revision: 923891

URL: http://svn.apache.org/viewvc?rev=923891&view=rev
Log:
o fixed exceptions
o replaced references to javax.naming.Name with DN

Modified:
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/DITUtilitiesSP.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyAddIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java?rev=923891&r1=923890&r2=923891&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java
Tue Mar 16 17:34:39 2010
@@ -37,6 +37,7 @@ import org.apache.directory.server.annot
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.integ.ServerIntegrationUtils;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.name.DN;
 import org.junit.Test;
@@ -57,7 +58,7 @@ import org.junit.runner.RunWith;
     })
 public class AddingEntriesWithSpecialCharactersInRDNIT extends AbstractLdapTestUnit
 {
-    private Attributes getPersonAttributes( String sn, String cn ) throws NamingException
+    private Attributes getPersonAttributes( String sn, String cn ) throws LdapException
     {
         Attributes attrs = LdifUtils.createAttributes( 
             "objectClass: top",
@@ -69,7 +70,7 @@ public class AddingEntriesWithSpecialCha
     }
 
 
-    private Attributes getOrgUnitAttributes( String ou ) throws NamingException
+    private Attributes getOrgUnitAttributes( String ou ) throws LdapException
     {
         Attributes attrs = LdifUtils.createAttributes( 
             "objectClass: top",

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/DITUtilitiesSP.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/DITUtilitiesSP.java?rev=923891&r1=923890&r2=923891&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/DITUtilitiesSP.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/DITUtilitiesSP.java
Tue Mar 16 17:34:39 2010
@@ -19,7 +19,6 @@
  */
 package org.apache.directory.server.operations.extended;
 
-import javax.naming.Name;
 import javax.naming.NamingException;
 
 import org.apache.directory.server.core.CoreSession;
@@ -48,16 +47,16 @@ public class DITUtilitiesSP
      *        the subtree to be deleted
      * @throws NamingException
      */
-    public static void deleteSubtree( CoreSession session, Name rdn ) throws Exception
+    public static void deleteSubtree( CoreSession session, DN rdn ) throws Exception
     {
-        EntryFilteringCursor results = session.list( (DN)rdn, AliasDerefMode.DEREF_ALWAYS,
null );
+        EntryFilteringCursor results = session.list( rdn, AliasDerefMode.DEREF_ALWAYS, null
);
         
         results.beforeFirst();
         
         while ( results.next() )
         {
             ClonedServerEntry result = results.get();
-            Name childRdn = result.getDn();
+            DN childRdn = result.getDn();
             childRdn.remove( 0 );
             deleteSubtree( session, childRdn );
         }

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyAddIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyAddIT.java?rev=923891&r1=923890&r2=923891&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyAddIT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyAddIT.java
Tue Mar 16 17:34:39 2010
@@ -50,6 +50,7 @@ import org.apache.directory.server.annot
 import org.apache.directory.server.core.annotations.ApplyLdifs;
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -102,7 +103,7 @@ public class ModifyAddIT  extends Abstra
     /**
      * Creation of required attributes of a person entry.
      */
-    protected Attributes getPersonAttributes( String sn, String cn ) throws NamingException
+    protected Attributes getPersonAttributes( String sn, String cn ) throws LdapException
     {
         Attributes attributes = LdifUtils.createAttributes( 
             "objectClass: top",

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java?rev=923891&r1=923890&r2=923891&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java
Tue Mar 16 17:34:39 2010
@@ -31,7 +31,6 @@ import java.util.EventObject;
 import java.util.List;
 
 import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.BasicAttributes;
 import javax.naming.directory.DirContext;
@@ -55,6 +54,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeControl;
 import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeControlDecoder;
 import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchControl;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.jndi.JndiUtils;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.message.control.Control;
@@ -99,7 +99,7 @@ public class PersistentSearchIT extends 
     /**
      * Creation of required attributes of a person entry.
      */
-    private Attributes getPersonAttributes( String sn, String cn ) throws NamingException
+    private Attributes getPersonAttributes( String sn, String cn ) throws LdapException
     {
         Attributes attributes = LdifUtils.createAttributes( 
             "objectClass: top",



Mime
View raw message