You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2007/07/14 07:00:33 UTC
svn commit: r556224 -
/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/
Author: akarasulu
Date: Fri Jul 13 22:00:32 2007
New Revision: 556224
URL: http://svn.apache.org/viewvc?view=rev&rev=556224
Log:
some import cleanups
Modified:
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/AddPartitionConfiguration.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/AttributesPropertyEditor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/Configuration.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/MutableStartupConfiguration.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/RemovePartitionConfiguration.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/ShutdownConfiguration.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/SyncConfiguration.java
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/AddPartitionConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/AddPartitionConfiguration.java?view=diff&rev=556224&r1=556223&r2=556224
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/AddPartitionConfiguration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/AddPartitionConfiguration.java Fri Jul 13 22:00:32 2007
@@ -20,10 +20,6 @@
package org.apache.directory.server.core.configuration;
-import org.apache.directory.server.core.partition.Partition;
-import org.apache.directory.server.core.partition.PartitionNexus;
-
-
/**
* A {@link Configuration} that adds a new {@link Partition} to
* the current {@link PartitionNexus}.
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/AttributesPropertyEditor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/AttributesPropertyEditor.java?view=diff&rev=556224&r1=556223&r2=556224
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/AttributesPropertyEditor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/AttributesPropertyEditor.java Fri Jul 13 22:00:32 2007
@@ -42,6 +42,7 @@
import org.apache.directory.shared.ldap.util.MultiMap;
import org.apache.directory.shared.ldap.util.StringTools;
+
/**
* A JavaBeans {@link PropertyEditor} that can convert {@link Attributes} to
* LDIF string and vice versa. This class is useful when you're going to
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/Configuration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/Configuration.java?view=diff&rev=556224&r1=556223&r2=556224
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/Configuration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/Configuration.java Fri Jul 13 22:00:32 2007
@@ -23,8 +23,6 @@
import java.io.Serializable;
import java.util.Hashtable;
-import org.apache.directory.server.core.DirectoryService;
-
/**
* A configuration that provides required, optional, or default properties
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/MutableStartupConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/MutableStartupConfiguration.java?view=diff&rev=556224&r1=556223&r2=556224
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/MutableStartupConfiguration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/MutableStartupConfiguration.java Fri Jul 13 22:00:32 2007
@@ -24,8 +24,6 @@
import java.util.List;
import java.util.Set;
-import org.apache.directory.server.core.DirectoryService;
-
/**
* A mutable version of {@link StartupConfiguration}.
@@ -74,7 +72,7 @@
}
- public void setAuthenticatorConfigurations( Set authenticators )
+ public void setAuthenticatorConfigurations( Set<AuthenticatorConfiguration> authenticators )
{
super.setAuthenticatorConfigurations( authenticators );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/RemovePartitionConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/RemovePartitionConfiguration.java?view=diff&rev=556224&r1=556223&r2=556224
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/RemovePartitionConfiguration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/RemovePartitionConfiguration.java Fri Jul 13 22:00:32 2007
@@ -22,8 +22,6 @@
import javax.naming.NamingException;
-import org.apache.directory.server.core.partition.Partition;
-import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.shared.ldap.name.LdapDN;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/ShutdownConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/ShutdownConfiguration.java?view=diff&rev=556224&r1=556223&r2=556224
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/ShutdownConfiguration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/ShutdownConfiguration.java Fri Jul 13 22:00:32 2007
@@ -20,9 +20,6 @@
package org.apache.directory.server.core.configuration;
-import org.apache.directory.server.core.DirectoryService;
-
-
/**
* A {@link Configuration} that shuts down ApacheDS.
*
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java?view=diff&rev=556224&r1=556223&r2=556224
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java Fri Jul 13 22:00:32 2007
@@ -29,11 +29,11 @@
import javax.naming.directory.Attributes;
-import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.authn.AnonymousAuthenticator;
import org.apache.directory.server.core.authn.SimpleAuthenticator;
import org.apache.directory.server.core.authn.StrongAuthenticator;
import org.apache.directory.shared.ldap.ldif.Entry;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -115,7 +115,8 @@
private Set authenticatorConfigurations; // Set<AuthenticatorConfiguration>
private List interceptorConfigurations; // Set<InterceptorConfiguration>
private PartitionConfiguration systemPartitionConfiguration;
- private Set<PartitionConfiguration> partitionConfigurations = new HashSet<PartitionConfiguration>();
+ private Set<? extends PartitionConfiguration> partitionConfigurations =
+ new HashSet<PartitionConfiguration>();
private List testEntries = new ArrayList(); // List<Attributes>
@@ -281,22 +282,23 @@
*/
protected void setPartitionConfigurations( Set<? extends PartitionConfiguration> contextParitionConfigurations )
{
- Set newSet = ConfigurationUtil.getTypeSafeSet( contextParitionConfigurations,
- PartitionConfiguration.class );
+ Set<? extends PartitionConfiguration> newSet =
+ ( Set <? extends PartitionConfiguration> ) ConfigurationUtil
+ .getTypeSafeSet( contextParitionConfigurations, PartitionConfiguration.class );
- Set names = new HashSet();
+ Set<String> names = new HashSet<String>();
Iterator i = newSet.iterator();
while ( i.hasNext() )
{
PartitionConfiguration cfg = ( PartitionConfiguration ) i.next();
cfg.validate();
- String name = cfg.getId();
- if ( names.contains( name ) )
+ String id = cfg.getId();
+ if ( names.contains( id ) )
{
- throw new ConfigurationException( "Duplicate partition name: " + name );
+ throw new ConfigurationException( "Duplicate partition id: " + id );
}
- names.add( name );
+ names.add( id );
}
this.partitionConfigurations = newSet;
@@ -355,7 +357,7 @@
{
List newList = ConfigurationUtil.getTypeSafeList( interceptorConfigurations, InterceptorConfiguration.class );
- Set names = new HashSet();
+ Set<String> names = new HashSet<String>();
Iterator i = newList.iterator();
while ( i.hasNext() )
{
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/SyncConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/SyncConfiguration.java?view=diff&rev=556224&r1=556223&r2=556224
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/SyncConfiguration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/SyncConfiguration.java Fri Jul 13 22:00:32 2007
@@ -20,9 +20,6 @@
package org.apache.directory.server.core.configuration;
-import org.apache.directory.server.core.DirectoryService;
-
-
/**
* A {@link Configuration} that makes a call to {@link DirectoryService#sync()}.
*