directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r633478 - in /directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src: main/java/org/apache/directory/server/core/avltree/ test/java/org/apache/directory/server/core/avltree/
Date Tue, 04 Mar 2008 14:09:17 GMT
Author: akarasulu
Date: Tue Mar  4 06:09:15 2008
New Revision: 633478

URL: http://svn.apache.org/viewvc?rev=633478&view=rev
Log:
DIRSERVER-1138: patches applied for Kiran Ayyagari

Added:
    directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/test/java/org/apache/directory/server/core/avltree/AVLTreePerfTest.java
Modified:
    directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/main/java/org/apache/directory/server/core/avltree/AVLTree.java
    directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMarshaller.java
    directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/main/java/org/apache/directory/server/core/avltree/LinkedAvlNode.java
    directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/main/java/org/apache/directory/server/core/avltree/Marshaller.java
    directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/test/java/org/apache/directory/server/core/avltree/AVLTreeTest.java
    directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMarshallerTest.java
    directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/test/java/org/apache/directory/server/core/avltree/IntegerKeyMarshaller.java

Modified: directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/main/java/org/apache/directory/server/core/avltree/AVLTree.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/main/java/org/apache/directory/server/core/avltree/AVLTree.java?rev=633478&r1=633477&r2=633478&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/main/java/org/apache/directory/server/core/avltree/AVLTree.java
(original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/main/java/org/apache/directory/server/core/avltree/AVLTree.java
Tue Mar  4 06:09:15 2008
@@ -24,6 +24,7 @@
 import java.util.Comparator;
 import java.util.List;
 
+
 /**
  * An AVL tree implementation
  *
@@ -94,10 +95,12 @@
 	        
 	        if( c < 0 )
 	        {
+	          temp.isLeft = true;
 	          temp = temp.getLeft();  
 	        }
 	        else
 	        {
+	          temp.isLeft = false;
 	          temp = temp.getRight();
 	        }
 	    }
@@ -143,7 +146,6 @@
 	
 	private void insertInList(LinkedAvlNode<K> node, LinkedAvlNode<K> parentNode,
int pos)
 	{
-	 // add to the linked list
 
         if( pos < 0 )
         {
@@ -180,7 +182,6 @@
             parentNode.next = node;
          }
         
-        // end of adding to the linked list  
 	}
 	
 	/**
@@ -302,11 +303,6 @@
 	{
 	    LinkedAvlNode<K> parentNode = null;
 	    
-	    if(root.getHeight() <= 2)
-	    {
-	        return;
-	    }
-	    
 	    int size = treePath.size();
 	    
 	    for( LinkedAvlNode<K> node: treePath )
@@ -351,20 +347,6 @@
 	}
 	
 
-	
-	/**
-     * 
-     * Find a LinkedAvlNode with the given key value in the tree.
-     *
-     * @param key the key to find
-     * @return the list of traversed LinkedAvlNode.
-     */
-    public LinkedAvlNode<K> find( K key )
-    {
-        return find( key, root);
-    }
-    
-    
 	/**
      * Tests if the tree is logically empty.
      * 
@@ -375,6 +357,12 @@
       return root == null;   
     }
 
+    /**
+     * returns the number of nodes present in this tree.
+     * 
+     * @return the number of nodes present in this tree
+     */
+    //NOTE: This method is internally used by AVLTreeMarshaller
     public int getSize()
     {
       if( root.isLeaf() )
@@ -382,6 +370,14 @@
           return 1;
       }
       
+      LinkedAvlNode<K> x = first.next;
+      
+      while( x != null )
+      {
+        x.setIndex( x.previous.getIndex() + 1 );  
+        x = x.next;
+      }
+      
       return last.getIndex() + 1;
     }
     
@@ -554,7 +550,17 @@
         }
     }
     
-    private LinkedAvlNode<K> find( K key, LinkedAvlNode<K> startNode)
+    
+    /**
+     * 
+     * Find a LinkedAvlNode with the given key value in the tree starting from the startNode.
+     *
+     * @param key the key to find
+     * @param startNode starting node of a subtree/tree
+     * @param path the list to be filled with traversed nodes
+     * @return the list of traversed LinkedAvlNodes.
+     */
+    private List<LinkedAvlNode<K>> find( K key, LinkedAvlNode<K> startNode,
List<LinkedAvlNode<K>> path )
     {
         int c;
         
@@ -563,30 +569,39 @@
             return null;
         }
         
+        path.add( 0, startNode );
         c = comparator.compare( key, startNode.key );
         
-        if( c > 0 )
+        if( c == 0 )
         {
-            return find( key, startNode.right );
+            return path;
+        }
+        else if( c > 0 )
+        {
+            return find( key, startNode.right, path );
         }
         else if( c < 0 )
         {
-            return find( key, startNode.left );
+            return find( key, startNode.left, path );
         }
         
-        return startNode;
+        return null;
     }
+	
     
     /**
      * 
-     * Find a LinkedAvlNode with the given key value in the tree starting from the startNode.
+     * Find a LinkedAvlNode with the given key value in the tree.
      *
      * @param key the key to find
-     * @param startNode starting node of a subtree/tree
-     * @param path the list to be filled with traversed nodes
-     * @return the list of traversed LinkedAvlNodes.
+     * @return the list of traversed LinkedAvlNode.
      */
-    private List<LinkedAvlNode<K>> find( K key, LinkedAvlNode<K> startNode,
List<LinkedAvlNode<K>> path )
+    public LinkedAvlNode<K> find( K key )
+    {
+        return find( key, root);
+    }
+    
+    private LinkedAvlNode<K> find( K key, LinkedAvlNode<K> startNode)
     {
         int c;
         
@@ -595,25 +610,21 @@
             return null;
         }
         
-        path.add( 0, startNode );
         c = comparator.compare( key, startNode.key );
         
-        if( c == 0 )
-        {
-            return path;
-        }
-        else if( c > 0 )
+        if( c > 0 )
         {
-            return find( key, startNode.right, path );
+            startNode.isLeft = false;
+            return find( key, startNode.right );
         }
         else if( c < 0 )
         {
-            return find( key, startNode.left, path );
+            startNode.isLeft = true;
+            return find( key, startNode.left );
         }
         
-        return null;
+        return startNode;
     }
-	
     
     /**
      * Find the LinkedAvlNode having the max key value in the tree starting from the startNode.
@@ -634,6 +645,7 @@
 	    
 	    while( x.right != null )
 	    {
+	        x.isLeft = false;
 	        y = x;
 	        x = x.right;
 	    }
@@ -669,6 +681,7 @@
        
         while( x.left != null )
         {
+            x.isLeft = true;
             y = x;
             x = x.left;
         }
@@ -698,10 +711,7 @@
 	        return 0;
 	    }
 	    
-	    int rh = ( node.right == null ? 0 : node.right.getHeight() );
-	    int lh = ( node.left == null ? 0 : node.left.getHeight() );
-	    
-	    return ( rh - lh );
+	    return node.getBalance();
 	}
 	
     

Modified: directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMarshaller.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMarshaller.java?rev=633478&r1=633477&r2=633478&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMarshaller.java
(original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMarshaller.java
Tue Mar  4 06:09:15 2008
@@ -17,7 +17,7 @@
  *   under the License.
  *
  */
-package org.apache.directory.server.core.avltree.marshaller;
+package org.apache.directory.server.core.avltree;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

Modified: directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/main/java/org/apache/directory/server/core/avltree/LinkedAvlNode.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/main/java/org/apache/directory/server/core/avltree/LinkedAvlNode.java?rev=633478&r1=633477&r2=633478&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/main/java/org/apache/directory/server/core/avltree/LinkedAvlNode.java
(original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/main/java/org/apache/directory/server/core/avltree/LinkedAvlNode.java
Tue Mar  4 06:09:15 2008
@@ -34,7 +34,9 @@
     LinkedAvlNode<T> next;
     LinkedAvlNode<T> previous;
     
-    transient int depth;
+    transient int depth, index;
+    boolean isLeft;
+    transient int height = 1;
     
     public LinkedAvlNode( T theKey )
     {
@@ -64,7 +66,6 @@
 		return right;
 	}
 
-	
 	public T getKey() {
 		return key;
 	}
@@ -74,56 +75,81 @@
 		return ( right == null && left == null );
 	}
 	
-	
 	public int getDepth() {
 		return depth;
 	}
 
-	
 	public void setDepth( int depth ) {
 		this.depth = depth;
 	}
 
+	public int getHeight()
+    {
+	    return height;
+    }
+	
 	
-	public void setNext( LinkedAvlNode<T> next )
+   public void setNext( LinkedAvlNode<T> next )
+   {
+      this.next = next;
+   }
+
+   
+   public void setPrevious( LinkedAvlNode<T> previous )
+   {
+	  this.previous = previous;
+   }	
+   
+   
+	public int computeHeight()
+    {
+
+        if(right == null && left == null)
+        {
+            height = 1;
+            return height;
+        }
+        
+        int lh,rh;
+        
+        if( isLeft )
+        {
+            lh = ( left == null ? -1 : left.computeHeight() );
+            rh = ( right == null ? -1 : right.getHeight() );
+        }
+        else 
+        {
+            rh = ( right == null ? -1 : right.computeHeight() );
+            lh = ( left == null ? -1 : left.getHeight() );
+        }
+        
+        height = 1 + Math.max( lh, rh );
+        
+        return height;
+    }
+	
+	public int getBalance()
     {
-        this.next = next;
+	    int lh = ( left == null ? 0 : left.computeHeight() );
+        int rh = ( right == null ? 0 : right.computeHeight() );
+        
+        return ( rh - lh );
     }
 
-
-    public void setPrevious( LinkedAvlNode<T> previous )
+    public int getIndex()
     {
-        this.previous = previous;
+      return index;
     }
 
-
-    public int getHeight()
+    public void setIndex(int index)
     {
-	    if(right == null && left == null)
-	    {
-	        return 1;
-	    }
-	    
-	    int lh = ( left == null ? -1 : left.getHeight() );
-	    int rh = ( right == null ? -1 : right.getHeight() );
-	    
-        return 1 + Math.max( lh, rh );
+        this.index = index;
     }
 
-	public int getIndex()
-	{
-	    if( previous == null )
-	    {
-	        return 0;
-	    }
-	    
-	  return previous.getIndex() + 1;
-	}
 
     @Override
 	public String toString() {
 	    return "[" + key + "]";
 	}
-    
     
 }

Modified: directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/main/java/org/apache/directory/server/core/avltree/Marshaller.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/main/java/org/apache/directory/server/core/avltree/Marshaller.java?rev=633478&r1=633477&r2=633478&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/main/java/org/apache/directory/server/core/avltree/Marshaller.java
(original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/main/java/org/apache/directory/server/core/avltree/Marshaller.java
Tue Mar  4 06:09:15 2008
@@ -17,7 +17,7 @@
  *   under the License.
  *
  */
-package org.apache.directory.server.core.avltree.marshaller;
+package org.apache.directory.server.core.avltree;
 
 /**
  * 

Added: directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/test/java/org/apache/directory/server/core/avltree/AVLTreePerfTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/test/java/org/apache/directory/server/core/avltree/AVLTreePerfTest.java?rev=633478&view=auto
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/test/java/org/apache/directory/server/core/avltree/AVLTreePerfTest.java
(added)
+++ directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/test/java/org/apache/directory/server/core/avltree/AVLTreePerfTest.java
Tue Mar  4 06:09:15 2008
@@ -0,0 +1,300 @@
+/*
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you under the Apache License, Version 2.0 (the
+ *   "License"); you may not use this file except in compliance
+ *   with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.apache.directory.server.core.avltree;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * 
+ * Performance test cases for AVLTree implementation.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class AVLTreePerfTest
+{
+    AVLTree<Integer> tree;
+    
+    String tempDir = System.getProperty( "java.io.tmpdir" );
+   
+    File setSerialFile = new File( tempDir + File.separator + "hashset.ser" );
+    File treeSerialFile = new File( tempDir + File.separator + "avltree.ser" );
+    
+    Set<Integer> set;
+    
+    long start, end;
+
+    int numKeys = 100000;
+
+    Comparator<Integer> comparator = new Comparator<Integer>() 
+    {
+      public int compare( Integer i1, Integer i2 )
+      {
+          return i1.compareTo( i2 );
+      }
+    
+    };
+    
+    AvlTreeMarshaller<Integer> treeMarshaller = new AvlTreeMarshaller<Integer>(
comparator, new IntegerKeyMarshaller() );
+    
+    @Before
+    public void createTree()
+    {
+      tree = new AVLTree<Integer>( new Comparator<Integer>() 
+          {
+
+            public int compare( Integer i1, Integer i2 )
+            {
+                return i1.compareTo( i2 );
+            }
+          
+          });  
+      
+      set = new HashSet<Integer>();
+      
+      start = end = 0;
+    }
+    
+    @Test
+    public void testRBTreeInsertPerf()
+    {
+        start = System.nanoTime();
+        
+        for( int i=0; i < numKeys; i++ )
+        {
+            set.add( i );
+        }
+        
+        end = System.nanoTime();
+     
+        System.out.println( "total time for inserting " + numKeys + " items into the RBTree-->"
+  getTime( start, end ) );
+        
+    }
+
+    @Test
+    public void testRBTreeLookupPerf()
+    {
+        for( int i=0; i < numKeys; i++ )
+        {
+            set.add( i );
+        }
+        
+       start = System.nanoTime();
+       
+        set.contains( 70 );
+        set.contains( -1000 );
+        set.contains( 10 );
+        set.contains( 90 );
+        set.contains( 9999 );
+        
+       end = System.nanoTime();
+       
+       System.out.println( "total time took to read an item from set " + getTime( start,
end ) ) ;
+    }
+    
+    @Test
+    public void testRemoveFromRBTree()
+    {
+        for( int i=0; i < numKeys; i++ )
+        {
+            set.add( i );
+        }
+        
+        start = System.nanoTime();
+        
+        set.remove( 90 );
+        set.remove( 912 );
+        set.remove( -1 );
+        set.remove( 192 );
+        
+        end = System.nanoTime();
+        
+        System.out.println( "total time took to remove an item from set " + getTime( start,
end ) ) ;
+
+    }
+    
+//    Random rnd = new Random( size );
+    
+    @Test
+    public void testAvlTreeInsertPerf()
+    {
+        start = System.nanoTime();
+        
+        for( int i=0; i < numKeys; i++ )
+        {
+            tree.insert( i );
+        }
+
+        end = System.nanoTime();
+        
+        System.out.println("total time for inserting " + numKeys + " items into the AVLTree-->"
+ getTime(start, end));
+    }
+    
+    @Test
+    public void testAVLTreeLookupPerf()
+    {
+        
+        for( int i=0; i < numKeys; i++ )
+        {
+            tree.insert( i );
+        }
+        
+        start = System.nanoTime();
+        
+        tree.find( 70 );
+        tree.find( -1000 );
+        tree.find( 10 );
+        tree.find( 90 );
+        tree.find( 9999 );
+        
+        end = System.nanoTime();
+        
+        System.out.println("total time took to read an item from tree " + getTime( start,
end ) ) ;
+    }
+    
+    @Test
+    public void testAVLTreeRemovePerf()
+    {
+        for( int i=0; i < numKeys; i++ )
+        {
+            tree.insert( i );
+        }
+        
+        start = System.nanoTime();
+        
+        tree.remove( 90 );
+        tree.remove( 912 );
+        tree.remove( -1 );
+        tree.remove( 192 );
+        
+        end = System.nanoTime();
+        
+        System.out.println("total time took to remove an item from AVLTree " + getTime( start,
end ) ) ;
+
+    }
+    
+    
+    @Test
+    public void testRBTreeSerializationPerf() throws Exception
+    {
+        FileOutputStream fout = new FileOutputStream( setSerialFile );
+        ObjectOutputStream objOut = new ObjectOutputStream( fout );
+        
+        Set<Integer> set = new HashSet<Integer>();
+        
+        for( int i=0; i < numKeys; i++ )
+        {
+            set.add( i );
+        }
+        
+        long start = System.nanoTime();
+        
+        objOut.writeObject( set );
+        objOut.flush();
+        objOut.close();
+        
+        long end = System.nanoTime();
+        
+        System.out.println( "total time taken for serializing HashSet ->" + getTime( start,
end ) );
+    }
+    
+    @Test
+    public void testRBTreeDeserializationPerf() throws Exception
+    {
+     // read test
+        FileInputStream fin = new FileInputStream( setSerialFile );
+        ObjectInputStream objIn = new ObjectInputStream( fin );
+        
+        start = System.nanoTime();
+        
+        set = (HashSet) objIn.readObject();
+        
+        end = System.nanoTime();
+        
+        System.out.println("total time taken for reconstructing a serialized HashSet ->"
+ getTime( start, end ) );
+    }
+    
+    @Test
+    public void testAVLTreeSerializationPerf() throws Exception
+    {
+      
+      for( int i=0; i < numKeys; i++ )
+      {
+          tree.insert( i );
+      }
+      
+      FileOutputStream fout = new FileOutputStream( treeSerialFile );
+    
+      start = System.nanoTime();
+      
+      fout.write( treeMarshaller.marshal( tree ) );
+      fout.flush();
+      fout.close();
+      
+      end = System.nanoTime();
+      
+      System.out.println( "total time taken for serializing AVLTree ->" + getTime( start,
end ) );
+    }
+
+    
+    @Test
+    public void testAVLTreeDeserializationPerf() throws Exception
+    {
+        FileInputStream fin = new FileInputStream( treeSerialFile );
+
+        byte data[] = new byte[ ( int ) treeSerialFile.length() ];
+        
+        start = System.nanoTime();
+        
+        fin.read(data);
+        tree = (AVLTree<Integer>) treeMarshaller.unMarshal( data );
+        
+        end = System.nanoTime();
+        System.out.println("total time taken for reconstructing a serialized AVLTree ->"
+ getTime( start, end ) );
+    }
+    
+    
+    /**
+     * calculates the total time taken in milli seconds by taking the start and end time
in nano seconds. 
+     */
+    private String getTime(long nanoStartTime, long nanoEndTime)
+    {
+        long temp = nanoEndTime - nanoStartTime;
+        
+        if( temp == 0)
+        {
+            return "0 msec";
+        }
+        
+       double d = temp / (1000 * 1000);
+        
+       return String.valueOf( d ) + " msec";
+    }
+}

Modified: directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/test/java/org/apache/directory/server/core/avltree/AVLTreeTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/test/java/org/apache/directory/server/core/avltree/AVLTreeTest.java?rev=633478&r1=633477&r2=633478&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/test/java/org/apache/directory/server/core/avltree/AVLTreeTest.java
(original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/test/java/org/apache/directory/server/core/avltree/AVLTreeTest.java
Tue Mar  4 06:09:15 2008
@@ -76,10 +76,9 @@
     {
         tree.insert( 3 );
         assertFalse( tree.isEmpty() );
-        assertTrue( 1 == tree.getSize() );
         
         tree.insert( 3 );// should be ignored
-        assertTrue( 1 == tree.getRoot().getHeight() );
+        assertTrue( 1 == tree.getSize() );
 
         assertNotNull( tree.getFirst() );
         assertNull( tree.getLast() );
@@ -90,7 +89,6 @@
         tree.insert( 37 );
         tree.insert( 70 );
         tree.insert( 12 );
-        
         assertTrue( 3 == tree.getSize() );
         
         tree.insert( 90 );
@@ -198,12 +196,13 @@
 
         tree.remove( 26 ); // remove a non-root non-leaf node in the left sub tree of root
         assertEquals( "21,27,37,38,39,43", getInorderForm() );
-        
+
         tree.remove( 43 );
         assertEquals( "21,27,37,38,39", getInorderForm() );
-        
+
         tree.remove( 39 );
         assertEquals( "21,27,37,38", getInorderForm() );
+        
         assertTrue( 37 == tree.getRoot().key ); // check the root value
         
         tree.remove( 38 ); // a double right rotation has to happen after this
@@ -238,7 +237,6 @@
         assertEquals( "[2]-->[4]-->NULL", getLinkedText());
     }
     
-    
     @Test
     public void testFind()
     {
@@ -255,7 +253,6 @@
         tree.setRoot( null );
         assertNull( tree.find( 3 ));
     }
-    
     
     @Test
     public void testFindMaxMin()

Modified: directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMarshallerTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMarshallerTest.java?rev=633478&r1=633477&r2=633478&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMarshallerTest.java
(original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMarshallerTest.java
Tue Mar  4 06:09:15 2008
@@ -17,7 +17,7 @@
  *   under the License.
  *
  */
-package org.apache.directory.server.core.avltree.marshaller;
+package org.apache.directory.server.core.avltree;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;

Modified: directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/test/java/org/apache/directory/server/core/avltree/IntegerKeyMarshaller.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/test/java/org/apache/directory/server/core/avltree/IntegerKeyMarshaller.java?rev=633478&r1=633477&r2=633478&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/test/java/org/apache/directory/server/core/avltree/IntegerKeyMarshaller.java
(original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/test/java/org/apache/directory/server/core/avltree/IntegerKeyMarshaller.java
Tue Mar  4 06:09:15 2008
@@ -1,5 +1,5 @@
 
-package org.apache.directory.server.core.avltree.marshaller;
+package org.apache.directory.server.core.avltree;
 
 public class IntegerKeyMarshaller implements Marshaller<Integer>
 {



Mime
View raw message