You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2006/08/21 00:42:52 UTC
svn commit: r433071 - in /directory/trunks/apacheds: core-unit/src/test/java/org/apache/directory/server/core/normalization/ core/src/main/java/org/apache/directory/server/core/jndi/ server-unit/src/test/java/org/apache/directory/server/

Author: akarasulu
Date: Sun Aug 20 15:42:50 2006
New Revision: 433071

URL: http://svn.apache.org/viewvc?rev=433071&view=rev
Log:
applying emmanuels changes for DIRSERVER-631 to trunks for range of commits starting from 433030 to 433034

Added:
    directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/AddingEntriesWithSpecialCharactersInRDNTest.java
      - copied unchanged from r433034, directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/AddingEntriesWithSpecialCharactersInRDNTest.java
Modified:
    directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceITest.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
    directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/AddITest.java
    directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/SearchTest.java

Modified: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceITest.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceITest.java?rev=433071&r1=433070&r2=433071&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceITest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceITest.java Sun Aug 20 15:42:50 2006
@@ -43,7 +43,7 @@
         Attributes attrs = sysRoot.getAttributes( "ou=corporate category\\, operations,ou=direct report view" );
         assertNotNull( attrs );
         Attribute ou = attrs.get( "ou" );
-        assertEquals( "corporate category\\, operations", ou.get() );
+        assertEquals( "corporate category, operations", ou.get() );
         Attribute oc = attrs.get( "objectClass" );
         assertTrue( oc.contains( "top" ) );
         assertTrue( oc.contains( "organizationalUnit" ) );

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java?rev=433071&r1=433070&r2=433071&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java Sun Aug 20 15:42:50 2006
@@ -338,7 +338,7 @@
         if ( rdn.size() == 1 )
         {
             String rdnAttribute = rdn.getType();
-            String rdnValue = rdn.getValue();
+            String rdnValue = (String)rdn.getValue();
 
             // Add the Rdn attribute
             boolean doRdnPut = attributes.get( rdnAttribute ) == null;

Modified: directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/AddITest.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/AddITest.java?rev=433071&r1=433070&r2=433071&view=diff
==============================================================================
--- directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/AddITest.java (original)
+++ directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/AddITest.java Sun Aug 20 15:42:50 2006
@@ -34,7 +34,6 @@
 /**
  * Various add scenario tests.
  * 
- * @author szoerner
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */

Modified: directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/SearchTest.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/SearchTest.java?rev=433071&r1=433070&r2=433071&view=diff
==============================================================================
--- directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/SearchTest.java (original)
+++ directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/SearchTest.java Sun Aug 20 15:42:50 2006
@@ -170,7 +170,7 @@
     /**
      * Search operation with a base DN which contains a BER encoded value.
      */
-    public void testSearchBEREncodedBase() throws NamingException
+    /*public void testSearchBEREncodedBase() throws NamingException
     {
         // create additional entry
         Attributes attributes = this.getPersonAttributes( "Ferry", "Bryan Ferry" );
@@ -181,7 +181,7 @@
         String filter = "(cn=Bryan Ferry)";
 
         // sn=Ferry with BEROctetString values
-        String base = "sn=#4665727279";
+        String base = "2.5.4.4=#4665727279";
 
         try
         {
@@ -201,7 +201,7 @@
         {
             fail( e.getMessage() );
         }
-    }
+    }*/
 
     
     /**