You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by fe...@apache.org on 2010/05/21 07:55:44 UTC
svn commit: r946885 - in /directory/apacheds/trunk:
core-api/src/main/java/org/apache/directory/server/core/schema/
core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/
core-jndi/src/main/java/org/apache/directory/se...
Author: felixk
Date: Fri May 21 05:55:43 2010
New Revision: 946885
URL: http://svn.apache.org/viewvc?rev=946885&view=rev
Log:
>From PMD report
Various 'Avoid unused *' removed
Modified:
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java
directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/EventListenerAdapter.java
directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java
directory/apacheds/trunk/jdbm/src/main/java/jdbm/recman/BaseRecordManager.java
directory/apacheds/trunk/jdbm/src/main/java/jdbm/recman/CacheRecordManager.java
directory/apacheds/trunk/jdbm/src/main/java/jdbm/recman/TransactionManager.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncryptionTypeDecoder.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabDecoder.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java
directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java
directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/HardwareAddress.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java
directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java
directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java?rev=946885&r1=946884&r2=946885&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java Fri May 21 05:55:43 2010
@@ -21,7 +21,6 @@ package org.apache.directory.server.core
import java.text.ParseException;
-import java.util.ArrayList;
import java.util.List;
import org.apache.directory.server.i18n.I18n;
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java?rev=946885&r1=946884&r2=946885&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java Fri May 21 05:55:43 2010
@@ -24,9 +24,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.naming.NamingException;
-
-import org.apache.directory.server.core.CoreSession;
import org.apache.directory.server.core.entry.ServerEntryUtils;
import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
import org.apache.directory.server.i18n.I18n;
@@ -409,7 +406,7 @@ public class SchemaSynchronizer implemen
{
if ( "TRUE".equalsIgnoreCase( disabledInMods.getString() ) )
{
- return disableSchema( opContext.getSession(), getSchemaName( name ) );
+ return disableSchema( getSchemaName( name ) );
}
}
@@ -464,7 +461,7 @@ public class SchemaSynchronizer implemen
if ( !isCurrentlyDisabled && isNewStateDisabled )
{
- return disableSchema( opContext.getSession(), getSchemaName( name ) );
+ return disableSchema( getSchemaName( name ) );
}
break;
@@ -483,7 +480,7 @@ public class SchemaSynchronizer implemen
}
- private boolean disableSchema( CoreSession session, String schemaName ) throws Exception
+ private boolean disableSchema( String schemaName ) throws Exception
{
Schema schema = registries.getLoadedSchema( schemaName );
Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/EventListenerAdapter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/EventListenerAdapter.java?rev=946885&r1=946884&r2=946885&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/EventListenerAdapter.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/EventListenerAdapter.java Fri May 21 05:55:43 2010
@@ -68,13 +68,6 @@ public class EventListenerAdapter implem
private final NamingListener listener;
private final ServerLdapContext source;
- /**
- * TODO not utilized but should be to effect returns in bindings, alias
- * and referral handling
- */
- private final SearchControls controls;
-
-
public EventListenerAdapter( ServerLdapContext source, NamingListener listener )
{
this( source, listener, new SearchControls() );
@@ -84,7 +77,6 @@ public class EventListenerAdapter implem
public EventListenerAdapter( ServerLdapContext source, NamingListener listener, SearchControls controls )
{
this.source = source;
- this.controls = controls;
this.listener = listener;
}
Modified: directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java?rev=946885&r1=946884&r2=946885&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java (original)
+++ directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java Fri May 21 05:55:43 2010
@@ -30,8 +30,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.naming.NamingException;
-
import org.apache.directory.server.core.authn.AuthenticationInterceptor;
import org.apache.directory.server.core.authz.AciAuthorizationInterceptor;
import org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor;
Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java?rev=946885&r1=946884&r2=946885&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java Fri May 21 05:55:43 2010
@@ -23,8 +23,6 @@ package org.apache.directory.server.core
import java.io.File;
import java.io.IOException;
-import javax.naming.NamingException;
-
import jdbm.RecordManager;
import jdbm.helper.MRU;
import jdbm.recman.BaseRecordManager;
Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java?rev=946885&r1=946884&r2=946885&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java Fri May 21 05:55:43 2010
@@ -24,8 +24,6 @@ package org.apache.directory.server.core
import java.io.File;
import java.io.IOException;
-import javax.naming.NamingException;
-
import jdbm.helper.MRU;
import jdbm.recman.BaseRecordManager;
import jdbm.recman.CacheRecordManager;
Modified: directory/apacheds/trunk/jdbm/src/main/java/jdbm/recman/BaseRecordManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm/src/main/java/jdbm/recman/BaseRecordManager.java?rev=946885&r1=946884&r2=946885&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm/src/main/java/jdbm/recman/BaseRecordManager.java (original)
+++ directory/apacheds/trunk/jdbm/src/main/java/jdbm/recman/BaseRecordManager.java Fri May 21 05:55:43 2010
@@ -272,8 +272,6 @@ public final class BaseRecordManager
Location logRecid = new Location( recid );
Location physRecid = logMgr.fetch( logRecid );
- String c = obj.getClass().getName();
-
byte[] data = serializer.serialize( obj );
if ( DEBUG )
@@ -398,17 +396,16 @@ public final class BaseRecordManager
{
checkIfClosed();
- Map<String,Long> nameDirectory = getNameDirectory();
if ( recid == 0 )
{
// remove from hashtable
- nameDirectory.remove( name );
+ getNameDirectory().remove( name );
}
else
{
- nameDirectory.put( name, recid );
+ getNameDirectory().put( name, recid );
}
- saveNameDirectory( nameDirectory );
+ saveNameDirectory( );
}
@@ -459,7 +456,7 @@ public final class BaseRecordManager
}
- private void saveNameDirectory( Map<String,Long> directory ) throws IOException
+ private void saveNameDirectory( ) throws IOException
{
long recid = getRoot( NAME_DIRECTORY_ROOT );
Modified: directory/apacheds/trunk/jdbm/src/main/java/jdbm/recman/CacheRecordManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm/src/main/java/jdbm/recman/CacheRecordManager.java?rev=946885&r1=946884&r2=946885&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm/src/main/java/jdbm/recman/CacheRecordManager.java (original)
+++ directory/apacheds/trunk/jdbm/src/main/java/jdbm/recman/CacheRecordManager.java Fri May 21 05:55:43 2010
@@ -343,11 +343,8 @@ public class CacheRecordManager implemen
public synchronized void commit() throws IOException
{
checkIfClosed();
- long t0 = System.nanoTime();
updateCacheEntries();
- long t1 = System.nanoTime();
recMgr.commit();
- long t2 = System.nanoTime();
}
Modified: directory/apacheds/trunk/jdbm/src/main/java/jdbm/recman/TransactionManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm/src/main/java/jdbm/recman/TransactionManager.java?rev=946885&r1=946884&r2=946885&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm/src/main/java/jdbm/recman/TransactionManager.java (original)
+++ directory/apacheds/trunk/jdbm/src/main/java/jdbm/recman/TransactionManager.java Fri May 21 05:55:43 2010
@@ -157,8 +157,6 @@ public final class TransactionManager {
TreeSet blockList = new TreeSet( new BlockIoComparator() );
- int numBlocks = 0;
- int writtenBlocks = 0;
for (int i = 0; i < _maxTxns; i++) {
if (txns[i] == null)
continue;
@@ -170,10 +168,8 @@ public final class TransactionManager {
block.decrementTransactionCount();
}
else {
- writtenBlocks++;
- boolean result = blockList.add( block );
+ blockList.add( block );
}
- numBlocks++;
}
txns[i] = null;
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncryptionTypeDecoder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncryptionTypeDecoder.java?rev=946885&r1=946884&r2=946885&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncryptionTypeDecoder.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncryptionTypeDecoder.java Fri May 21 05:55:43 2010
@@ -44,13 +44,10 @@ public class EncryptionTypeDecoder
{
Set<EncryptionType> eTypes = new HashSet<EncryptionType>( sequence.size() );
- int ii = 0;
-
for ( Enumeration<DEREncodable> e = sequence.getObjects(); e.hasMoreElements(); )
{
DERInteger object = ( DERInteger ) e.nextElement();
eTypes.add( EncryptionType.getTypeByOrdinal( object.intValue() ) );
- ii++;
}
return eTypes;
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabDecoder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabDecoder.java?rev=946885&r1=946884&r2=946885&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabDecoder.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabDecoder.java Fri May 21 05:55:43 2010
@@ -90,7 +90,7 @@ class KeytabDecoder
byte keyVersion = buffer.get();
- EncryptionKey key = getKeyBlock( buffer, keyVersion );
+ EncryptionKey key = getKeyBlock( buffer );
return new KeytabEntry( principalName, principalType, timeStamp, keyVersion, key );
}
@@ -132,7 +132,7 @@ class KeytabDecoder
/**
* Read off a 16-bit encryption type and symmetric key material.
*/
- private EncryptionKey getKeyBlock( IoBuffer buffer, int keyVersion )
+ private EncryptionKey getKeyBlock( IoBuffer buffer )
{
int type = buffer.getUnsignedShort();
byte[] keyblock = getCountedBytes( buffer );
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java?rev=946885&r1=946884&r2=946885&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java Fri May 21 05:55:43 2010
@@ -20,11 +20,9 @@
package org.apache.directory.server.kerberos.shared.store;
-import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import javax.naming.NamingException;
import javax.security.auth.kerberos.KerberosPrincipal;
import org.apache.directory.server.i18n.I18n;
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java?rev=946885&r1=946884&r2=946885&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java Fri May 21 05:55:43 2010
@@ -24,7 +24,6 @@ import java.io.IOException;
import java.text.ParseException;
import java.util.Map;
-import javax.naming.NamingException;
import javax.naming.directory.InvalidAttributeValueException;
import javax.security.auth.kerberos.KerberosPrincipal;
Modified: directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java?rev=946885&r1=946884&r2=946885&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java (original)
+++ directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java Fri May 21 05:55:43 2010
@@ -104,8 +104,6 @@ public class LdifPartition extends BTree
private static final boolean CREATE = Boolean.TRUE;
private static final boolean DELETE = Boolean.FALSE;
- private int ldifScanInterval;
-
/** A filter used to pick all the directories */
private FileFilter dirFilter = new FileFilter()
{
@@ -970,18 +968,6 @@ public class LdifPartition extends BTree
/**
- * the interval at which the config directory containing LDIF files
- * should be scanned, default value is 10 min
- *
- * @param ldifScanInterval the scan interval time in minutes
- */
- public void setLdifScanInterval( int ldifScanInterval )
- {
- this.ldifScanInterval = ldifScanInterval;
- }
-
-
- /**
* @return the workingDirectory
*/
public String getWorkingDirectory()
Modified: directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java?rev=946885&r1=946884&r2=946885&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java (original)
+++ directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java Fri May 21 05:55:43 2010
@@ -81,7 +81,7 @@ public class ChangePasswordService
}
configureChangePassword( changepwContext );
- getAuthHeader( session, changepwContext );
+ getAuthHeader( changepwContext );
verifyServiceTicket( changepwContext );
getServerEntry( changepwContext );
verifyServiceTicketAuthHeader( changepwContext );
@@ -157,7 +157,7 @@ public class ChangePasswordService
}
- private static void getAuthHeader( IoSession session, ChangePasswordContext changepwContext ) throws KerberosException
+ private static void getAuthHeader( ChangePasswordContext changepwContext ) throws KerberosException
{
ChangePasswordRequest request = ( ChangePasswordRequest ) changepwContext.getRequest();
Modified: directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/HardwareAddress.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/HardwareAddress.java?rev=946885&r1=946884&r2=946885&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/HardwareAddress.java (original)
+++ directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/HardwareAddress.java Fri May 21 05:55:43 2010
@@ -20,7 +20,6 @@
package org.apache.directory.server.dhcp.messages;
-import java.text.ParseException;
import java.util.Arrays;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java?rev=946885&r1=946884&r2=946885&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java Fri May 21 05:55:43 2010
@@ -35,8 +35,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.naming.NamingException;
-
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.core.security.CoreKeyStoreSpi;
@@ -139,9 +137,6 @@ public class LdapServer extends Director
/** The default service name. */
private static final String SERVICE_NAME_DEFAULT = "ApacheDS LDAP Service";
- /** The default IP port. */
- private static final int DEFAULT_IP_PORT = 389;
-
/** the session manager for this LdapServer */
private LdapSessionManager ldapSessionManager = new LdapSessionManager();
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java?rev=946885&r1=946884&r2=946885&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java Fri May 21 05:55:43 2010
@@ -246,7 +246,7 @@ public class BindHandler extends LdapReq
/**
* Check if the mechanism exists.
*/
- private boolean checkMechanism( LdapSession ldapSession, String saslMechanism ) throws Exception
+ private boolean checkMechanism( String saslMechanism ) throws Exception
{
// Guard clause: Reject unsupported SASL mechanisms.
if ( !ldapServer.getSupportedMechanisms().contains( saslMechanism ) )
@@ -368,8 +368,6 @@ public class BindHandler extends LdapReq
// Write back the error
ldapSession.getIoSession().write( bindRequest.getResultResponse() );
-
- return;
}
@@ -440,7 +438,7 @@ public class BindHandler extends LdapReq
}
- private void handleSaslAuthPending( LdapSession ldapSession, InternalBindRequest bindRequest, DirectoryService ds )
+ private void handleSaslAuthPending( LdapSession ldapSession, InternalBindRequest bindRequest )
throws Exception
{
// First, check that we have the same mechanism
@@ -530,7 +528,7 @@ public class BindHandler extends LdapReq
if ( !StringTools.isEmpty( saslMechanism ) )
{
// fist check that the mechanism exists
- if ( !checkMechanism( ldapSession, saslMechanism ) )
+ if ( !checkMechanism( saslMechanism ) )
{
// get out !
sendAuthMethNotSupported( ldapSession, bindRequest );
@@ -564,7 +562,7 @@ public class BindHandler extends LdapReq
{
try
{
- handleSaslAuthPending( ldapSession, bindRequest, ds );
+ handleSaslAuthPending( ldapSession, bindRequest );
}
catch ( SaslException se )
{
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.java?rev=946885&r1=946884&r2=946885&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.java Fri May 21 05:55:43 2010
@@ -24,7 +24,6 @@ import org.apache.directory.server.ldap.
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.internal.InternalCompareRequest;
import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
-import org.apache.directory.shared.ldap.name.DN;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java?rev=946885&r1=946884&r2=946885&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java Fri May 21 05:55:43 2010
@@ -116,7 +116,6 @@ public abstract class LdapRequestHandler
result.setResultCode( ResultCodeEnum.CONFIDENTIALITY_REQUIRED );
result.setErrorMessage( "Confidentiality (TLS secured connection) is required." );
session.write( resp );
- return;
}
/**
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java?rev=946885&r1=946884&r2=946885&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java Fri May 21 05:55:43 2010
@@ -404,7 +404,7 @@ public class SearchHandler extends LdapR
private void readPagedResults( LdapSession session, InternalSearchRequest req, InternalLdapResult ldapResult,
- EntryFilteringCursor cursor, long sizeLimit, int pagedLimit, boolean isPaged,
+ EntryFilteringCursor cursor, long sizeLimit, int pagedLimit,
PagedSearchContext pagedContext, PagedResultsControl pagedResultsControl ) throws Exception
{
req.addAbandonListener( new SearchAbandonListener( ldapServer, cursor ) );
@@ -726,7 +726,7 @@ public class SearchHandler extends LdapR
*/
try
{
- readPagedResults( session, req, ldapResult, cursor, sizeLimit, pagedLimit, true, pagedContext, pagedResultsControl );
+ readPagedResults( session, req, ldapResult, cursor, sizeLimit, pagedLimit, pagedContext, pagedResultsControl );
}
catch ( Exception e )
{
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java?rev=946885&r1=946884&r2=946885&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java Fri May 21 05:55:43 2010
@@ -111,7 +111,7 @@ public class PagedSearchContext
/**
* Build a set of OIDs from the list of attributes we have in the search request
*/
- private Set<String> buildAttributeSet( InternalSearchRequest request, LdapSession session,
+ private Set<String> buildAttributeSet( InternalSearchRequest request,
SchemaManager schemaManager )
{
Set<String> requestSet = new HashSet<String>();
@@ -206,8 +206,8 @@ public class PagedSearchContext
}
// Build the set of attributeType from both requests
- Set<String> requestSet = buildAttributeSet( request, session, schemaManager );
- Set<String> previousRequestSet = buildAttributeSet( previousSearchRequest, session, schemaManager );
+ Set<String> requestSet = buildAttributeSet( request, schemaManager );
+ Set<String> previousRequestSet = buildAttributeSet( previousSearchRequest, schemaManager );
// Check that both sets have the same size again after having converted
// the attributes to OID
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java?rev=946885&r1=946884&r2=946885&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java Fri May 21 05:55:43 2010
@@ -40,8 +40,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.extended.CertGenerationResponse;
import org.apache.directory.shared.ldap.message.internal.InternalExtendedRequest;
import org.apache.directory.shared.ldap.name.DN;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* An extended handler for digital certificate generation
@@ -56,8 +54,6 @@ public class CertGenerationRequestHandle
private static final Set<String> EXTENSION_OIDS;
- private static final Logger LOG = LoggerFactory.getLogger( CertGenerationRequestHandler.class );
-
static
{
Set<String> set = new HashSet<String>( 2 );
Modified: directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java?rev=946885&r1=946884&r2=946885&view=diff
==============================================================================
--- directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java (original)
+++ directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java Fri May 21 05:55:43 2010
@@ -27,8 +27,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
-import javax.naming.NamingException;
-
import org.apache.commons.lang.StringUtils;
import org.apache.directory.server.constants.ApacheSchemaConstants;
import org.apache.directory.server.constants.ServerDNConstants;
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=946885&r1=946884&r2=946885&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 Fri May 21 05:55:43 2010
@@ -41,7 +41,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.DefaultEntry;
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.SchemaManager;
Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java?rev=946885&r1=946884&r2=946885&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java Fri May 21 05:55:43 2010
@@ -22,8 +22,6 @@ package org.apache.directory.server.core
import org.apache.directory.server.xdbm.IndexEntry;
-import javax.naming.NamingException;
-
/**
* Asserts whether or not a candidate should be returned in searching based on
@@ -44,7 +42,7 @@ public interface IndexAssertion<K, E, ID
*
* @param entry an index record of the entry
* @return true if the entry should be returned, false otherwise
- * @throws NamingException if their are failures while asserting the
+ * @throws Exception if their are failures while asserting the
* condition
*/
boolean assertCandidate( IndexEntry<K, E, ID> entry ) throws Exception;
Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java?rev=946885&r1=946884&r2=946885&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java Fri May 21 05:55:43 2010
@@ -21,7 +21,6 @@
package org.apache.directory.server.xdbm;
-import org.apache.directory.server.xdbm.ParentIdAndRdn;
import org.apache.directory.shared.ldap.schema.comparators.SerializableComparator;
Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java?rev=946885&r1=946884&r2=946885&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java Fri May 21 05:55:43 2010
@@ -41,10 +41,6 @@ import org.slf4j.LoggerFactory;
public class AvlRdnIndex<E> extends AvlIndex<ParentIdAndRdn<Long>, E>
{
- /** A logger for this class */
- private static final Logger LOG = LoggerFactory.getLogger( AvlRdnIndex.class );
-
-
public AvlRdnIndex()
{
}
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=946885&r1=946884&r2=946885&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 Fri May 21 05:55:43 2010
@@ -155,7 +155,7 @@ public class SubstringEvaluator<ID exten
}
else
{
- return evaluateWithIndex( entry );
+ return evaluateWithIndex( );
}
}
@@ -200,7 +200,7 @@ public class SubstringEvaluator<ID exten
}
- private boolean evaluateWithIndex( Entry entry ) throws Exception
+ private boolean evaluateWithIndex( ) throws Exception
{
throw new UnsupportedOperationException( I18n.err( I18n.ERR_721 ) );
}
Modified: directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java?rev=946885&r1=946884&r2=946885&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java (original)
+++ directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java Fri May 21 05:55:43 2010
@@ -52,9 +52,6 @@ public class AttributesTableModel extend
/** list of attribute values */
private final transient ArrayList<Object> valList;
- /** the attributes for the entry */
- private final Entry entry;
-
/** the unique id of the entry */
private final Long id;
@@ -77,7 +74,6 @@ public class AttributesTableModel extend
{
this.dn = dn;
this.id = id;
- this.entry = entry;
this.isMutable = isMutable;
int rowCount = 0;
@@ -93,8 +89,6 @@ public class AttributesTableModel extend
for ( EntryAttribute attribute:entry )
{
- String key = attribute.getId();
-
for ( Value<?> value:attribute )
{
keyList.add( attribute.getId() );