directory-commits mailing list archives

Site index · List index

Message view	« Date » · « Thread »
Top	« Date » · « Thread »
From	elecha...@apache.org
Subject	svn commit: r764131 [5/16] - in /directory: apacheds/trunk/ apacheds/trunk/core-avl/ apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/ apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/ apached...
Date	Sat, 11 Apr 2009 01:03:25 GMT
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java (original) +++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java Sat Apr 11 01:03:00 2009 @@ -63,7 +63,7 @@ import org.apache.directory.server.xdbm.Index; import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms; import org.apache.directory.shared.ldap.message.BindRequestImpl; -import org.apache.directory.shared.ldap.message.BindResponse; +import org.apache.directory.shared.ldap.message.InternalBindResponse; import org.apache.directory.shared.ldap.message.MessageDecoder; import org.apache.directory.shared.ldap.message.MessageEncoder; import org.apache.directory.shared.ldap.message.ResultCodeEnum; @@ -515,13 +515,13 @@ public void testNtlmBind() throws Exception { NtlmSaslBindClient client = new NtlmSaslBindClient( SupportedSaslMechanisms.NTLM ); - BindResponse type2response = client.bindType1( "type1_test".getBytes() ); + InternalBindResponse type2response = client.bindType1( "type1_test".getBytes() ); assertEquals( 1, type2response.getMessageId() ); assertEquals( ResultCodeEnum.SASL_BIND_IN_PROGRESS, type2response.getLdapResult().getResultCode() ); assertTrue( ArrayUtils.isEquals( "type1_test".getBytes(), provider.getType1Response() ) ); assertTrue( ArrayUtils.isEquals( "challenge".getBytes(), type2response.getServerSaslCreds() ) ); - BindResponse finalResponse = client.bindType3( "type3_test".getBytes() ); + InternalBindResponse finalResponse = client.bindType3( "type3_test".getBytes() ); assertEquals( 2, finalResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, finalResponse.getLdapResult().getResultCode() ); assertTrue( ArrayUtils.isEquals( "type3_test".getBytes(), provider.getType3Response() ) ); @@ -535,13 +535,13 @@ public void testGssSpnegoBind() throws Exception { NtlmSaslBindClient client = new NtlmSaslBindClient( SupportedSaslMechanisms.GSS_SPNEGO ); - BindResponse type2response = client.bindType1( "type1_test".getBytes() ); + InternalBindResponse type2response = client.bindType1( "type1_test".getBytes() ); assertEquals( 1, type2response.getMessageId() ); assertEquals( ResultCodeEnum.SASL_BIND_IN_PROGRESS, type2response.getLdapResult().getResultCode() ); assertTrue( ArrayUtils.isEquals( "type1_test".getBytes(), provider.getType1Response() ) ); assertTrue( ArrayUtils.isEquals( "challenge".getBytes(), type2response.getServerSaslCreds() ) ); - BindResponse finalResponse = client.bindType3( "type3_test".getBytes() ); + InternalBindResponse finalResponse = client.bindType3( "type3_test".getBytes() ); assertEquals( 2, finalResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, finalResponse.getLdapResult().getResultCode() ); assertTrue( ArrayUtils.isEquals( "type3_test".getBytes(), provider.getType3Response() ) ); @@ -610,7 +610,7 @@ } - BindResponse bindType1( byte[] type1response ) throws Exception + InternalBindResponse bindType1( byte[] type1response ) throws Exception { if ( ! isConnected() ) { @@ -644,11 +644,11 @@ } // Retrieve the response back from server to my last request. - return ( BindResponse ) decoder.decode( null, _input_ ); + return ( InternalBindResponse ) decoder.decode( null, _input_ ); } - BindResponse bindType3( byte[] type3response ) throws Exception + InternalBindResponse bindType3( byte[] type3response ) throws Exception { if ( ! isConnected() ) { @@ -683,7 +683,7 @@ } // Retrieve the response back from server to my last request. - return ( BindResponse ) decoder.decode( null, _input_ ); + return ( InternalBindResponse ) decoder.decode( null, _input_ ); } } } Modified: directory/apacheds/trunk/server-tools/pom.xml URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/pom.xml?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/server-tools/pom.xml (original) +++ directory/apacheds/trunk/server-tools/pom.xml Sat Apr 11 01:03:00 2009 @@ -95,6 +95,11 @@ <artifactId>commons-lang</artifactId> </dependency> + <dependency> + <groupId>org.apache.directory.shared</groupId> + <version>${org.apache.directory.shared.version}</version> + <artifactId>shared-cursor</artifactId> + </dependency> </dependencies> <build> Modified: directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java (original) +++ directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java Sat Apr 11 01:03:00 2009 @@ -43,7 +43,6 @@ import org.apache.directory.server.constants.ServerDNConstants; import org.apache.directory.server.core.DefaultDirectoryService; import org.apache.directory.server.core.DirectoryService; -import org.apache.directory.server.core.cursor.Cursor; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmMasterTable; @@ -65,6 +64,7 @@ import org.apache.directory.server.xdbm.Index; import org.apache.directory.server.xdbm.Tuple; import org.apache.directory.shared.ldap.MultiException; +import org.apache.directory.shared.ldap.cursor.Cursor; import org.apache.directory.shared.ldap.exception.LdapConfigurationException; import org.apache.directory.shared.ldap.exception.LdapNamingException; import org.apache.directory.shared.ldap.ldif.LdifUtils; Modified: directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java (original) +++ directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java Sat Apr 11 01:03:00 2009 @@ -41,19 +41,19 @@ import org.apache.directory.shared.asn1.codec.DecoderException; import org.apache.directory.shared.asn1.codec.EncoderException; import org.apache.directory.shared.ldap.codec.LdapDecoder; -import org.apache.directory.shared.ldap.codec.LdapMessage; +import org.apache.directory.shared.ldap.codec.LdapMessageCodec; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; -import org.apache.directory.shared.ldap.codec.LdapResult; -import org.apache.directory.shared.ldap.codec.add.AddRequest; -import org.apache.directory.shared.ldap.codec.bind.BindRequest; -import org.apache.directory.shared.ldap.codec.bind.BindResponse; +import org.apache.directory.shared.ldap.codec.LdapResultCodec; +import org.apache.directory.shared.ldap.codec.add.AddRequestCodec; +import org.apache.directory.shared.ldap.codec.bind.BindRequestCodec; +import org.apache.directory.shared.ldap.codec.bind.BindResponseCodec; import org.apache.directory.shared.ldap.codec.bind.LdapAuthentication; import org.apache.directory.shared.ldap.codec.bind.SimpleAuthentication; -import org.apache.directory.shared.ldap.codec.del.DelRequest; -import org.apache.directory.shared.ldap.codec.extended.ExtendedResponse; -import org.apache.directory.shared.ldap.codec.modify.ModifyRequest; -import org.apache.directory.shared.ldap.codec.modifyDn.ModifyDNRequest; -import org.apache.directory.shared.ldap.codec.unbind.UnBindRequest; +import org.apache.directory.shared.ldap.codec.del.DelRequestCodec; +import org.apache.directory.shared.ldap.codec.extended.ExtendedResponseCodec; +import org.apache.directory.shared.ldap.codec.modify.ModifyRequestCodec; +import org.apache.directory.shared.ldap.codec.modifyDn.ModifyDNRequestCodec; +import org.apache.directory.shared.ldap.codec.unbind.UnBindRequestCodec; import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.Modification; @@ -145,10 +145,10 @@ } - private LdapMessage readResponse( ByteBuffer bb ) throws IOException, DecoderException, NamingException + private LdapMessageCodec readResponse( ByteBuffer bb ) throws IOException, DecoderException, NamingException { - LdapMessage messageResp = null; + LdapMessageCodec messageResp = null; while ( true ) { @@ -169,9 +169,9 @@ { messageResp = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage(); - if ( messageResp instanceof BindResponse ) + if ( messageResp instanceof BindResponseCodec ) { - BindResponse resp = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage() + BindResponseCodec resp = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage() .getBindResponse(); if ( resp.getLdapResult().getResultCode() != ResultCodeEnum.SUCCESS ) @@ -179,9 +179,9 @@ System.out.println( "Error : " + resp.getLdapResult().getErrorMessage() ); } } - else if ( messageResp instanceof ExtendedResponse ) + else if ( messageResp instanceof ExtendedResponseCodec ) { - ExtendedResponse resp = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage() + ExtendedResponseCodec resp = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage() .getExtendedResponse(); if ( resp.getLdapResult().getResultCode() != ResultCodeEnum.SUCCESS ) @@ -217,7 +217,7 @@ private int addEntry( LdifEntry ldifEntry, int messageId ) throws IOException, DecoderException, InvalidNameException, NamingException, EncoderException { - AddRequest addRequest = new AddRequest(); + AddRequestCodec addRequest = new AddRequestCodec(); String dn = ldifEntry.getDn().getUpName(); @@ -241,7 +241,7 @@ } } - LdapMessage message = new LdapMessage(); + LdapMessageCodec message = new LdapMessageCodec(); message.setProtocolOP( addRequest ); message.setMessageId( messageId ); @@ -255,9 +255,9 @@ bb.clear(); // Get the response - LdapMessage response = readResponse( bb ); + LdapMessageCodec response = readResponse( bb ); - LdapResult result = response.getAddResponse().getLdapResult(); + LdapResultCodec result = response.getAddResponse().getLdapResult(); if ( result.getResultCode() == ResultCodeEnum.SUCCESS ) { @@ -290,7 +290,7 @@ private int deleteEntry( LdifEntry entry, int messageId ) throws IOException, DecoderException, InvalidNameException, NamingException, EncoderException { - DelRequest delRequest = new DelRequest(); + DelRequestCodec delRequest = new DelRequestCodec(); String dn = entry.getDn().getUpName(); @@ -301,7 +301,7 @@ delRequest.setEntry( new LdapDN( dn ) ); - LdapMessage message = new LdapMessage(); + LdapMessageCodec message = new LdapMessageCodec(); message.setProtocolOP( delRequest ); message.setMessageId( messageId ); @@ -315,9 +315,9 @@ bb.clear(); // Get the response - LdapMessage response = readResponse( bb ); + LdapMessageCodec response = readResponse( bb ); - LdapResult result = response.getDelResponse().getLdapResult(); + LdapResultCodec result = response.getDelResponse().getLdapResult(); if ( result.getResultCode() == ResultCodeEnum.SUCCESS ) { @@ -349,7 +349,7 @@ private int changeModRDNEntry( LdifEntry entry, int messageId ) throws IOException, DecoderException, InvalidNameException, NamingException, EncoderException { - ModifyDNRequest modifyDNRequest = new ModifyDNRequest(); + ModifyDNRequestCodec modifyDNRequest = new ModifyDNRequestCodec(); String dn = entry.getDn().getUpName(); @@ -367,7 +367,7 @@ modifyDNRequest.setNewSuperior( new LdapDN( entry.getNewSuperior() ) ); } - LdapMessage message = new LdapMessage(); + LdapMessageCodec message = new LdapMessageCodec(); message.setProtocolOP( modifyDNRequest ); message.setMessageId( messageId ); @@ -381,9 +381,9 @@ bb.clear(); // Get the response - LdapMessage response = readResponse( bb ); + LdapMessageCodec response = readResponse( bb ); - LdapResult result = response.getModifyDNResponse().getLdapResult(); + LdapResultCodec result = response.getModifyDNResponse().getLdapResult(); if ( result.getResultCode() == ResultCodeEnum.SUCCESS ) { @@ -413,7 +413,7 @@ private int changeModifyEntry( LdifEntry entry, int messageId ) throws IOException, DecoderException, InvalidNameException, NamingException, EncoderException { - ModifyRequest modifyRequest = new ModifyRequest(); + ModifyRequestCodec modifyRequest = new ModifyRequestCodec(); String dn = entry.getDn().getUpName(); @@ -436,7 +436,7 @@ } } - LdapMessage message = new LdapMessage(); + LdapMessageCodec message = new LdapMessageCodec(); message.setProtocolOP( modifyRequest ); message.setMessageId( messageId ); @@ -450,9 +450,9 @@ bb.clear(); // Get the response - LdapMessage response = readResponse( bb ); + LdapMessageCodec response = readResponse( bb ); - LdapResult result = response.getModifyResponse().getLdapResult(); + LdapResultCodec result = response.getModifyResponse().getLdapResult(); if ( result.getResultCode() == ResultCodeEnum.SUCCESS ) { @@ -513,8 +513,8 @@ / private void bind( int messageId ) throws NamingException, EncoderException, DecoderException, IOException { - BindRequest bindRequest = new BindRequest(); - LdapMessage message = new LdapMessage(); + BindRequestCodec bindRequest = new BindRequestCodec(); + LdapMessageCodec message = new LdapMessageCodec(); LdapAuthentication authentication = null; if ( "simple".equals( auth ) ) @@ -540,9 +540,9 @@ bb.clear(); // Get the bind response - LdapMessage response = readResponse( bb ); + LdapMessageCodec response = readResponse( bb ); - LdapResult result = response.getBindResponse().getLdapResult(); + LdapResultCodec result = response.getBindResponse().getLdapResult(); if ( result.getResultCode() == ResultCodeEnum.SUCCESS ) { @@ -572,8 +572,8 @@ / private void unbind( int messageId ) throws InvalidNameException, EncoderException, DecoderException, IOException { - UnBindRequest unbindRequest = new UnBindRequest(); - LdapMessage message = new LdapMessage(); + UnBindRequestCodec unbindRequest = new UnBindRequestCodec(); + LdapMessageCodec message = new LdapMessageCodec(); message.setProtocolOP( unbindRequest ); message.setMessageId( messageId ); Modified: directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java (original) +++ directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java Sat Apr 11 01:03:00 2009 @@ -39,7 +39,6 @@ import org.apache.directory.server.constants.ServerDNConstants; import org.apache.directory.server.core.DefaultDirectoryService; import org.apache.directory.server.core.DirectoryService; -import org.apache.directory.server.core.cursor.Cursor; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmMasterTable; @@ -60,6 +59,7 @@ import org.apache.directory.server.xdbm.Index; import org.apache.directory.server.xdbm.Tuple; import org.apache.directory.shared.ldap.MultiException; +import org.apache.directory.shared.ldap.cursor.Cursor; import org.apache.directory.shared.ldap.exception.LdapConfigurationException; import org.apache.directory.shared.ldap.exception.LdapNamingException; import org.apache.directory.shared.ldap.message.ResultCodeEnum; @@ -212,6 +212,7 @@ index.init( attributeType, partitionDirectory ); Cursor<Tuple<Long,ServerEntry>> list = master.cursor(); + while ( list.next() ) { Tuple<Long,ServerEntry> tuple = list.get(); Modified: directory/apacheds/trunk/server-xml/src/test/java/org/apache/directory/server/SpringServerTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-xml/src/test/java/org/apache/directory/server/SpringServerTest.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/server-xml/src/test/java/org/apache/directory/server/SpringServerTest.java (original) +++ directory/apacheds/trunk/server-xml/src/test/java/org/apache/directory/server/SpringServerTest.java Sat Apr 11 01:03:00 2009 @@ -18,15 +18,13 @@ / package org.apache.directory.server; -import org.apache.directory.mitosis.common.Replica; -import org.apache.directory.mitosis.configuration.ReplicationConfiguration; -import org.apache.directory.mitosis.service.ReplicationInterceptor; import org.apache.directory.server.configuration.ApacheDS; import org.apache.directory.server.core.authn.AuthenticationInterceptor; import org.apache.directory.server.core.authn.Authenticator; import org.apache.directory.server.core.authn.SimpleAuthenticator; import org.apache.directory.server.core.authn.StrongAuthenticator; import org.apache.directory.server.core.interceptor.Interceptor; +import org.apache.directory.server.ldap.replication.SyncreplConfiguration; import org.apache.xbean.spring.context.FileSystemXmlApplicationContext; import org.junit.Test; import org.springframework.context.ApplicationContext; @@ -115,7 +113,7 @@ /* * Test a server.xml with replicationInterceptor validated - / + @Test public void testSpringServerReplicationInterceptor() throws Exception { ClassLoader classLoader = this.getClass().getClassLoader(); @@ -142,7 +140,7 @@ assertNotNull( replicationInterceptor ); assertNotNull( replicationInterceptor.getConfiguration() ); - ReplicationConfiguration config = replicationInterceptor.getConfiguration(); + SyncreplConfiguration config = replicationInterceptor.getConfiguration(); assertEquals( 5, config.getLogMaxAge() ); assertEquals( "instance_a", config.getReplicaId() ); assertEquals( 2, config.getReplicationInterval() ); Propchange: directory/apacheds/trunk/syncrepl/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Apr 11 01:03:00 2009 @@ -0,0 +1,4 @@ +target +.classpath +.project +.settings Modified: directory/apacheds/trunk/xbean-spring/pom.xml URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xbean-spring/pom.xml?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xbean-spring/pom.xml (original) +++ directory/apacheds/trunk/xbean-spring/pom.xml Sat Apr 11 01:03:00 2009 @@ -137,13 +137,13 @@ </dependency> <!-- replication interceptor xbean config metadata --> - <dependency> + <!--dependency> <groupId>org.apache.directory.server</groupId> - <artifactId>mitosis</artifactId> + <artifactId>syncrepl</artifactId> <version>${pom.version}</version> <classifier>sources</classifier> <scope>provided</scope> - </dependency> + </dependency--> </dependencies> Modified: directory/apacheds/trunk/xdbm-base/pom.xml URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/pom.xml?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-base/pom.xml (original) +++ directory/apacheds/trunk/xdbm-base/pom.xml Sat Apr 11 01:03:00 2009 @@ -41,9 +41,9 @@ <version>${pom.version}</version> </dependency> <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>apacheds-core-cursor</artifactId> - <version>${pom.version}</version> + <groupId>org.apache.directory.shared</groupId> + <version>${org.apache.directory.shared.version}</version> + <artifactId>shared-cursor</artifactId> </dependency> <dependency> <groupId>${pom.groupId}</groupId> Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java (original) +++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java Sat Apr 11 01:03:00 2009 @@ -20,13 +20,19 @@ package org.apache.directory.server.core.partition.impl.btree; -import org.apache.directory.server.xdbm.; -import org.apache.directory.server.core.cursor.ClosureMonitor; -import org.apache.directory.server.core.cursor.Cursor; -import org.apache.directory.server.core.cursor.CursorIterator; import java.util.Iterator; +import org.apache.directory.server.xdbm.ForwardIndexEntry; +import org.apache.directory.server.xdbm.IndexCursor; +import org.apache.directory.server.xdbm.IndexEntry; +import org.apache.directory.server.xdbm.ReverseIndexEntry; +import org.apache.directory.server.xdbm.Tuple; +import org.apache.directory.server.xdbm.TupleCursor; +import org.apache.directory.shared.ldap.cursor.ClosureMonitor; +import org.apache.directory.shared.ldap.cursor.Cursor; +import org.apache.directory.shared.ldap.cursor.CursorIterator; + /* * A Cursor which adapts an underlying Tuple based Cursor to one which returns Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java (original) +++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java Sat Apr 11 01:03:00 2009 @@ -19,10 +19,10 @@ package org.apache.directory.server.core.partition.impl.btree; -import org.apache.directory.server.core.cursor.InvalidCursorPositionException; -import org.apache.directory.server.core.cursor.AbstractCursor; import org.apache.directory.server.xdbm.Tuple; import org.apache.directory.shared.ldap.NotImplementedException; +import org.apache.directory.shared.ldap.cursor.AbstractCursor; +import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException; import java.util.Arrays; import java.util.List; Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java (original) +++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java Sat Apr 11 01:03:00 2009 @@ -20,12 +20,12 @@ package org.apache.directory.server.xdbm; -import org.apache.directory.server.core.cursor.ClosureMonitor; -import org.apache.directory.server.core.cursor.CursorIterator; -import org.apache.directory.server.core.cursor.DefaultClosureMonitor; - import java.util.Iterator; +import org.apache.directory.shared.ldap.cursor.ClosureMonitor; +import org.apache.directory.shared.ldap.cursor.CursorIterator; +import org.apache.directory.shared.ldap.cursor.DefaultClosureMonitor; + /** * An abstract TupleCursor. Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractTupleCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractTupleCursor.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractTupleCursor.java (original) +++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractTupleCursor.java Sat Apr 11 01:03:00 2009 @@ -20,12 +20,12 @@ package org.apache.directory.server.xdbm; -import org.apache.directory.server.core.cursor.ClosureMonitor; -import org.apache.directory.server.core.cursor.CursorIterator; -import org.apache.directory.server.core.cursor.DefaultClosureMonitor; - import java.util.Iterator; +import org.apache.directory.shared.ldap.cursor.ClosureMonitor; +import org.apache.directory.shared.ldap.cursor.CursorIterator; +import org.apache.directory.shared.ldap.cursor.DefaultClosureMonitor; + /** * An abstract TupleCursor. Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java (original) +++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java Sat Apr 11 01:03:00 2009 @@ -18,8 +18,8 @@ / package org.apache.directory.server.xdbm; +import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException; -import org.apache.directory.server.core.cursor.InvalidCursorPositionException; /* Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Index.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Index.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Index.java (original) +++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Index.java Sat Apr 11 01:03:00 2009 @@ -22,8 +22,8 @@ import java.io.File; +import org.apache.directory.shared.ldap.cursor.Cursor; import org.apache.directory.shared.ldap.schema.AttributeType; -import org.apache.directory.server.core.cursor.Cursor; /** Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexCursor.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexCursor.java (original) +++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexCursor.java Sat Apr 11 01:03:00 2009 @@ -19,8 +19,9 @@ / package org.apache.directory.server.xdbm; +import org.apache.directory.shared.ldap.cursor.Cursor; + -import org.apache.directory.server.core.cursor.Cursor; /* Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java (original) +++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java Sat Apr 11 01:03:00 2009 @@ -18,8 +18,9 @@ / package org.apache.directory.server.xdbm; +import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException; + -import org.apache.directory.server.core.cursor.InvalidCursorPositionException; /* Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Table.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Table.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Table.java (original) +++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Table.java Sat Apr 11 01:03:00 2009 @@ -20,10 +20,11 @@ package org.apache.directory.server.xdbm; -import org.apache.directory.server.core.cursor.Cursor; import java.util.Comparator; +import org.apache.directory.shared.ldap.cursor.Cursor; + /** * A wrapper interface around BTree implementations used to abstract away Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/TupleCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/TupleCursor.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/TupleCursor.java (original) +++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/TupleCursor.java Sat Apr 11 01:03:00 2009 @@ -19,8 +19,9 @@ / package org.apache.directory.server.xdbm; +import org.apache.directory.shared.ldap.cursor.Cursor; + -import org.apache.directory.server.core.cursor.Cursor; /* Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java (original) +++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java Sat Apr 11 01:03:00 2009 @@ -24,8 +24,8 @@ import org.apache.directory.server.xdbm.AbstractIndexCursor; import org.apache.directory.server.xdbm.IndexCursor; import org.apache.directory.server.xdbm.search.Evaluator; -import org.apache.directory.server.core.cursor.InvalidCursorPositionException; import org.apache.directory.server.core.entry.ServerEntry; +import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException; import org.apache.directory.shared.ldap.filter.ExprNode; import java.util.; Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java (original) +++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java Sat Apr 11 01:03:00 2009 @@ -25,8 +25,8 @@ import org.apache.directory.server.xdbm.Store; import org.apache.directory.server.xdbm.AbstractIndexCursor; import org.apache.directory.server.xdbm.IndexCursor; -import org.apache.directory.server.core.cursor.InvalidCursorPositionException; import org.apache.directory.server.core.entry.ServerEntry; +import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException; import org.apache.directory.shared.ldap.entry.Value; Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java (original) +++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java Sat Apr 11 01:03:00 2009 @@ -25,8 +25,8 @@ import org.apache.directory.server.xdbm.Store; import org.apache.directory.server.xdbm.AbstractIndexCursor; import org.apache.directory.server.xdbm.IndexCursor; -import org.apache.directory.server.core.cursor.InvalidCursorPositionException; import org.apache.directory.server.core.entry.ServerEntry; +import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException; import org.apache.directory.shared.ldap.entry.Value; Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java (original) +++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java Sat Apr 11 01:03:00 2009 @@ -20,9 +20,14 @@ package org.apache.directory.server.xdbm.search.impl; -import org.apache.directory.server.xdbm.; -import org.apache.directory.server.core.cursor.InvalidCursorPositionException; import org.apache.directory.server.core.entry.ServerEntry; +import org.apache.directory.server.xdbm.AbstractIndexCursor; +import org.apache.directory.server.xdbm.ForwardIndexEntry; +import org.apache.directory.server.xdbm.Index; +import org.apache.directory.server.xdbm.IndexCursor; +import org.apache.directory.server.xdbm.IndexEntry; +import org.apache.directory.server.xdbm.Store; +import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException; /** Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java (original) +++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java Sat Apr 11 01:03:00 2009 @@ -20,9 +20,14 @@ package org.apache.directory.server.xdbm.search.impl; -import org.apache.directory.server.xdbm.; -import org.apache.directory.server.core.cursor.InvalidCursorPositionException; import org.apache.directory.server.core.entry.ServerEntry; +import org.apache.directory.server.xdbm.AbstractIndexCursor; +import org.apache.directory.server.xdbm.ForwardIndexEntry; +import org.apache.directory.server.xdbm.Index; +import org.apache.directory.server.xdbm.IndexCursor; +import org.apache.directory.server.xdbm.IndexEntry; +import org.apache.directory.server.xdbm.Store; +import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException; /* Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java (original) +++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java Sat Apr 11 01:03:00 2009 @@ -25,8 +25,8 @@ import org.apache.directory.server.xdbm.AbstractIndexCursor; import org.apache.directory.server.xdbm.IndexCursor; import org.apache.directory.server.xdbm.search.Evaluator; -import org.apache.directory.server.core.cursor.InvalidCursorPositionException; import org.apache.directory.server.core.entry.ServerEntry; +import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException; import org.apache.directory.shared.ldap.filter.ExprNode; Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java (original) +++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java Sat Apr 11 01:03:00 2009 @@ -20,13 +20,13 @@ package org.apache.directory.server.xdbm.search.impl; -import org.apache.directory.server.core.cursor.Cursor; -import org.apache.directory.server.core.cursor.InvalidCursorPositionException; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.server.xdbm.Store; import org.apache.directory.server.xdbm.AbstractIndexCursor; import org.apache.directory.server.xdbm.IndexCursor; +import org.apache.directory.shared.ldap.cursor.Cursor; +import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException; /** Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java (original) +++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java Sat Apr 11 01:03:00 2009 @@ -20,16 +20,20 @@ package org.apache.directory.server.xdbm.search.impl; -import org.apache.directory.server.core.cursor.Cursor; -import org.apache.directory.server.core.cursor.InvalidCursorPositionException; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.server.xdbm.AbstractIndexCursor; import org.apache.directory.server.xdbm.IndexCursor; import org.apache.directory.server.xdbm.search.Evaluator; +import org.apache.directory.shared.ldap.cursor.Cursor; +import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException; import org.apache.directory.shared.ldap.filter.ExprNode; -import java.util.; /* Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java (original) +++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java Sat Apr 11 01:03:00 2009 @@ -24,8 +24,8 @@ import org.apache.directory.server.xdbm.Store; import org.apache.directory.server.xdbm.AbstractIndexCursor; import org.apache.directory.server.xdbm.IndexCursor; -import org.apache.directory.server.core.cursor.InvalidCursorPositionException; import org.apache.directory.server.core.entry.ServerEntry; +import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException; import org.apache.directory.shared.ldap.schema.AttributeType; Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java (original) +++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java Sat Apr 11 01:03:00 2009 @@ -20,9 +20,14 @@ package org.apache.directory.server.xdbm.search.impl; -import org.apache.directory.server.core.cursor.InvalidCursorPositionException; import org.apache.directory.server.core.entry.ServerEntry; -import org.apache.directory.server.xdbm.; +import org.apache.directory.server.xdbm.AbstractIndexCursor; +import org.apache.directory.server.xdbm.ForwardIndexEntry; +import org.apache.directory.server.xdbm.Index; +import org.apache.directory.server.xdbm.IndexCursor; +import org.apache.directory.server.xdbm.IndexEntry; +import org.apache.directory.server.xdbm.Store; +import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException; /* Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java (original) +++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java Sat Apr 11 01:03:00 2009 @@ -28,7 +28,6 @@ import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.server.xdbm.Store; import org.apache.directory.server.xdbm.search.Evaluator; -import org.apache.directory.server.core.cursor.Cursor; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.entry.ServerAttribute; import org.apache.directory.shared.ldap.filter.SubstringNode; @@ -36,6 +35,7 @@ import org.apache.directory.shared.ldap.schema.MatchingRule; import org.apache.directory.shared.ldap.schema.Normalizer; import org.apache.directory.shared.ldap.schema.normalizers.NoOpNormalizer; +import org.apache.directory.shared.ldap.cursor.Cursor; import org.apache.directory.shared.ldap.entry.Value; Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java (original) +++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java Sat Apr 11 01:03:00 2009 @@ -20,12 +20,12 @@ package org.apache.directory.server.xdbm.search.impl; -import org.apache.directory.server.core.cursor.InvalidCursorPositionException; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.server.xdbm.Store; import org.apache.directory.server.xdbm.AbstractIndexCursor; import org.apache.directory.server.xdbm.IndexCursor; +import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException; /** Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java (original) +++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java Sat Apr 11 01:03:00 2009 @@ -20,8 +20,6 @@ package org.apache.directory.server.xdbm.search.impl; -import static org.junit.Assert.; - import java.io.File; import java.util.HashSet; import java.util.Set; @@ -29,7 +27,6 @@ import java.util.ArrayList; import org.apache.commons.io.FileUtils; -import org.apache.directory.server.core.cursor.InvalidCursorPositionException; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore; import org.apache.directory.server.core.entry.ServerEntry; @@ -52,15 +49,22 @@ import org.apache.directory.server.xdbm.search.Evaluator; import org.apache.directory.server.xdbm.tools.StoreUtils; import org.apache.directory.shared.ldap.constants.SchemaConstants; +import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException; import org.apache.directory.shared.ldap.filter.AndNode; import org.apache.directory.shared.ldap.filter.ExprNode; import org.apache.directory.shared.ldap.filter.FilterParser; import org.apache.directory.shared.ldap.filter.PresenceNode; import org.apache.directory.shared.ldap.filter.SubstringNode; -import org.junit.; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.fail; /** * Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java (original) +++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java Sat Apr 11 01:03:00 2009 @@ -30,11 +30,11 @@ import org.apache.directory.server.schema.SerializableComparator; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex; -import org.apache.directory.server.core.cursor.InvalidCursorPositionException; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.entry.ServerStringValue; import org.apache.directory.server.core.entry.DefaultServerEntry; import org.apache.directory.shared.ldap.constants.SchemaConstants; +import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException; import org.apache.directory.shared.ldap.filter.GreaterEqNode; import org.apache.directory.shared.ldap.schema.; import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescription; Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java (original) +++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java Sat Apr 11 01:03:00 2009 @@ -25,18 +25,28 @@ import org.apache.directory.server.xdbm.Store; import org.apache.directory.server.xdbm.ForwardIndexEntry; import org.apache.directory.server.xdbm.tools.StoreUtils; -import org.apache.directory.server.schema.registries.; -import org.apache.directory.server.schema.bootstrap.; import org.apache.directory.server.schema.SerializableComparator; +import org.apache.directory.server.schema.bootstrap.ApacheSchema; +import org.apache.directory.server.schema.bootstrap.ApachemetaSchema; +import org.apache.directory.server.schema.bootstrap.BootstrapSchemaLoader; +import org.apache.directory.server.schema.bootstrap.CollectiveSchema; +import org.apache.directory.server.schema.bootstrap.CoreSchema; +import org.apache.directory.server.schema.bootstrap.Schema; +import org.apache.directory.server.schema.bootstrap.SystemSchema; +import org.apache.directory.server.schema.registries.AttributeTypeRegistry; +import org.apache.directory.server.schema.registries.DefaultOidRegistry; +import org.apache.directory.server.schema.registries.DefaultRegistries; +import org.apache.directory.server.schema.registries.OidRegistry; +import org.apache.directory.server.schema.registries.Registries; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex; -import org.apache.directory.server.core.cursor.InvalidCursorPositionException; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.entry.DefaultServerEntry; import org.apache.directory.server.core.entry.ServerStringValue; import org.apache.directory.shared.ldap.constants.SchemaConstants; +import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException; import org.apache.directory.shared.ldap.filter.LessEqNode; -import org.apache.directory.shared.ldap.schema.; +import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescription; import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.commons.io.FileUtils; @@ -48,7 +58,10 @@ import static org.junit.Assert.fail; import java.io.File; -import java.util.; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /* Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java (original) +++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java Sat Apr 11 01:03:00 2009 @@ -20,14 +20,11 @@ package org.apache.directory.server.xdbm.search.impl; -import static org.junit.Assert.; - import java.io.File; import java.util.HashSet; import java.util.Set; import org.apache.commons.io.FileUtils; -import org.apache.directory.server.core.cursor.InvalidCursorPositionException; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore; import org.apache.directory.server.core.entry.ServerEntry; @@ -50,14 +47,22 @@ import org.apache.directory.server.xdbm.search.Evaluator; import org.apache.directory.server.xdbm.tools.StoreUtils; import org.apache.directory.shared.ldap.constants.SchemaConstants; +import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException; import org.apache.directory.shared.ldap.filter.ExprNode; import org.apache.directory.shared.ldap.filter.FilterParser; import org.apache.directory.shared.ldap.filter.NotNode; import org.apache.directory.shared.ldap.filter.SubstringNode; -import org.junit.; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.fail; + /** * Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java (original) +++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java Sat Apr 11 01:03:00 2009 @@ -26,15 +26,25 @@ import org.apache.directory.server.xdbm.ForwardIndexEntry; import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.server.xdbm.tools.StoreUtils; -import org.apache.directory.server.schema.registries.; -import org.apache.directory.server.schema.bootstrap.; import org.apache.directory.server.schema.SerializableComparator; +import org.apache.directory.server.schema.bootstrap.ApacheSchema; +import org.apache.directory.server.schema.bootstrap.ApachemetaSchema; +import org.apache.directory.server.schema.bootstrap.BootstrapSchemaLoader; +import org.apache.directory.server.schema.bootstrap.CollectiveSchema; +import org.apache.directory.server.schema.bootstrap.CoreSchema; +import org.apache.directory.server.schema.bootstrap.Schema; +import org.apache.directory.server.schema.bootstrap.SystemSchema; +import org.apache.directory.server.schema.registries.AttributeTypeRegistry; +import org.apache.directory.server.schema.registries.DefaultOidRegistry; +import org.apache.directory.server.schema.registries.DefaultRegistries; +import org.apache.directory.server.schema.registries.OidRegistry; +import org.apache.directory.server.schema.registries.Registries; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex; -import org.apache.directory.server.core.cursor.InvalidCursorPositionException; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.entry.DefaultServerEntry; import org.apache.directory.shared.ldap.constants.SchemaConstants; +import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException; import org.apache.directory.shared.ldap.filter.ScopeNode; import org.apache.directory.shared.ldap.filter.SearchScope; import org.apache.directory.shared.ldap.message.AliasDerefMode; Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java (original) +++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java Sat Apr 11 01:03:00 2009 @@ -19,8 +19,6 @@ / package org.apache.directory.server.xdbm.search.impl; -import static org.junit.Assert.; - import java.io.File; import java.util.ArrayList; import java.util.HashSet; @@ -28,8 +26,6 @@ import java.util.Set; import org.apache.commons.io.FileUtils; -import org.apache.directory.server.core.cursor.Cursor; -import org.apache.directory.server.core.cursor.InvalidCursorPositionException; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore; import org.apache.directory.server.core.entry.ServerEntry; @@ -53,11 +49,19 @@ import org.apache.directory.server.xdbm.search.Evaluator; import org.apache.directory.server.xdbm.tools.StoreUtils; import org.apache.directory.shared.ldap.constants.SchemaConstants; +import org.apache.directory.shared.ldap.cursor.Cursor; +import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException; import org.apache.directory.shared.ldap.filter.ExprNode; import org.apache.directory.shared.ldap.filter.FilterParser; import org.apache.directory.shared.ldap.filter.OrNode; import org.apache.directory.shared.ldap.filter.SubstringNode; -import org.junit.; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.fail; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java (original) +++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java Sat Apr 11 01:03:00 2009 @@ -22,23 +22,36 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.directory.server.schema.registries.; import org.apache.directory.server.schema.SerializableComparator; -import org.apache.directory.server.schema.bootstrap.; +import org.apache.directory.server.schema.bootstrap.ApacheSchema; +import org.apache.directory.server.schema.bootstrap.ApachemetaSchema; +import org.apache.directory.server.schema.bootstrap.BootstrapSchemaLoader; +import org.apache.directory.server.schema.bootstrap.CollectiveSchema; +import org.apache.directory.server.schema.bootstrap.CoreSchema; +import org.apache.directory.server.schema.bootstrap.Schema; +import org.apache.directory.server.schema.bootstrap.SystemSchema; +import org.apache.directory.server.schema.registries.AttributeTypeRegistry; +import org.apache.directory.server.schema.registries.DefaultOidRegistry; +import org.apache.directory.server.schema.registries.DefaultRegistries; +import org.apache.directory.server.schema.registries.OidRegistry; +import org.apache.directory.server.schema.registries.Registries; import org.apache.directory.server.xdbm.Store; import org.apache.directory.server.xdbm.ForwardIndexEntry; import org.apache.directory.server.xdbm.tools.StoreUtils; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore; -import org.apache.directory.server.core.cursor.InvalidCursorPositionException; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.shared.ldap.constants.SchemaConstants; +import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException; import org.apache.directory.shared.ldap.filter.PresenceNode; import org.apache.commons.io.FileUtils; -import org.junit.Before; import org.junit.After; +import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.fail; import java.io.File; import java.util.Set; Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java (original) +++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java Sat Apr 11 01:03:00 2009 @@ -25,14 +25,24 @@ import org.apache.directory.server.xdbm.Store; import org.apache.directory.server.xdbm.ForwardIndexEntry; import org.apache.directory.server.xdbm.tools.StoreUtils; -import org.apache.directory.server.schema.registries.; -import org.apache.directory.server.schema.bootstrap.; import org.apache.directory.server.schema.SerializableComparator; +import org.apache.directory.server.schema.bootstrap.ApacheSchema; +import org.apache.directory.server.schema.bootstrap.ApachemetaSchema; +import org.apache.directory.server.schema.bootstrap.BootstrapSchemaLoader; +import org.apache.directory.server.schema.bootstrap.CollectiveSchema; +import org.apache.directory.server.schema.bootstrap.CoreSchema; +import org.apache.directory.server.schema.bootstrap.Schema; +import org.apache.directory.server.schema.bootstrap.SystemSchema; +import org.apache.directory.server.schema.registries.AttributeTypeRegistry; +import org.apache.directory.server.schema.registries.DefaultOidRegistry; +import org.apache.directory.server.schema.registries.DefaultRegistries; +import org.apache.directory.server.schema.registries.OidRegistry; +import org.apache.directory.server.schema.registries.Registries; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex; -import org.apache.directory.server.core.cursor.InvalidCursorPositionException; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.shared.ldap.constants.SchemaConstants; +import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException; import org.apache.directory.shared.ldap.filter.SubstringNode; import org.apache.commons.io.FileUtils; import org.junit.Before; Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java (original) +++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java Sat Apr 11 01:03:00 2009 @@ -26,15 +26,25 @@ import org.apache.directory.server.xdbm.ForwardIndexEntry; import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.server.xdbm.tools.StoreUtils; -import org.apache.directory.server.schema.registries.; -import org.apache.directory.server.schema.bootstrap.; import org.apache.directory.server.schema.SerializableComparator; +import org.apache.directory.server.schema.bootstrap.ApacheSchema; +import org.apache.directory.server.schema.bootstrap.ApachemetaSchema; +import org.apache.directory.server.schema.bootstrap.BootstrapSchemaLoader; +import org.apache.directory.server.schema.bootstrap.CollectiveSchema; +import org.apache.directory.server.schema.bootstrap.CoreSchema; +import org.apache.directory.server.schema.bootstrap.Schema; +import org.apache.directory.server.schema.bootstrap.SystemSchema; +import org.apache.directory.server.schema.registries.AttributeTypeRegistry; +import org.apache.directory.server.schema.registries.DefaultOidRegistry; +import org.apache.directory.server.schema.registries.DefaultRegistries; +import org.apache.directory.server.schema.registries.OidRegistry; +import org.apache.directory.server.schema.registries.Registries; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex; -import org.apache.directory.server.core.cursor.InvalidCursorPositionException; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.entry.DefaultServerEntry; import org.apache.directory.shared.ldap.constants.SchemaConstants; +import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException; import org.apache.directory.shared.ldap.filter.ScopeNode; import org.apache.directory.shared.ldap.filter.SearchScope; import org.apache.directory.shared.ldap.message.AliasDerefMode; Modified: directory/apacheds/trunk/xdbm-tools/pom.xml URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-tools/pom.xml?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-tools/pom.xml (original) +++ directory/apacheds/trunk/xdbm-tools/pom.xml Sat Apr 11 01:03:00 2009 @@ -41,6 +41,12 @@ <artifactId>apacheds-xdbm-base</artifactId> <version>${pom.version}</version> </dependency> + + <dependency> + <groupId>org.apache.directory.shared</groupId> + <version>${org.apache.directory.shared.version}</version> + <artifactId>shared-cursor</artifactId> + </dependency> </dependencies> <packaging>jar</packaging> Modified: directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java (original) +++ directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java Sat Apr 11 01:03:00 2009 @@ -46,8 +46,8 @@ import org.apache.directory.server.xdbm.Index; import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.server.xdbm.ForwardIndexEntry; -import org.apache.directory.server.core.cursor.Cursor; import org.apache.directory.server.core.entry.ServerEntry; +import org.apache.directory.shared.ldap.cursor.Cursor; import org.apache.directory.shared.ldap.util.ExceptionUtils; import org.apache.directory.shared.ldap.NotImplementedException; Modified: directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java (original) +++ directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java Sat Apr 11 01:03:00 2009 @@ -22,7 +22,6 @@ import java.util.Set; -import org.apache.directory.server.core.cursor.Cursor; import org.apache.directory.server.core.entry.DefaultServerEntry; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.schema.registries.AttributeTypeRegistry; @@ -31,6 +30,7 @@ import org.apache.directory.server.xdbm.Index; import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.server.xdbm.Store; +import org.apache.directory.shared.ldap.cursor.Cursor; import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute; Propchange: directory/shared/trunk/ ------------------------------------------------------------------------------ svn:mergeinfo = /directory/shared/branches/shared-replication:749791-764113 Modified: directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/ber/tlv/LengthTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/ber/tlv/LengthTest.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/ber/tlv/LengthTest.java (original) +++ directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/ber/tlv/LengthTest.java Sat Apr 11 01:03:00 2009 @@ -22,7 +22,9 @@ import java.util.Arrays; -import junit.framework.TestCase; +import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** * This class is used to test the Length class @@ -30,12 +32,13 @@ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a> * @version $Rev$, $Date$ / -public class LengthTest extends TestCase +public class LengthTest { /* * Test the getNbBytes method / + @Test public void testLengthGetNbBytes() { assertEquals( "1 expected", 1, TLV.getNbBytes( 0 ) ); @@ -55,6 +58,7 @@ /* * Test the getBytes method / + @Test public void testLengthGetBytes() { assertTrue( Arrays.equals( new byte[] Modified: directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/ber/tlv/ValueTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/ber/tlv/ValueTest.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/ber/tlv/ValueTest.java (original) +++ directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/ber/tlv/ValueTest.java Sat Apr 11 01:03:00 2009 @@ -24,9 +24,6 @@ import java.nio.ByteBuffer; import java.util.Arrays; -import junit.framework.Assert; -import junit.framework.TestCase; - import org.apache.directory.shared.asn1.codec.EncoderException; import org.apache.directory.shared.asn1.primitives.BitString; import org.apache.directory.shared.asn1.util.Asn1StringUtils; @@ -34,6 +31,10 @@ import org.apache.directory.shared.asn1.util.LongDecoder; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /* @@ -42,7 +43,7 @@ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a> * @version $Rev$, $Date$ / -public class ValueTest extends TestCase +public class ValueTest { /* @@ -531,13 +532,13 @@ { byte[] encoded = Value.getBytes( 128 ); - Assert.assertEquals( 0x00, encoded[0] ); - Assert.assertEquals( ( byte ) 0x80, encoded[1] ); + assertEquals( 0x00, encoded[0] ); + assertEquals( ( byte ) 0x80, encoded[1] ); encoded = Value.getBytes( -27066 ); - Assert.assertEquals( ( byte ) 0x96, encoded[0] ); - Assert.assertEquals( 0x46, encoded[1] ); + assertEquals( ( byte ) 0x96, encoded[0] ); + assertEquals( 0x46, encoded[1] ); } @@ -548,9 +549,9 @@ byte[] encoded = Value.getBytes( 32787 ); - Assert.assertEquals( 0x00, encoded[0] ); - Assert.assertEquals( ( byte ) 0x80, encoded[1] ); - Assert.assertEquals( ( byte ) 0x13, encoded[2] ); + assertEquals( 0x00, encoded[0] ); + assertEquals( ( byte ) 0x80, encoded[1] ); + assertEquals( ( byte ) 0x13, encoded[2] ); } @@ -597,7 +598,7 @@ int value = new BigInteger( encoded ).intValue(); - Assert.assertEquals( i, value ); + assertEquals( i, value ); } } @@ -647,7 +648,7 @@ int value = IntegerDecoder.parse( new Value( encoded ) ); - Assert.assertEquals( i, value ); + assertEquals( i, value ); } } @@ -739,7 +740,7 @@ long value = LongDecoder.parse( new Value( encoded ) ); - Assert.assertEquals( i, value ); + assertEquals( i, value ); } } Modified: directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/codec/stateful/DecoderStackTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/codec/stateful/DecoderStackTest.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/codec/stateful/DecoderStackTest.java (original) +++ directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/codec/stateful/DecoderStackTest.java Sat Apr 11 01:03:00 2009 @@ -20,10 +20,15 @@ package org.apache.directory.shared.asn1.codec.stateful; -import junit.framework.TestCase; - import org.apache.directory.shared.asn1.codec.DecoderException; - +import org.junit.Test; +import static org.junit.Assert.fail; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertNotSame; /** * Tests the DecoderStack. @@ -31,22 +36,12 @@ * @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a> * @version $Rev$ / -public class DecoderStackTest extends TestCase +public class DecoderStackTest { /* - * Constructor for DecoderStackTest. - * - * @param arg0 - / - public DecoderStackTest(String arg0) - { - super( arg0 ); - } - - - /* * Tests the push method. / + @Test public void testPush() { DecoderStack stack = new DecoderStack(); @@ -61,6 +56,7 @@ /* * Tests the pop method. / + @Test public void testPop() { DecoderStack stack = new DecoderStack(); @@ -81,6 +77,7 @@ } + @Test public void testDecode() throws Exception { DecoderStack stack = new DecoderStack(); @@ -169,6 +166,7 @@ } + @Test public void testFailure() throws Exception { DecoderStack stack = new DecoderStack(); Modified: directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/codec/stateful/examples/HexDecoderTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/codec/stateful/examples/HexDecoderTest.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/codec/stateful/examples/HexDecoderTest.java (original) +++ directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/codec/stateful/examples/HexDecoderTest.java Sat Apr 11 01:03:00 2009 @@ -23,12 +23,14 @@ import java.nio.ByteBuffer; import java.util.Random; -import junit.framework.TestCase; - import org.apache.directory.shared.asn1.codec.DecoderException; import org.apache.directory.shared.asn1.codec.binary.Hex; import org.apache.directory.shared.asn1.codec.stateful.DecoderCallback; import org.apache.directory.shared.asn1.codec.stateful.StatefulDecoder; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import static org.junit.Assert.fail; /* @@ -37,7 +39,7 @@ * @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a> * $Rev$ / -public class HexDecoderTest extends TestCase implements DecoderCallback +public class HexDecoderTest implements DecoderCallback { private HexDecoder decoder = null; @@ -48,17 +50,17 @@ byte[] original = null; - protected void setUp() throws Exception + @Before + public void setUp() throws Exception { - super.setUp(); decoder = new HexDecoder(); decoder.setCallback( this ); } - protected void tearDown() throws Exception + @After + public void tearDown() throws Exception { - super.tearDown(); decoder = null; encoded = null; decoded = null; @@ -99,6 +101,7 @@ } + @Test public void testDecode0() throws DecoderException { generateData( 0 ); @@ -113,6 +116,7 @@ } + @Test public void testDecode2() throws DecoderException { generateData( 2 ); @@ -121,6 +125,7 @@ } + @Test public void testDecode26() throws DecoderException { generateData( 26 ); @@ -129,6 +134,7 @@ } + @Test public void testDecode254() throws DecoderException { generateData( 254 ); @@ -137,6 +143,7 @@ } + @Test public void testDecode256() throws DecoderException { generateData( 256 ); @@ -145,6 +152,7 @@ } + @Test public void testDecode258() throws DecoderException { generateData( 258 ); @@ -153,6 +161,7 @@ } + @Test public void testDecode2048() throws DecoderException { generateData( 2048 ); @@ -161,6 +170,7 @@ } + @Test public void testPartialDecode2() throws DecoderException { generateData( 2 ); @@ -182,6 +192,7 @@ } + @Test public void testPartialDecode30() throws DecoderException { generateData( 30 ); @@ -195,6 +206,7 @@ } + @Test public void testPartialDecode300() throws DecoderException { generateData( 300 ); Modified: directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/codec/stateful/examples/HexEncoderTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/codec/stateful/examples/HexEncoderTest.java?rev=764131&r1=764130&r2=764131&view=diff ============================================================================== --- directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/codec/stateful/examples/HexEncoderTest.java (original) +++ directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/codec/stateful/examples/HexEncoderTest.java Sat Apr 11 01:03:00 2009 @@ -23,12 +23,14 @@ import java.nio.ByteBuffer; import java.util.Random; -import junit.framework.TestCase; - import org.apache.directory.shared.asn1.codec.EncoderException; import org.apache.directory.shared.asn1.codec.binary.Hex; import org.apache.directory.shared.asn1.codec.stateful.EncoderCallback; import org.apache.directory.shared.asn1.codec.stateful.StatefulEncoder; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import static org.junit.Assert.fail; /* @@ -37,7 +39,7 @@ * @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a> * $Rev$ */ -public class HexEncoderTest extends TestCase implements EncoderCallback +public class HexEncoderTest implements EncoderCallback { HexEncoder encoder = null; @@ -46,17 +48,17 @@ byte[] data = null; - protected void setUp() throws Exception + @Before + public void setUp() throws Exception { - super.setUp(); encoder = new HexEncoder(); encoder.setCallback( this ); } - protected void tearDown() throws Exception + @After + public void tearDown() throws Exception { - super.tearDown(); data = null; encoder = null; encoded = null; @@ -90,6 +92,7 @@ } + @Test public void testEncode0() throws EncoderException { generateData( 0 ); @@ -102,6 +105,7 @@ } + @Test public void testEncode1() throws EncoderException { generateData( 1 ); @@ -110,6 +114,7 @@ } + @Test public void testEncode25() throws EncoderException { generateData( 25 ); @@ -118,6 +123,7 @@ } + @Test public void testEncode63() throws EncoderException { generateData( 63 ); @@ -126,6 +132,7 @@ } + @Test public void testEncode64() throws EncoderException { generateData( 64 ); @@ -134,6 +141,7 @@ } + @Test public void testEncode65() throws EncoderException { generateData( 65 ); @@ -142,6 +150,7 @@ } + @Test public void testEncode66() throws EncoderException { generateData( 66 ); @@ -150,6 +159,7 @@ } + @Test public void testEncode512() throws EncoderException { generateData( 512 );
Mime	Unnamed text/plain (inline, 7-Bit, 86252 bytes)
	View raw message