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 2006/12/16 06:54:39 UTC
svn commit: r487762 - in /directory/branches/trunks/schema/apacheds:
core-unit/src/main/java/org/apache/directory/server/core/unit/
core-unit/src/test/java/org/apache/directory/server/core/jndi/
core/src/main/java/org/apache/directory/server/core/ core...
Author: akarasulu
Date: Fri Dec 15 21:54:38 2006
New Revision: 487762
URL: http://svn.apache.org/viewvc?view=rev&rev=487762
Log:
renamed some interfaces
Modified:
directory/branches/trunks/schema/apacheds/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java
directory/branches/trunks/schema/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableStartupConfiguration.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
directory/branches/trunks/schema/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java
directory/branches/trunks/schema/apacheds/server-jndi/src/main/java/org/apache/directory/server/configuration/MutableServerStartupConfiguration.java
directory/branches/trunks/schema/apacheds/server-unit/src/test/java/org/apache/directory/server/MiscTest.java
directory/branches/trunks/schema/apacheds/server-unit/src/test/java/org/apache/directory/server/jndi/ServerContextFactoryTest.java
Modified: directory/branches/trunks/schema/apacheds/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java?view=diff&rev=487762&r1=487761&r2=487762
==============================================================================
--- directory/branches/trunks/schema/apacheds/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java (original)
+++ directory/branches/trunks/schema/apacheds/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java Fri Dec 15 21:54:38 2006
@@ -152,7 +152,7 @@
partConfig.setContextEntry( attributes );
configuration.setShutdownHookEnabled( false );
- configuration.setContextPartitionConfigurations( Collections.singleton( partConfig ) );
+ configuration.setPartitionConfigurations( Collections.singleton( partConfig ) );
doDelete( configuration.getWorkingDirectory() );
setSysRoot( username, password, configuration );
Modified: directory/branches/trunks/schema/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java?view=diff&rev=487762&r1=487761&r2=487762
==============================================================================
--- directory/branches/trunks/schema/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java (original)
+++ directory/branches/trunks/schema/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java Fri Dec 15 21:54:38 2006
@@ -70,7 +70,7 @@
Set partitions = new HashSet();
partitions.add( partition );
- configuration.setContextPartitionConfigurations( partitions );
+ configuration.setPartitionConfigurations( partitions );
super.overrideEnvironment( Context.PROVIDER_URL, suffix );
super.setUp();
Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?view=diff&rev=487762&r1=487761&r2=487762
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Fri Dec 15 21:54:38 2006
@@ -116,7 +116,7 @@
/**
* Creates a new instance.
*/
- public DefaultDirectoryService(String instanceId)
+ public DefaultDirectoryService( String instanceId )
{
if ( instanceId == null )
{
Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableStartupConfiguration.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableStartupConfiguration.java?view=diff&rev=487762&r1=487761&r2=487762
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableStartupConfiguration.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableStartupConfiguration.java Fri Dec 15 21:54:38 2006
@@ -92,9 +92,9 @@
}
- public void setContextPartitionConfigurations( Set contextParitionConfigurations )
+ public void setPartitionConfigurations( Set paritionConfigurations )
{
- super.setContextPartitionConfigurations( contextParitionConfigurations );
+ super.setPartitionConfigurations( paritionConfigurations );
}
Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java?view=diff&rev=487762&r1=487761&r2=487762
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java Fri Dec 15 21:54:38 2006
@@ -73,8 +73,7 @@
private Set authenticatorConfigurations; // Set<AuthenticatorConfiguration>
private List interceptorConfigurations; // Set<InterceptorConfiguration>
private PartitionConfiguration systemPartitionConfiguration;
- private Set bootstrapSchemas; // Set<BootstrapSchema>
- private Set contextPartitionConfigurations = new HashSet(); // Set<ContextPartitionConfiguration>
+ private Set<PartitionConfiguration> partitionConfigurations = new HashSet<PartitionConfiguration>();
private List testEntries = new ArrayList(); // List<Attributes>
@@ -233,16 +232,16 @@
/**
* Returns {@link PartitionConfiguration}s to configure context partitions.
*/
- public Set getContextPartitionConfigurations()
+ public Set getPartitionConfigurations()
{
- return ConfigurationUtil.getClonedSet( contextPartitionConfigurations );
+ return ConfigurationUtil.getClonedSet( partitionConfigurations );
}
/**
* Sets {@link PartitionConfiguration}s to configure context partitions.
*/
- protected void setContextPartitionConfigurations( Set contextParitionConfigurations )
+ protected void setPartitionConfigurations( Set contextParitionConfigurations )
{
Set newSet = ConfigurationUtil.getTypeSafeSet( contextParitionConfigurations,
PartitionConfiguration.class );
@@ -262,7 +261,7 @@
names.add( name );
}
- this.contextPartitionConfigurations = newSet;
+ this.partitionConfigurations = newSet;
}
Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?view=diff&rev=487762&r1=487761&r2=487762
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Fri Dec 15 21:54:38 2006
@@ -199,7 +199,7 @@
List<PartitionConfiguration> initializedPartitionCfgs = new ArrayList<PartitionConfiguration>();
initializedPartitionCfgs.add( initializeSystemPartition() );
- Iterator i = factoryCfg.getStartupConfiguration().getContextPartitionConfigurations().iterator();
+ Iterator i = factoryCfg.getStartupConfiguration().getPartitionConfigurations().iterator();
try
{
while ( i.hasNext() )
Modified: directory/branches/trunks/schema/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java?view=diff&rev=487762&r1=487761&r2=487762
==============================================================================
--- directory/branches/trunks/schema/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java (original)
+++ directory/branches/trunks/schema/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java Fri Dec 15 21:54:38 2006
@@ -167,7 +167,7 @@
partitions.add( getExamplePartition() );
partitions.add( getApachePartition() );
- config.setContextPartitionConfigurations( Collections.unmodifiableSet( partitions ) );
+ config.setPartitionConfigurations( Collections.unmodifiableSet( partitions ) );
return config.toJndiEnvironment();
}
Modified: directory/branches/trunks/schema/apacheds/server-jndi/src/main/java/org/apache/directory/server/configuration/MutableServerStartupConfiguration.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/server-jndi/src/main/java/org/apache/directory/server/configuration/MutableServerStartupConfiguration.java?view=diff&rev=487762&r1=487761&r2=487762
==============================================================================
--- directory/branches/trunks/schema/apacheds/server-jndi/src/main/java/org/apache/directory/server/configuration/MutableServerStartupConfiguration.java (original)
+++ directory/branches/trunks/schema/apacheds/server-jndi/src/main/java/org/apache/directory/server/configuration/MutableServerStartupConfiguration.java Fri Dec 15 21:54:38 2006
@@ -108,9 +108,9 @@
// }
//
- public void setContextPartitionConfigurations( Set arg0 )
+ public void setPartitionConfigurations( Set arg0 )
{
- super.setContextPartitionConfigurations( arg0 );
+ super.setPartitionConfigurations( arg0 );
}
Modified: directory/branches/trunks/schema/apacheds/server-unit/src/test/java/org/apache/directory/server/MiscTest.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/server-unit/src/test/java/org/apache/directory/server/MiscTest.java?view=diff&rev=487762&r1=487761&r2=487762
==============================================================================
--- directory/branches/trunks/schema/apacheds/server-unit/src/test/java/org/apache/directory/server/MiscTest.java (original)
+++ directory/branches/trunks/schema/apacheds/server-unit/src/test/java/org/apache/directory/server/MiscTest.java Fri Dec 15 21:54:38 2006
@@ -25,6 +25,7 @@
import netscape.ldap.LDAPException;
import org.apache.directory.server.core.configuration.MutablePartitionConfiguration;
+import org.apache.directory.server.core.configuration.PartitionConfiguration;
import org.apache.directory.server.unit.AbstractServerTest;
import org.apache.directory.shared.asn1.util.Asn1StringUtils;
import org.apache.directory.shared.ldap.message.Control;
@@ -78,8 +79,8 @@
}
else if ( this.getName().equals( "testUserAuthOnMixedCaseSuffix" ) )
{
- Set partitions = new HashSet();
- partitions.addAll( configuration.getContextPartitionConfigurations() );
+ Set<PartitionConfiguration> partitions = new HashSet();
+ partitions.addAll( configuration.getPartitionConfigurations() );
MutablePartitionConfiguration partition = new MutablePartitionConfiguration();
partition.setSuffix( "dc=aPache,dc=org" );
Attributes entry = new BasicAttributes( "dc", "aPache", true );
@@ -91,7 +92,7 @@
partition.setContextEntry( entry );
partition.setIndexedAttributes( Collections.singleton( "dc" ) );
partitions.add( partition );
- configuration.setContextPartitionConfigurations( partitions );
+ configuration.setPartitionConfigurations( partitions );
}
else if ( this.getName().equals( "testAnonymousBindsEnabledBaseSearch" ) )
{
@@ -100,7 +101,7 @@
// create a partition to search
Set partitions = new HashSet();
- partitions.addAll( configuration.getContextPartitionConfigurations() );
+ partitions.addAll( configuration.getPartitionConfigurations() );
MutablePartitionConfiguration partition = new MutablePartitionConfiguration();
partition.setSuffix( "dc=apache,dc=org" );
Attributes entry = new BasicAttributes( "dc", "apache", true );
@@ -112,7 +113,7 @@
partition.setContextEntry( entry );
partition.setIndexedAttributes( Collections.singleton( "dc" ) );
partitions.add( partition );
- configuration.setContextPartitionConfigurations( partitions );
+ configuration.setPartitionConfigurations( partitions );
}
super.setUp();
Modified: directory/branches/trunks/schema/apacheds/server-unit/src/test/java/org/apache/directory/server/jndi/ServerContextFactoryTest.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/server-unit/src/test/java/org/apache/directory/server/jndi/ServerContextFactoryTest.java?view=diff&rev=487762&r1=487761&r2=487762
==============================================================================
--- directory/branches/trunks/schema/apacheds/server-unit/src/test/java/org/apache/directory/server/jndi/ServerContextFactoryTest.java (original)
+++ directory/branches/trunks/schema/apacheds/server-unit/src/test/java/org/apache/directory/server/jndi/ServerContextFactoryTest.java Fri Dec 15 21:54:38 2006
@@ -129,7 +129,7 @@
pcfgs.add( pcfg );
- configuration.setContextPartitionConfigurations( pcfgs );
+ configuration.setPartitionConfigurations( pcfgs );
super.setUp();
}