directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1156696 - in /directory/apacheds/trunk: jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ protocol-ldap/src/mai...
Date Thu, 11 Aug 2011 17:31:48 GMT
Author: elecharny
Date: Thu Aug 11 17:31:47 2011
New Revision: 1156696

URL: http://svn.apache.org/viewvc?rev=1156696&view=rev
Log:
o Renamed the ServerEntrySerializer class to EntrySerializer

Added:
    directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/EntrySerializer.java
      - copied, changed from r1155269, directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java
Removed:
    directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java
Modified:
    directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ModificationSerializer.java

Copied: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/EntrySerializer.java
(from r1155269, directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/EntrySerializer.java?p2=directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/EntrySerializer.java&p1=directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java&r1=1155269&r2=1156696&rev=1156696&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java
(original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/EntrySerializer.java
Thu Aug 11 17:31:47 2011
@@ -50,13 +50,13 @@ import org.slf4j.LoggerFactory;
  *  
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class ServerEntrySerializer implements Serializer
+public class EntrySerializer implements Serializer
 {
     /** The serialVersionUID */
     private static final long serialVersionUID = 1L;
 
     /** the logger for this class */
-    private static final Logger LOG = LoggerFactory.getLogger( ServerEntrySerializer.class
);
+    private static final Logger LOG = LoggerFactory.getLogger( EntrySerializer.class );
 
     /**
      * Speedup for logs
@@ -72,7 +72,7 @@ public class ServerEntrySerializer imple
      *
      * @param schemaManager The reference to the global schemaManager
      */
-    public ServerEntrySerializer( SchemaManager schemaManager )
+    public EntrySerializer( SchemaManager schemaManager )
     {
         this.schemaManager = schemaManager;
     }

Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java?rev=1156696&r1=1156695&r2=1156696&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java
(original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java
Thu Aug 11 17:31:47 2011
@@ -116,7 +116,7 @@ public class JdbmMasterTable<E> extends 
      */
     public JdbmMasterTable( RecordManager recMan, SchemaManager schemaManager ) throws Exception
     {
-        super( schemaManager, DBF, recMan, LONG_COMPARATOR, LongSerializer.INSTANCE, new
ServerEntrySerializer( schemaManager ) );
+        super( schemaManager, DBF, recMan, LONG_COMPARATOR, LongSerializer.INSTANCE, new
EntrySerializer( schemaManager ) );
         adminTbl = new JdbmTable<String,String>( schemaManager, "admin", recMan, STRING_COMPARATOR,
null, null );
         String seqValue = adminTbl.get( SEQPROP_KEY );
 

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java?rev=1156696&r1=1156695&r2=1156696&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java
(original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java
Thu Aug 11 17:31:47 2011
@@ -131,7 +131,7 @@ public class ServerEntrySerializerTest
     {
         Entry entry = new DefaultEntry( schemaManager );
 
-        ServerEntrySerializer ses = new ServerEntrySerializer( schemaManager );
+        EntrySerializer ses = new EntrySerializer( schemaManager );
 
         byte[] data = ses.serialize( entry );
 
@@ -146,7 +146,7 @@ public class ServerEntrySerializerTest
     {
         Entry entry = new DefaultEntry( schemaManager );
 
-        ServerEntrySerializer ses = new ServerEntrySerializer( schemaManager );
+        EntrySerializer ses = new EntrySerializer( schemaManager );
 
         byte[] data = ses.serialize( entry );
 
@@ -162,7 +162,7 @@ public class ServerEntrySerializerTest
         Entry entry = new DefaultEntry( schemaManager );
         entry.add( "objectClass", "top", "person", "inetOrgPerson", "organizationalPerson"
);
 
-        ServerEntrySerializer ses = new ServerEntrySerializer( schemaManager );
+        EntrySerializer ses = new EntrySerializer( schemaManager );
 
         byte[] data = ses.serialize( entry );
 
@@ -181,7 +181,7 @@ public class ServerEntrySerializerTest
         entry.add( "SN", "Test" );
         entry.add( "userPassword", Strings.getBytesUtf8("password") );
 
-        ServerEntrySerializer ses = new ServerEntrySerializer( schemaManager );
+        EntrySerializer ses = new EntrySerializer( schemaManager );
 
         byte[] data = ses.serialize( entry );
 
@@ -200,7 +200,7 @@ public class ServerEntrySerializerTest
         entry.add( "SN", "Test" );
         entry.add( "userPassword", Strings.getBytesUtf8("password") );
 
-        ServerEntrySerializer ses = new ServerEntrySerializer( schemaManager );
+        EntrySerializer ses = new EntrySerializer( schemaManager );
 
         byte[] data = ses.serialize( entry );
 
@@ -215,7 +215,7 @@ public class ServerEntrySerializerTest
     {
         Entry entry = new DefaultEntry( schemaManager );
 
-        ServerEntrySerializer ses = new ServerEntrySerializer( schemaManager );
+        EntrySerializer ses = new EntrySerializer( schemaManager );
 
         byte[] data = ses.serialize( entry );
 
@@ -230,7 +230,7 @@ public class ServerEntrySerializerTest
     {
         Entry entry = new DefaultEntry( schemaManager );
 
-        ServerEntrySerializer ses = new ServerEntrySerializer( schemaManager );
+        EntrySerializer ses = new EntrySerializer( schemaManager );
         Attribute oc = new DefaultAttribute( "ObjectClass", schemaManager
             .lookupAttributeTypeRegistry( "objectclass" ) );
         entry.add( oc );
@@ -248,7 +248,7 @@ public class ServerEntrySerializerTest
     {
         Entry entry = new DefaultEntry( schemaManager );
 
-        ServerEntrySerializer ses = new ServerEntrySerializer( schemaManager );
+        EntrySerializer ses = new EntrySerializer( schemaManager );
         entry.add( "ObjectClass", "top", "person" );
 
         byte[] data = ses.serialize( entry );
@@ -264,7 +264,7 @@ public class ServerEntrySerializerTest
     {
         Entry entry = new DefaultEntry( schemaManager );
 
-        ServerEntrySerializer ses = new ServerEntrySerializer( schemaManager );
+        EntrySerializer ses = new EntrySerializer( schemaManager );
         entry.add( "userPassword", Strings.getBytesUtf8("secret") );
 
         byte[] data = ses.serialize( entry );

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ModificationSerializer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ModificationSerializer.java?rev=1156696&r1=1156695&r2=1156696&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ModificationSerializer.java
(original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ModificationSerializer.java
Thu Aug 11 17:31:47 2011
@@ -28,7 +28,7 @@ import java.io.ObjectOutputStream;
 import jdbm.helper.Serializer;
 
 import org.apache.directory.server.core.event.EventType;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.ServerEntrySerializer;
+import org.apache.directory.server.core.partition.impl.btree.jdbm.EntrySerializer;
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 
@@ -49,7 +49,7 @@ public class ModificationSerializer impl
     private static final long serialVersionUID = 1L;
 
     /** The internal entry serializer */
-    private transient ServerEntrySerializer entrySerializer;
+    private transient EntrySerializer entrySerializer;
 
     /**
      * Creates a new instance of ServerEntrySerializer.
@@ -58,7 +58,7 @@ public class ModificationSerializer impl
      */
     public ModificationSerializer( SchemaManager schemaManager )
     {
-        entrySerializer = new ServerEntrySerializer( schemaManager );
+        entrySerializer = new EntrySerializer( schemaManager );
     }
 
 



Mime
View raw message