directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1235328 [1/12] - in /directory/apacheds/trunk: server-annotations/src/main/java/org/apache/directory/server/annotations/ server-annotations/src/main/java/org/apache/directory/server/factory/ server-annotations/src/test/java/org/apache/dire...
Date Tue, 24 Jan 2012 16:22:36 GMT
Author: elecharny
Date: Tue Jan 24 16:22:33 2012
New Revision: 1235328

URL: http://svn.apache.org/viewvc?rev=1235328&view=rev
Log:
Formatted the code using Directory formatter

Modified:
    directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateConsumer.java
    directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateKdcServer.java
    directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateLdapServer.java
    directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateTransport.java
    directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/Sasl.java
    directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/SaslMechanism.java
    directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/TransportType.java
    directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/DefaultLdapServerFactory.java
    directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/LdapServerFactory.java
    directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java
    directory/apacheds/trunk/server-annotations/src/test/java/org/apache/directory/server/factory/CreateKdcServerAnnotationTest.java
    directory/apacheds/trunk/server-annotations/src/test/java/org/apache/directory/server/factory/DirectoryServiceAnnotationTest.java
    directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
    directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java
    directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java
    directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigurationException.java
    directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java
    directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/AdsBaseBean.java
    directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/AuthenticationInterceptorBean.java
    directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/AuthenticatorBean.java
    directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java
    directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DelegatingAuthenticatorBean.java
    directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java
    directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java
    directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java
    directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ChangePasswordConfigReaderTest.java
    directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
    directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigWriterTest.java
    directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/DhcpServerConfigReaderTest.java
    directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/DnsServerConfigReaderTest.java
    directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/HttpServerConfigReaderTest.java
    directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/KerberosServerConfigReaderTest.java
    directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/LdapServerConfigReaderTest.java
    directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/NtpServerConfigReaderTest.java
    directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/ServerIntegrationUtils.java
    directory/apacheds/trunk/server-integ/src/test/java/MultiThreadedTest.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/IndexTest.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointAddIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointModifyDelIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointModifyIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointPersistentIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/PasswordPolicyServiceIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddAliasIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/BindIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/DelegatedAuthIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/compare/CompareIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/compare/MatchingRuleCompareIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteAliasIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/DITUtilitiesSP.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/ExtendedIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/HelloWorldProcedure.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/AddIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/BindIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/CompareIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/DeleteIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/IllegalModificationIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/ModifyDnReferralIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/ModifyReferralIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupPerfIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyAddIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyMultipleChangesIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReferralIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyRemoveIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyDnReferralIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/NegationSearchIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchMoveAndRenameIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchNoRevertIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SchemaSearchIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchPerfIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientInitialRefreshIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/schema/SchemaIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsUpdateCertificateIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsConfidentialityIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsUpdateCertificateIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/suites/StockServerISuite.java
    directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
    directory/apacheds/trunk/server-jndi/src/test/java/org/apache/directory/server/configuration/ApacheDSTest.java

Modified: directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateConsumer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateConsumer.java?rev=1235328&r1=1235327&r2=1235328&view=diff
==============================================================================
--- directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateConsumer.java (original)
+++ directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateConsumer.java Tue Jan 24 16:22:33 2012
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.server.annotations;
 
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -30,6 +31,7 @@ import org.apache.directory.ldap.client.
 import org.apache.directory.shared.ldap.model.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.model.message.SearchScope;
 
+
 /**
  * A annotation used to define a replication consumer configuration. Many elements can be configured :
  * <ul>
@@ -58,66 +60,85 @@ import org.apache.directory.shared.ldap.
  */
 @Documented
 @Inherited
-@Retention ( RetentionPolicy.RUNTIME )
-@Target ( { ElementType.METHOD, ElementType.TYPE } )
+@Retention(RetentionPolicy.RUNTIME)
+@Target(
+    { ElementType.METHOD, ElementType.TYPE })
 public @interface CreateConsumer
 {
     /** host name of the syncrepl remote server, default value is localhost */
     String remoteHost() default "localhost";
 
+
     /** port number of the syncrepl provider server, default is 389 */
     int remotePort() default 389;
 
+
     /** replication user's Dn */
     String replUserDn();
 
+
     /** password for binding with replication user dn */
     String replUserPassword();
 
+
     /** flag to represent refresh and persist or refresh only mode, defaults to true */
     boolean refreshNPersist() default true;
 
+
     /** time interval for successive sync requests, default is 60 seconds */
     long refreshInterval() default 60 * 1000;
 
+
     /** the base Dn whose content will be searched for replicating */
     String baseDn();
 
+
     /** the ldap filter for fetching the entries, default value is (objectClass=*) */
     String filter() default "(objectClass=*)";
 
+
     /** names of attributes to be replicated, default value is all user attributes */
-    String[] attributes() default ""; 
+    String[] attributes() default "";
+
 
     /** the maximum number of search results to be fetched
      * default value is 0 (i.e no limit) */
     int searchSizeLimit() default 0;
 
+
     /** the timeout value to be used while doing a search 
      * default value is 0 (i.e no limit)*/
     int searchTimeout() default 0;
 
+
     /** the search scope, default is sub tree level */
     SearchScope searchScope() default SearchScope.SUBTREE;
 
+
     /** alias dereferencing mode, default is set to 'never deref aliases' */
     AliasDerefMode aliasDerefMode() default AliasDerefMode.NEVER_DEREF_ALIASES;
 
+
     /** the replica's id */
     int replicaId();
 
+
     /** The configuration entry DN */
     String configEntryDn() default "";
 
+
     /** flag to indicate whether to chase referrals or not, default is false hence passes ManageDsaITControl with syncsearch request*/
     boolean chaseReferrals() default false;
 
+
     /** flag to indicate the use of TLS, default is true */
     boolean useTls() default true;
 
+
     /** flag to indicate the use of strict certificate verification, default is true */
     boolean strictCertVerification() default true;
 
+
     /** the X509 certificate trust manager used, default value set to {@link NoVerificationTrustManager} */
     Class<?> trustManager() default NoVerificationTrustManager.class;
 }

Modified: directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateKdcServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateKdcServer.java?rev=1235328&r1=1235327&r2=1235328&view=diff
==============================================================================
--- directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateKdcServer.java (original)
+++ directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateKdcServer.java Tue Jan 24 16:22:33 2012
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.server.annotations;
 
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -40,25 +41,32 @@ import java.lang.annotation.Target;
  */
 @Documented
 @Inherited
-@Retention ( RetentionPolicy.RUNTIME )
-@Target ( { ElementType.METHOD, ElementType.TYPE } )
+@Retention(RetentionPolicy.RUNTIME)
+@Target(
+    { ElementType.METHOD, ElementType.TYPE })
 public @interface CreateKdcServer
 {
     /** The instance name */
     String name() default "DefaultKrbServer";
-    
+
+
     /** The transports to use, default to LDAP */
-    CreateTransport[] transports() default {};
-    
+    CreateTransport[] transports() default
+        {};
+
+
     /** The default kdc realm */
     String primaryRealm() default "EXAMPLE.COM";
-    
+
+
     /** The default kdc service principal */
     String kdcPrincipal() default "krbtgt/EXAMPLE.COM@EXAMPLE.COM";
-    
+
+
     /** The maximum ticket lifetime. */
     long maxTicketLifetime() default 60000 * 1440;
-    
+
+
     /** The maximum renewable lifetime. */
     long maxRenewableLifetime() default 60000 * 10080;
 }
\ No newline at end of file

Modified: directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateLdapServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateLdapServer.java?rev=1235328&r1=1235327&r2=1235328&view=diff
==============================================================================
--- directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateLdapServer.java (original)
+++ directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateLdapServer.java Tue Jan 24 16:22:33 2012
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.server.annotations;
 
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -43,46 +44,62 @@ import org.apache.directory.server.facto
  */
 @Documented
 @Inherited
-@Retention ( RetentionPolicy.RUNTIME )
-@Target ( { ElementType.METHOD, ElementType.TYPE } )
+@Retention(RetentionPolicy.RUNTIME)
+@Target(
+    { ElementType.METHOD, ElementType.TYPE })
 public @interface CreateLdapServer
 {
     /** The instance name */
     String name() default "DefaultLdapServer";
-    
+
+
     /** The transports to use, default to LDAP */
-    CreateTransport[] transports() default {};
-    
+    CreateTransport[] transports() default
+        {};
+
+
     /** The LdapServer factory */
     Class<?> factory() default DefaultLdapServerFactory.class;
-    
+
+
     /** The maximum size limit.*/
     long maxSizeLimit() default 1000;
-    
+
+
     /** The maximum time limit. */
     int maxTimeLimit() default 1000;
-    
+
+
     /** Tells if anonymous access are allowed or not. */
     boolean allowAnonymousAccess() default false;
-    
+
+
     /** The external keyStore file to use, default to the empty string */
     String keyStore() default "";
-    
+
+
     /** The certificate password in base64, default to the empty string */
     String certificatePassword() default "";
-    
+
+
     /** name of the classes implementing extended operations */
-    Class<?>[] extendedOpHandlers() default {};
-    
+    Class<?>[] extendedOpHandlers() default
+        {};
+
+
     /** supported set of SASL mechanisms */
-    SaslMechanism[] saslMechanisms() default {};
-    
+    SaslMechanism[] saslMechanisms() default
+        {};
+
+
     /** NTLM provider class, default value is a invalid class */
     Class<?> ntlmProvider() default Object.class;
-    
+
+
     /** The name of this host, validated during SASL negotiation. */
     String saslHost() default "ldap.example.com";
-    
+
+
     /** The service principal, used by GSSAPI. */
     String saslPrincipal() default "ldap/ldap.example.com@EXAMPLE.COM";
 }
\ No newline at end of file

Modified: directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateTransport.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateTransport.java?rev=1235328&r1=1235327&r2=1235328&view=diff
==============================================================================
--- directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateTransport.java (original)
+++ directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateTransport.java Tue Jan 24 16:22:33 2012
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.server.annotations;
 
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -35,29 +36,36 @@ import java.lang.annotation.Target;
  */
 @Documented
 @Inherited
-@Retention ( RetentionPolicy.RUNTIME )
-@Target ( { ElementType.METHOD, ElementType.TYPE } )
+@Retention(RetentionPolicy.RUNTIME)
+@Target(
+    { ElementType.METHOD, ElementType.TYPE })
 public @interface CreateTransport
 {
     /** The name for this protocol*/
     String protocol();
-    
+
+
     /** The transport type (TCP or UDP) Default to TCP */
     TransportType type() default TransportType.TCP;
-    
+
+
     /** The port to use, default to a bad value so that we know 
      * we have to pick one random available port */
     int port() default -1;
-    
+
+
     /** The InetAddress for this transport. Default to localhost */
     String address() default "localhost";
-    
+
+
     /** The backlog. Default to 50 */
     int backlog() default 50;
-    
+
+
     /** A flag to tell if the transport is SSL based. Default to false */
     boolean ssl() default false;
-    
+
+
     /** The number of threads to use. Default to 3*/
     int nbThreads() default 3;
 }
\ No newline at end of file

Modified: directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/Sasl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/Sasl.java?rev=1235328&r1=1235327&r2=1235328&view=diff
==============================================================================
--- directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/Sasl.java (original)
+++ directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/Sasl.java Tue Jan 24 16:22:33 2012
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.server.annotations;
 
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -46,29 +47,36 @@ import org.apache.directory.server.ldap.
  */
 @Documented
 @Inherited
-@Retention ( RetentionPolicy.RUNTIME )
-@Target ( { ElementType.METHOD, ElementType.TYPE } )
+@Retention(RetentionPolicy.RUNTIME)
+@Target(
+    { ElementType.METHOD, ElementType.TYPE })
 public @interface Sasl
 {
     /** The SASL host, default to localhost */
     String host() default "localhost";
-    
+
+
     /** The principal */
     String principal();
-    
+
+
     /** The SASL QOP list */
-    String[] qop() default { "auth", "auth-int", "auth-conf" };
-    
+    String[] qop() default
+        { "auth", "auth-int", "auth-conf" };
+
+
     /** The SASL realms */
-    String[] realms() default {};
-    
+    String[] realms() default
+        {};
+
+
     /** The mechanism handlers.*/
-    Class<?>[] mechanismHandler() default 
-        { 
+    Class<?>[] mechanismHandler() default
+        {
             SimpleMechanismHandler.class,
             CramMd5MechanismHandler.class,
             DigestMd5MechanismHandler.class,
             GssapiMechanismHandler.class,
             NtlmMechanismHandler.class
-        };
+    };
 }
\ No newline at end of file

Modified: directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/SaslMechanism.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/SaslMechanism.java?rev=1235328&r1=1235327&r2=1235328&view=diff
==============================================================================
--- directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/SaslMechanism.java (original)
+++ directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/SaslMechanism.java Tue Jan 24 16:22:33 2012
@@ -20,6 +20,7 @@
 
 package org.apache.directory.server.annotations;
 
+
 /**
  * TODO SaslMechanism.
  *
@@ -29,7 +30,8 @@ public @interface SaslMechanism
 {
     /** name of the SASL mechanism */
     String name();
-    
+
+
     /** class implementing the named SASL mechanism */
     Class<?> implClass();
 }

Modified: directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/TransportType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/TransportType.java?rev=1235328&r1=1235327&r2=1235328&view=diff
==============================================================================
--- directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/TransportType.java (original)
+++ directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/TransportType.java Tue Jan 24 16:22:33 2012
@@ -20,6 +20,7 @@
 
 package org.apache.directory.server.annotations;
 
+
 /**
  * The two different type of Transport
  *

Modified: directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/DefaultLdapServerFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/DefaultLdapServerFactory.java?rev=1235328&r1=1235327&r2=1235328&view=diff
==============================================================================
--- directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/DefaultLdapServerFactory.java (original)
+++ directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/DefaultLdapServerFactory.java Tue Jan 24 16:22:33 2012
@@ -19,9 +19,11 @@
  */
 package org.apache.directory.server.factory;
 
+
 import org.apache.directory.server.core.api.DirectoryService;
 import org.apache.directory.server.ldap.LdapServer;
 
+
 /**
  * The default LdapServer factory
  *
@@ -30,26 +32,27 @@ import org.apache.directory.server.ldap.
 public class DefaultLdapServerFactory implements LdapServerFactory
 {
     private LdapServer ldapServer;
-    
+
     /** The DirectoryService instance */
     private DirectoryService directoryService = null;
-    
-    
+
+
     public DefaultLdapServerFactory() throws Exception
     {
     }
 
+
     public void init()
     {
     }
 
-    
+
     public LdapServer getLdapServer()
     {
         return ldapServer;
     }
-    
-    
+
+
     /**
      * @return the directoryService
      */
@@ -58,6 +61,7 @@ public class DefaultLdapServerFactory im
         return directoryService;
     }
 
+
     public void setDirectoryService( DirectoryService directoryService )
     {
         this.directoryService = directoryService;

Modified: directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/LdapServerFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/LdapServerFactory.java?rev=1235328&r1=1235327&r2=1235328&view=diff
==============================================================================
--- directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/LdapServerFactory.java (original)
+++ directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/LdapServerFactory.java Tue Jan 24 16:22:33 2012
@@ -19,8 +19,10 @@
  */
 package org.apache.directory.server.factory;
 
+
 import org.apache.directory.server.ldap.LdapServer;
 
+
 /**
  * 
  * TODO LdapServerFactory.
@@ -30,6 +32,7 @@ import org.apache.directory.server.ldap.
 public interface LdapServerFactory
 {
     void init();
-    
+
+
     LdapServer getLdapServer();
 }

Modified: directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java?rev=1235328&r1=1235327&r2=1235328&view=diff
==============================================================================
--- directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java (original)
+++ directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java Tue Jan 24 16:22:33 2012
@@ -18,6 +18,7 @@
  */
 package org.apache.directory.server.factory;
 
+
 import java.io.IOException;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -48,6 +49,7 @@ import org.apache.directory.shared.util.
 import org.apache.mina.util.AvailablePortFinder;
 import org.junit.runner.Description;
 
+
 /**
  * 
  * Annotation processor for creating LDAP and Kerberos servers.
@@ -67,15 +69,15 @@ public class ServerAnnotationProcessor
                 int nbThreads = transportBuilder.nbThreads();
                 int backlog = transportBuilder.backlog();
                 String address = transportBuilder.address();
-                
+
                 if ( port <= 0 )
                 {
                     try
                     {
-                        ServerSocket ss = new ServerSocket(0);
-                        
+                        ServerSocket ss = new ServerSocket( 0 );
+
                         port = ss.getLocalPort();
-                        
+
                         ss.close();
                     }
                     catch ( IOException ioe )
@@ -83,7 +85,7 @@ public class ServerAnnotationProcessor
                         // Don't know what to do here...
                     }
                 }
-                
+
                 if ( protocol.equalsIgnoreCase( "LDAP" ) )
                 {
                     Transport ldap = new TcpTransport( address, port, nbThreads, backlog );
@@ -107,14 +109,15 @@ public class ServerAnnotationProcessor
             int port = AvailablePortFinder.getNextAvailable( 1024 );
             Transport ldap = new TcpTransport( port );
             ldapServer.addTransports( ldap );
-            
+
             port = AvailablePortFinder.getNextAvailable( port );
             Transport ldaps = new TcpTransport( port );
             ldaps.setEnableSSL( true );
             ldapServer.addTransports( ldaps );
         }
     }
-    
+
+
     /**
      * Just gives an instance of {@link LdapServer} without starting it.
      * For getting a running LdapServer instance see {@link #createLdapServer(CreateLdapServer, DirectoryService)}
@@ -125,70 +128,72 @@ public class ServerAnnotationProcessor
         if ( createLdapServer != null )
         {
             LdapServer ldapServer = new LdapServer();
-            
+
             ldapServer.setServiceName( createLdapServer.name() );
-            
+
             // Read the transports
             createTransports( ldapServer, createLdapServer.transports() );
-            
+
             // Associate the DS to this LdapServer
             ldapServer.setDirectoryService( directoryService );
-            
+
             ldapServer.setSaslHost( createLdapServer.saslHost() );
-            
+
             ldapServer.setSaslPrincipal( createLdapServer.saslPrincipal() );
-            
-            if( !Strings.isEmpty( createLdapServer.keyStore() ) )
+
+            if ( !Strings.isEmpty( createLdapServer.keyStore() ) )
             {
                 ldapServer.setKeystoreFile( createLdapServer.keyStore() );
                 ldapServer.setCertificatePassword( createLdapServer.certificatePassword() );
             }
-            
-            for( Class<?> extOpClass : createLdapServer.extendedOpHandlers() )
+
+            for ( Class<?> extOpClass : createLdapServer.extendedOpHandlers() )
             {
                 try
                 {
                     ExtendedOperationHandler extOpHandler = ( ExtendedOperationHandler ) extOpClass.newInstance();
                     ldapServer.addExtendedOperationHandler( extOpHandler );
                 }
-                catch( Exception e )
+                catch ( Exception e )
                 {
                     throw new RuntimeException( I18n.err( I18n.ERR_690, extOpClass.getName() ), e );
                 }
             }
-            
-            for( SaslMechanism saslMech : createLdapServer.saslMechanisms() )
+
+            for ( SaslMechanism saslMech : createLdapServer.saslMechanisms() )
             {
                 try
                 {
                     MechanismHandler handler = ( MechanismHandler ) saslMech.implClass().newInstance();
                     ldapServer.addSaslMechanismHandler( saslMech.name(), handler );
                 }
-                catch( Exception e )
+                catch ( Exception e )
                 {
-                    throw new RuntimeException( I18n.err( I18n.ERR_691, saslMech.name(), saslMech.implClass().getName() ), e );
+                    throw new RuntimeException(
+                        I18n.err( I18n.ERR_691, saslMech.name(), saslMech.implClass().getName() ), e );
                 }
             }
-            
-            NtlmMechanismHandler ntlmHandler = ( NtlmMechanismHandler ) ldapServer.getSaslMechanismHandlers().get( SupportedSaslMechanisms.NTLM );
-           
-            if( ntlmHandler != null )
+
+            NtlmMechanismHandler ntlmHandler = ( NtlmMechanismHandler ) ldapServer.getSaslMechanismHandlers().get(
+                SupportedSaslMechanisms.NTLM );
+
+            if ( ntlmHandler != null )
             {
                 Class<?> ntlmProviderClass = createLdapServer.ntlmProvider();
                 // default value is a invalid Object.class
-                if( ( ntlmProviderClass != null ) && ( ntlmProviderClass != Object.class ) )
+                if ( ( ntlmProviderClass != null ) && ( ntlmProviderClass != Object.class ) )
                 {
                     try
                     {
                         ntlmHandler.setNtlmProvider( ( NtlmProvider ) ntlmProviderClass.newInstance() );
                     }
-                    catch( Exception e )
+                    catch ( Exception e )
                     {
                         throw new RuntimeException( I18n.err( I18n.ERR_692 ), e );
                     }
                 }
             }
-            
+
             return ldapServer;
         }
         else
@@ -196,8 +201,8 @@ public class ServerAnnotationProcessor
             return null;
         }
     }
-    
-    
+
+
     /**
      * Returns an LdapServer instance and starts it before returning the instance, infering
      * the configuration from the Stack trace
@@ -208,25 +213,25 @@ public class ServerAnnotationProcessor
     {
         Object instance = AnnotationUtils.getInstance( CreateLdapServer.class );
         LdapServer ldapServer = null;
-        
+
         if ( instance != null )
         {
-            CreateLdapServer createLdapServer = (CreateLdapServer)instance;
-            
+            CreateLdapServer createLdapServer = ( CreateLdapServer ) instance;
+
             ldapServer = createLdapServer( createLdapServer, directoryService );
         }
 
         return ldapServer;
     }
-    
-    
+
+
     /**
      * Create a replication consumer
      */
     private static ReplicationConsumer createConsumer( CreateConsumer createConsumer )
     {
         ReplicationConsumer consumer = new ReplicationConsumerImpl();
-        
+
         SyncreplConfiguration config = new SyncreplConfiguration();
         config.setRemoteHost( createConsumer.remoteHost() );
         config.setRemotePort( createConsumer.remotePort() );
@@ -235,13 +240,13 @@ public class ServerAnnotationProcessor
         config.setUseTls( createConsumer.useTls() );
         config.setBaseDn( createConsumer.baseDn() );
         config.setRefreshInterval( createConsumer.refreshInterval() );
-        
+
         consumer.setConfig( config );
 
         return consumer;
     }
-    
-    
+
+
     /**
      * creates an LdapServer and starts before returning the instance, infering
      * the configuration from the Stack trace
@@ -252,18 +257,18 @@ public class ServerAnnotationProcessor
     {
         Object instance = AnnotationUtils.getInstance( CreateConsumer.class );
         ReplicationConsumer consumer = null;
-        
+
         if ( instance != null )
         {
-            CreateConsumer createConsumer = (CreateConsumer)instance;
-            
+            CreateConsumer createConsumer = ( CreateConsumer ) instance;
+
             consumer = createConsumer( createConsumer );
         }
 
         return consumer;
     }
 
-    
+
     /**
      * creates an LdapServer and starts before returning the instance
      *  
@@ -274,12 +279,12 @@ public class ServerAnnotationProcessor
     private static LdapServer createLdapServer( CreateLdapServer createLdapServer, DirectoryService directoryService )
     {
         LdapServer ldapServer = instantiateLdapServer( createLdapServer, directoryService );
-        
+
         if ( ldapServer == null )
         {
             return null;
         }
-        
+
         // Launch the server
         try
         {
@@ -289,7 +294,7 @@ public class ServerAnnotationProcessor
         {
             e.printStackTrace();
         }
-        
+
         return ldapServer;
     }
 
@@ -330,25 +335,25 @@ public class ServerAnnotationProcessor
 
         // Check if we have any annotation associated with the method
         Method[] methods = classCaller.getMethods();
-        
+
         for ( Method method : methods )
         {
             if ( methodCaller.equals( method.getName() ) )
             {
                 Annotation annotation = method.getAnnotation( annotationClass );
-                
+
                 if ( annotation != null )
                 {
                     return annotation;
                 }
             }
         }
-        
+
         // No : look at the class level
         return classCaller.getAnnotation( annotationClass );
     }
-    
-    
+
+
     public static KdcServer getKdcServer( DirectoryService directoryService, int startPort ) throws Exception
     {
         CreateKdcServer createKdcServer = ( CreateKdcServer ) getAnnotation( CreateKdcServer.class );
@@ -356,32 +361,33 @@ public class ServerAnnotationProcessor
         return createKdcServer( createKdcServer, directoryService, startPort );
     }
 
-    
-    private static KdcServer createKdcServer( CreateKdcServer createKdcServer, DirectoryService directoryService, int startPort )
+
+    private static KdcServer createKdcServer( CreateKdcServer createKdcServer, DirectoryService directoryService,
+        int startPort )
     {
-        if( createKdcServer == null )
+        if ( createKdcServer == null )
         {
             return null;
         }
-        
+
         KdcServer kdcServer = new KdcServer();
         kdcServer.setServiceName( createKdcServer.name() );
         kdcServer.setKdcPrincipal( createKdcServer.kdcPrincipal() );
         kdcServer.setPrimaryRealm( createKdcServer.primaryRealm() );
         kdcServer.setMaximumTicketLifetime( createKdcServer.maxTicketLifetime() );
         kdcServer.setMaximumRenewableLifetime( createKdcServer.maxRenewableLifetime() );
-        
+
         CreateTransport[] transportBuilders = createKdcServer.transports();
-        
-        if( transportBuilders == null )
+
+        if ( transportBuilders == null )
         {
             // create only UDP transport if none specified
             UdpTransport defaultTransport = new UdpTransport( AvailablePortFinder.getNextAvailable( startPort ) );
             kdcServer.addTransports( defaultTransport );
         }
-        else if( transportBuilders.length > 0 )
+        else if ( transportBuilders.length > 0 )
         {
-            for( CreateTransport transportBuilder : transportBuilders )
+            for ( CreateTransport transportBuilder : transportBuilders )
             {
                 String protocol = transportBuilder.protocol();
                 int port = transportBuilder.port();
@@ -394,7 +400,7 @@ public class ServerAnnotationProcessor
                     port = AvailablePortFinder.getNextAvailable( startPort );
                     startPort = port + 1;
                 }
-                
+
                 if ( protocol.equalsIgnoreCase( "TCP" ) )
                 {
                     Transport tcp = new TcpTransport( address, port, nbThreads, backlog );
@@ -411,9 +417,9 @@ public class ServerAnnotationProcessor
                 }
             }
         }
-        
+
         kdcServer.setDirectoryService( directoryService );
-        
+
         // Launch the server
         try
         {
@@ -423,12 +429,13 @@ public class ServerAnnotationProcessor
         {
             e.printStackTrace();
         }
-        
+
         return kdcServer;
     }
-    
-    
-    public static KdcServer getKdcServer( Description description, DirectoryService directoryService, int startPort ) throws Exception
+
+
+    public static KdcServer getKdcServer( Description description, DirectoryService directoryService, int startPort )
+        throws Exception
     {
         CreateKdcServer createLdapServer = description.getAnnotation( CreateKdcServer.class );
 

Modified: directory/apacheds/trunk/server-annotations/src/test/java/org/apache/directory/server/factory/CreateKdcServerAnnotationTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-annotations/src/test/java/org/apache/directory/server/factory/CreateKdcServerAnnotationTest.java?rev=1235328&r1=1235327&r2=1235328&view=diff
==============================================================================
--- directory/apacheds/trunk/server-annotations/src/test/java/org/apache/directory/server/factory/CreateKdcServerAnnotationTest.java (original)
+++ directory/apacheds/trunk/server-annotations/src/test/java/org/apache/directory/server/factory/CreateKdcServerAnnotationTest.java Tue Jan 24 16:22:33 2012
@@ -20,6 +20,7 @@
 
 package org.apache.directory.server.factory;
 
+
 import static org.junit.Assert.assertEquals;
 
 import org.apache.commons.io.FileUtils;
@@ -32,6 +33,7 @@ import org.apache.directory.server.kerbe
 import org.apache.mina.util.AvailablePortFinder;
 import org.junit.Test;
 
+
 /**
  * Test the Kerberos Server annotation processing
  *
@@ -39,36 +41,37 @@ import org.junit.Test;
  */
 @CreateDS(name = "CreateKdcServerAnnotationTest-class")
 @CreateKdcServer(primaryRealm = "apache.org",
-                 kdcPrincipal = "krbtgt/apache.org@apache.org",
-                 maxTicketLifetime = 1000,
-                 maxRenewableLifetime = 2000,
-                 transports = 
-                 { 
-                     @CreateTransport(protocol = "TCP"),
-                     @CreateTransport(protocol = "UDP")
-                 })
+    kdcPrincipal = "krbtgt/apache.org@apache.org",
+    maxTicketLifetime = 1000,
+    maxRenewableLifetime = 2000,
+    transports =
+        {
+            @CreateTransport(protocol = "TCP"),
+            @CreateTransport(protocol = "UDP")
+    })
 public class CreateKdcServerAnnotationTest
 {
     @Test
     public void testCreateKdcServer() throws Exception
     {
         DirectoryService directoryService = DSAnnotationProcessor.getDirectoryService();
-        
+
         assertEquals( "CreateKdcServerAnnotationTest-class", directoryService.getInstanceId() );
-        
-        KdcServer server = ServerAnnotationProcessor.getKdcServer( directoryService, AvailablePortFinder.getNextAvailable( 1024 ) );
+
+        KdcServer server = ServerAnnotationProcessor.getKdcServer( directoryService,
+            AvailablePortFinder.getNextAvailable( 1024 ) );
 
         assertEquals( 2, server.getTransports().length );
-        
+
         assertEquals( directoryService, server.getDirectoryService() );
         assertEquals( "apache.org", server.getPrimaryRealm() );
         assertEquals( "krbtgt/apache.org@apache.org", server.getServicePrincipal().getName() );
         assertEquals( 1000, server.getMaximumTicketLifetime() );
         assertEquals( 2000, server.getMaximumRenewableLifetime() );
-        
+
         server.stop();
         directoryService.shutdown();
-        
+
         FileUtils.deleteDirectory( directoryService.getInstanceLayout().getInstanceDirectory() );
     }
 }

Modified: directory/apacheds/trunk/server-annotations/src/test/java/org/apache/directory/server/factory/DirectoryServiceAnnotationTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-annotations/src/test/java/org/apache/directory/server/factory/DirectoryServiceAnnotationTest.java?rev=1235328&r1=1235327&r2=1235328&view=diff
==============================================================================
--- directory/apacheds/trunk/server-annotations/src/test/java/org/apache/directory/server/factory/DirectoryServiceAnnotationTest.java (original)
+++ directory/apacheds/trunk/server-annotations/src/test/java/org/apache/directory/server/factory/DirectoryServiceAnnotationTest.java Tue Jan 24 16:22:33 2012
@@ -58,7 +58,7 @@ import org.junit.Test;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-@CreateDS( name = "classDS" )
+@CreateDS(name = "classDS")
 public class DirectoryServiceAnnotationTest
 {
     /**
@@ -81,74 +81,74 @@ public class DirectoryServiceAnnotationT
         env.put( Context.SECURITY_AUTHENTICATION, "simple" );
         return new InitialLdapContext( env, JndiUtils.toJndiControls( LdapApiServiceFactory.getSingleton(), controls ) );
     }
-    
+
 
     @Test
     public void testCreateDS() throws Exception
     {
         DirectoryService service = DSAnnotationProcessor.getDirectoryService();
-        
+
         assertTrue( service.isStarted() );
         assertEquals( "classDS", service.getInstanceId() );
-        
+
         service.shutdown();
         FileUtils.deleteDirectory( service.getInstanceLayout().getInstanceDirectory() );
     }
 
 
     @Test
-    @CreateDS( name = "methodDS" )
+    @CreateDS(name = "methodDS")
     public void testCreateMethodDS() throws Exception
     {
         DirectoryService service = DSAnnotationProcessor.getDirectoryService();
-        
+
         assertTrue( service.isStarted() );
         assertEquals( "methodDS", service.getInstanceId() );
-        
+
         service.shutdown();
         FileUtils.deleteDirectory( service.getInstanceLayout().getInstanceDirectory() );
     }
-    
-    
+
+
     @Test
-    @CreateDS( 
+    @CreateDS(
         name = "MethodDSWithPartition",
         partitions =
-        {
-            @CreatePartition(
-                name = "example",
-                suffix = "dc=example,dc=com",
-                contextEntry = @ContextEntry( 
-                    entryLdif =
+            {
+                @CreatePartition(
+                    name = "example",
+                    suffix = "dc=example,dc=com",
+                    contextEntry = @ContextEntry(
+                        entryLdif =
                         "dn: dc=example,dc=com\n" +
-                        "dc: example\n" +
-                        "objectClass: top\n" +
-                        "objectClass: domain\n\n" ),
-                indexes = 
-                {
-                    @CreateIndex( attribute = "objectClass" ),
-                    @CreateIndex( attribute = "dc" ),
-                    @CreateIndex( attribute = "ou" )
-                } )
-        } )
+                            "dc: example\n" +
+                            "objectClass: top\n" +
+                            "objectClass: domain\n\n"),
+                    indexes =
+                        {
+                            @CreateIndex(attribute = "objectClass"),
+                            @CreateIndex(attribute = "dc"),
+                            @CreateIndex(attribute = "ou")
+                    })
+        })
     public void testCreateMethodDSWithPartition() throws Exception
     {
         DirectoryService service = DSAnnotationProcessor.getDirectoryService();
-        
+
         assertTrue( service.isStarted() );
         assertEquals( "MethodDSWithPartition", service.getInstanceId() );
-        
+
         Set<String> expectedNames = new HashSet<String>();
-        
+
         expectedNames.add( "example" );
         expectedNames.add( "schema" );
-        
+
         assertEquals( 2, service.getPartitions().size() );
-        
+
         for ( Partition partition : service.getPartitions() )
         {
             assertTrue( expectedNames.contains( partition.getId() ) );
-            
+
             if ( "example".equalsIgnoreCase( partition.getId() ) )
             {
                 assertTrue( partition.isInitialized() );
@@ -160,62 +160,61 @@ public class DirectoryServiceAnnotationT
                 assertEquals( "ou=schema", partition.getSuffixDn().getName() );
             }
         }
-        
+
         assertTrue( service.getAdminSession().exists( new Dn( "dc=example,dc=com" ) ) );
 
         service.shutdown();
         FileUtils.deleteDirectory( service.getInstanceLayout().getInstanceDirectory() );
     }
-    
-    
+
+
     @Test
-    @CreateDS( 
+    @CreateDS(
         name = "MethodDSWithPartitionAndServer",
         partitions =
-        {
-            @CreatePartition(
-                name = "example",
-                suffix = "dc=example,dc=com",
-                contextEntry = @ContextEntry( 
-                    entryLdif =
+            {
+                @CreatePartition(
+                    name = "example",
+                    suffix = "dc=example,dc=com",
+                    contextEntry = @ContextEntry(
+                        entryLdif =
                         "dn: dc=example,dc=com\n" +
-                        "dc: example\n" +
-                        "objectClass: top\n" +
-                        "objectClass: domain\n\n" ),
-                indexes = 
-                {
-                    @CreateIndex( attribute = "objectClass" ),
-                    @CreateIndex( attribute = "dc" ),
-                    @CreateIndex( attribute = "ou" )
-                } )
-        } )
-    @CreateLdapServer ( 
-        transports = 
-        {
-            @CreateTransport( protocol = "LDAP" ), 
-            @CreateTransport( protocol = "LDAPS" ) 
+                            "dc: example\n" +
+                            "objectClass: top\n" +
+                            "objectClass: domain\n\n"),
+                    indexes =
+                        {
+                            @CreateIndex(attribute = "objectClass"),
+                            @CreateIndex(attribute = "dc"),
+                            @CreateIndex(attribute = "ou")
+                    })
+        })
+    @CreateLdapServer(
+        transports =
+            {
+                @CreateTransport(protocol = "LDAP"),
+                @CreateTransport(protocol = "LDAPS")
         })
     public void testCreateLdapServer() throws Exception
     {
         // First, get the service
         DirectoryService service = DSAnnotationProcessor.getDirectoryService();
-        
+
         // Check that the service is running
         assertTrue( service.isStarted() );
         assertEquals( "MethodDSWithPartitionAndServer", service.getInstanceId() );
-        
-        
+
         Set<String> expectedNames = new HashSet<String>();
-        
+
         expectedNames.add( "example" );
         expectedNames.add( "schema" );
-        
+
         assertEquals( 2, service.getPartitions().size() );
-        
+
         for ( Partition partition : service.getPartitions() )
         {
             assertTrue( expectedNames.contains( partition.getId() ) );
-            
+
             if ( "example".equalsIgnoreCase( partition.getId() ) )
             {
                 assertTrue( partition.isInitialized() );
@@ -227,7 +226,7 @@ public class DirectoryServiceAnnotationT
                 assertEquals( "ou=schema", partition.getSuffixDn().getName() );
             }
         }
-        
+
         assertTrue( service.getAdminSession().exists( new Dn( "dc=example,dc=com" ) ) );
 
         // Now, get the server
@@ -235,24 +234,25 @@ public class DirectoryServiceAnnotationT
 
         // Check that the server is running
         assertTrue( ldapServer.isStarted() );
-        
+
         // Try to read an entry in the server
         LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer, null ).lookup( "dc=example,dc=com" );
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.OBJECT_SCOPE );
-        controls.setReturningAttributes( new String[]{"*"} );
-        
+        controls.setReturningAttributes( new String[]
+            { "*" } );
+
         NamingEnumeration<SearchResult> enumeration = ctx.search( "", "(objectClass=*)", controls );
-        
+
         // collect all results 
         HashSet<String> results = new HashSet<String>();
-        
+
         while ( enumeration.hasMore() )
         {
             SearchResult result = enumeration.next();
             results.add( result.getNameInNamespace() );
         }
-        
+
         assertEquals( 1, results.size() );
         assertTrue( results.contains( "dc=example,dc=com" ) );
 
@@ -260,7 +260,7 @@ public class DirectoryServiceAnnotationT
         ctx.close();
         ldapServer.stop();
         service.shutdown();
-        
+
         FileUtils.deleteDirectory( service.getInstanceLayout().getInstanceDirectory() );
     }
 }

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java?rev=1235328&r1=1235327&r2=1235328&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java Tue Jan 24 16:22:33 2012
@@ -577,13 +577,14 @@ public class ConfigPartitionReader
                     {
                         // Try by removing 'es'
                         attributeName = fieldName.substring( 0, fieldName.length() - 2 );
-                        
+
                         // if not found try by removing 'ies' and adding 'y' , e.x ads-passwordPolicies
-                        if ( fieldName.endsWith( "ies" ) && !schemaManager.getObjectClassRegistry().contains( attributeName ) )
+                        if ( fieldName.endsWith( "ies" )
+                            && !schemaManager.getObjectClassRegistry().contains( attributeName ) )
                         {
                             attributeName = fieldName.substring( 0, fieldName.length() - 3 ) + "y";
                         }
-                        
+
                         if ( !schemaManager.getObjectClassRegistry().contains( attributeName ) )
                         {
                             String message = "Cannot find the ObjectClass named " + attributeName + " in the schema";

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java?rev=1235328&r1=1235327&r2=1235328&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java Tue Jan 24 16:22:33 2012
@@ -31,260 +31,259 @@ public enum ConfigSchemaConstants
     //------------------------------------------------------------------------------------
     // The ObjectClasses
     //------------------------------------------------------------------------------------
-    ADS_BASE_OC( "ads-base", "1.3.6.1.4.1.18060.0.4.1.3.1" ),
+    ADS_BASE_OC("ads-base", "1.3.6.1.4.1.18060.0.4.1.3.1"),
 
-    ADS_TRANSPORT_OC( "ads-transport", "1.3.6.1.4.1.18060.0.4.1.3.18" ),
+    ADS_TRANSPORT_OC("ads-transport", "1.3.6.1.4.1.18060.0.4.1.3.18"),
 
-    ADS_TCP_TRANSPORT_OC( "ads-tpTransport", "1.3.6.1.4.1.18060.0.4.1.3.19" ),
+    ADS_TCP_TRANSPORT_OC("ads-tpTransport", "1.3.6.1.4.1.18060.0.4.1.3.19"),
 
-    ADS_UDP_TRANSPORT_OC( "ads-udpTransport", "1.3.6.1.4.1.18060.0.4.1.3.20" ),
+    ADS_UDP_TRANSPORT_OC("ads-udpTransport", "1.3.6.1.4.1.18060.0.4.1.3.20"),
 
-    ADS_DIRECTORY_SERVICE_OC( "ads-directoryService", "1.3.6.1.4.1.18060.0.4.1.3.100" ),
+    ADS_DIRECTORY_SERVICE_OC("ads-directoryService", "1.3.6.1.4.1.18060.0.4.1.3.100"),
 
-    ADS_CHANGE_LOG_OC( "ads-changeLog", "1.3.6.1.4.1.18060.0.4.1.3.120" ),
+    ADS_CHANGE_LOG_OC("ads-changeLog", "1.3.6.1.4.1.18060.0.4.1.3.120"),
 
-    ADS_INTERCEPTOR_LOG_OC( "ads-interceptor", "1.3.6.1.4.1.18060.0.4.1.3.130" ),
+    ADS_INTERCEPTOR_LOG_OC("ads-interceptor", "1.3.6.1.4.1.18060.0.4.1.3.130"),
 
-    ADS_JOURNAL_OC( "ads-journal", "1.3.6.1.4.1.18060.0.4.1.3.140" ),
+    ADS_JOURNAL_OC("ads-journal", "1.3.6.1.4.1.18060.0.4.1.3.140"),
 
-    ADS_PARTITION_OC( "ads-partition", "1.3.6.1.4.1.18060.0.4.1.3.150" ),
+    ADS_PARTITION_OC("ads-partition", "1.3.6.1.4.1.18060.0.4.1.3.150"),
 
-    ADS_JDBM_PARTITION_OC( "ads-jdbmPartition", "1.3.6.1.4.1.18060.0.4.1.3.151" ),
+    ADS_JDBM_PARTITION_OC("ads-jdbmPartition", "1.3.6.1.4.1.18060.0.4.1.3.151"),
 
-    ADS_INDEX_OC( "ads-index", "1.3.6.1.4.1.18060.0.4.1.3.160" ),
-    
-    ADS_JDBM_INDEX_OC( "ads-jdbmIndex", "1.3.6.1.4.1.18060.0.4.1.3.161" ),
+    ADS_INDEX_OC("ads-index", "1.3.6.1.4.1.18060.0.4.1.3.160"),
 
-    ADS_SERVER_OC( "ads-server", "1.3.6.1.4.1.18060.0.4.1.3.250" ),
+    ADS_JDBM_INDEX_OC("ads-jdbmIndex", "1.3.6.1.4.1.18060.0.4.1.3.161"),
 
-    ADS_DS_BASED_SERVER_OC( "ads-dsBasedServer", "1.3.6.1.4.1.18060.0.4.1.3.260" ),
+    ADS_SERVER_OC("ads-server", "1.3.6.1.4.1.18060.0.4.1.3.250"),
 
-    ADS_LDAP_SERVER_OC( "ads-ldapServer", "1.3.6.1.4.1.18060.0.4.1.3.300" ),
+    ADS_DS_BASED_SERVER_OC("ads-dsBasedServer", "1.3.6.1.4.1.18060.0.4.1.3.260"),
 
-    ADS_KERBEROS_SERVER_OC( "ads-kdcServer", "1.3.6.1.4.1.18060.0.4.1.3.400" ),
+    ADS_LDAP_SERVER_OC("ads-ldapServer", "1.3.6.1.4.1.18060.0.4.1.3.300"),
 
-    ADS_DNS_SERVER_OC( "ads-dnsServer", "1.3.6.1.4.1.18060.0.4.1.3.500" ),
+    ADS_KERBEROS_SERVER_OC("ads-kdcServer", "1.3.6.1.4.1.18060.0.4.1.3.400"),
 
-    ADS_DHCP_SERVER_OC( "ads-dhcpServer", "1.3.6.1.4.1.18060.0.4.1.3.600" ),
+    ADS_DNS_SERVER_OC("ads-dnsServer", "1.3.6.1.4.1.18060.0.4.1.3.500"),
 
-    ADS_NTP_SERVER_OC( "ads-ntpServer", "1.3.6.1.4.1.18060.0.4.1.3.700" ),
+    ADS_DHCP_SERVER_OC("ads-dhcpServer", "1.3.6.1.4.1.18060.0.4.1.3.600"),
 
-    ADS_CHANGE_PASSWORD_SERVER_OC( "ads-changePasswordServer", "1.3.6.1.4.1.18060.0.4.1.3.800" ),
-    
-    ADS_LDAP_SERVER_SASL_MECH_HANDLER_OC( "ads-ldapServerSaslMechanismHandler", "1.3.6.1.4.1.18060.0.4.1.3.801" ),
-    
-    ADS_LDAP_SERVER_EXT_OP_HANDLER_OC( "ads-ldapServerExtendedOpHandler", "1.3.6.1.4.1.18060.0.4.1.3.802" ),
+    ADS_NTP_SERVER_OC("ads-ntpServer", "1.3.6.1.4.1.18060.0.4.1.3.700"),
 
-    ADS_HTTP_WEB_APP_OC( "ads-httpWebApp", "1.3.6.1.4.1.18060.0.4.1.3.803" ),
+    ADS_CHANGE_PASSWORD_SERVER_OC("ads-changePasswordServer", "1.3.6.1.4.1.18060.0.4.1.3.800"),
 
-    ADS_HTTP_SERVER_OC( "ads-httpServer", "1.3.6.1.4.1.18060.0.4.1.3.804" ),
+    ADS_LDAP_SERVER_SASL_MECH_HANDLER_OC("ads-ldapServerSaslMechanismHandler", "1.3.6.1.4.1.18060.0.4.1.3.801"),
+
+    ADS_LDAP_SERVER_EXT_OP_HANDLER_OC("ads-ldapServerExtendedOpHandler", "1.3.6.1.4.1.18060.0.4.1.3.802"),
+
+    ADS_HTTP_WEB_APP_OC("ads-httpWebApp", "1.3.6.1.4.1.18060.0.4.1.3.803"),
+
+    ADS_HTTP_SERVER_OC("ads-httpServer", "1.3.6.1.4.1.18060.0.4.1.3.804"),
 
     //ADS_REPL_CONSUMER_OC( "ads-replConsumer", "1.3.6.1.4.1.18060.0.4.1.3.805" ),
-    
-    ADS_REPL_PROVIDER_OC( "ads-replProvider", "1.3.6.1.4.1.18060.0.4.1.3.806" ),
-    
-    ADS_PWD_POLICY_OC( "ads-pwdPolicy", "1.3.6.1.4.1.18060.0.4.1.3.900" ),
-    
-    
-    
-    ADS_CONFIG_ID( "ads-configId", "" ),
-    
-    ADS_COMPOSITE_ELEMENT_AT( "ads-compositeElement", "1.3.6.1.4.1.18060.0.4.1.2.0" ),
 
-    ADS_SERVER_ID( "ads-serverId", "" ),
+    ADS_REPL_PROVIDER_OC("ads-replProvider", "1.3.6.1.4.1.18060.0.4.1.3.806"),
+
+    ADS_PWD_POLICY_OC("ads-pwdPolicy", "1.3.6.1.4.1.18060.0.4.1.3.900"),
+
+    ADS_CONFIG_ID("ads-configId", ""),
+
+    ADS_COMPOSITE_ELEMENT_AT("ads-compositeElement", "1.3.6.1.4.1.18060.0.4.1.2.0"),
 
-    ADS_TRANSPORTS( "ads-transports", "" ),
+    ADS_SERVER_ID("ads-serverId", ""),
 
-    ADS_KRB_ALLOWABLE_CLOCKSKEW( "ads-krbAllowableClockSkew", "" ),
+    ADS_TRANSPORTS("ads-transports", ""),
 
-    ADS_KRB_ENCRYPTION_TYPES( "ads-krbEncryptionTypes", "" ),
+    ADS_KRB_ALLOWABLE_CLOCKSKEW("ads-krbAllowableClockSkew", ""),
 
-    ADS_KRB_EMPTY_ADDRESSES_ALLOWED( "ads-krbEmptyAddressesAllowed", "" ),
+    ADS_KRB_ENCRYPTION_TYPES("ads-krbEncryptionTypes", ""),
 
-    ADS_KRB_FORWARDABLE_ALLOWED( "ads-krbForwardableAllowed", "" ),
+    ADS_KRB_EMPTY_ADDRESSES_ALLOWED("ads-krbEmptyAddressesAllowed", ""),
 
-    ADS_KRB_PAENC_TIMESTAMP_REQUIRED( "ads-krbPaEncTimestampRequired", "" ),
+    ADS_KRB_FORWARDABLE_ALLOWED("ads-krbForwardableAllowed", ""),
 
-    ADS_KRB_POSTDATED_ALLOWED( "ads-krbPostdatedAllowed", "" ),
+    ADS_KRB_PAENC_TIMESTAMP_REQUIRED("ads-krbPaEncTimestampRequired", ""),
 
-    ADS_KRB_PROXIABLE_ALLOWED( "ads-krbProxiableAllowed", "" ),
+    ADS_KRB_POSTDATED_ALLOWED("ads-krbPostdatedAllowed", ""),
 
-    ADS_KRB_RENEWABLE_ALLOWED( "ads-krbRenewableAllowed", "" ),
+    ADS_KRB_PROXIABLE_ALLOWED("ads-krbProxiableAllowed", ""),
 
-    ADS_KRB_KDC_PRINCIPAL( "ads-krbKdcPrincipal", "" ),
+    ADS_KRB_RENEWABLE_ALLOWED("ads-krbRenewableAllowed", ""),
 
-    ADS_KRB_MAXIMUM_RENEWABLE_LIFETIME( "ads-krbMaximumRenewableLifetime", "" ),
+    ADS_KRB_KDC_PRINCIPAL("ads-krbKdcPrincipal", ""),
 
-    ADS_KRB_MAXIMUM_TICKET_LIFETIME( "ads-krbMaximumTicketLifetime", "" ),
+    ADS_KRB_MAXIMUM_RENEWABLE_LIFETIME("ads-krbMaximumRenewableLifetime", ""),
 
-    ADS_KRB_PRIMARY_REALM( "ads-krbPrimaryRealm", "" ),
+    ADS_KRB_MAXIMUM_TICKET_LIFETIME("ads-krbMaximumTicketLifetime", ""),
 
-    ADS_KRB_BODY_CHECKSUM_VERIFIED( "ads-krbBodyChecksumVerified", "" ),
+    ADS_KRB_PRIMARY_REALM("ads-krbPrimaryRealm", ""),
 
-    ADS_HTTP_CONFFILE( "ads-httpConfFile", "" ),
+    ADS_KRB_BODY_CHECKSUM_VERIFIED("ads-krbBodyChecksumVerified", ""),
 
-    ADS_DIRECTORYSERVICE_ID( "ads-directoryServiceId", "" ),
+    ADS_HTTP_CONFFILE("ads-httpConfFile", ""),
+
+    ADS_DIRECTORYSERVICE_ID("ads-directoryServiceId", ""),
 
     //ADS_DS_REPLICA_ID( "ads-dsReplicaId", "" ),
 
-    ADS_DSINTERCEPTORS( "ads-dsInterceptors", "" ),
+    ADS_DSINTERCEPTORS("ads-dsInterceptors", ""),
 
-    ADS_DSPARTITIONS( "ads-dsPartitions", "" ),
+    ADS_DSPARTITIONS("ads-dsPartitions", ""),
 
-    ADS_DS_ACCESSCONTROL_ENABLED( "ads-dsAccessControlEnabled", "" ),
+    ADS_DS_ACCESSCONTROL_ENABLED("ads-dsAccessControlEnabled", ""),
 
-    ADS_DS_ALLOW_ANONYMOUS_ACCESS( "ads-dsAllowAnonymousAccess", "" ),
+    ADS_DS_ALLOW_ANONYMOUS_ACCESS("ads-dsAllowAnonymousAccess", ""),
 
-    ADS_DSCHANGELOG( "ads-dsChangeLog", "" ),
+    ADS_DSCHANGELOG("ads-dsChangeLog", ""),
 
-    ADS_DS_DENORMALIZE_OPATTRS_ENABLED( "ads-dsDenormalizeOpAttrsEnabled", "" ),
+    ADS_DS_DENORMALIZE_OPATTRS_ENABLED("ads-dsDenormalizeOpAttrsEnabled", ""),
 
-    ADS_DSJOURNAL( "ads-dsJournal", "" ),
+    ADS_DSJOURNAL("ads-dsJournal", ""),
 
-    ADS_DS_MAXPDU_SIZE( "ads-dsMaxPDUSize", "" ),
+    ADS_DS_MAXPDU_SIZE("ads-dsMaxPDUSize", ""),
 
-    ADS_DS_PASSWORD_HIDDEN( "ads-dsPasswordHidden", "" ),
+    ADS_DS_PASSWORD_HIDDEN("ads-dsPasswordHidden", ""),
 
     //ADS_DS_REPLICATION( "ads-dsReplication", "" ),
 
-    ADS_DS_SYNCPERIOD_MILLIS( "ads-dsSyncPeriodMillis", "" ),
+    ADS_DS_SYNCPERIOD_MILLIS("ads-dsSyncPeriodMillis", ""),
+
+    ADS_DS_TEST_ENTRIES("ads-dsTestEntries", ""),
+
+    ADS_INTERCEPTOR_ID("ads-interceptorId", ""),
+
+    ADS_INTERCEPTOR_CLASSNAME("ads-interceptorClassName", ""),
+
+    ADS_INTERCEPTOR_ORDER("ads-interceptorOrder", ""),
+
+    ADS_JDBMPARTITION("ads-jdbmPartition", ""),
 
-    ADS_DS_TEST_ENTRIES( "ads-dsTestEntries", "" ),
+    ADS_PARTITION_ID("ads-partitionId", ""),
 
-    ADS_INTERCEPTOR_ID( "ads-interceptorId", "" ),
+    ADS_PARTITION_SUFFIX("ads-partitionSuffix", ""),
 
-    ADS_INTERCEPTOR_CLASSNAME( "ads-interceptorClassName", "" ),
+    ADS_PARTITION_CACHE_SIZE("ads-partitionCacheSize", ""),
 
-    ADS_INTERCEPTOR_ORDER( "ads-interceptorOrder", "" ),
+    ADS_JDBM_PARTITION_OPTIMIZER_ENABLED("ads-jdbmPartitionOptimizerEnabled", ""),
 
-    ADS_JDBMPARTITION( "ads-jdbmPartition", "" ),
+    ADS_PARTITION_SYNCONWRITE("ads-partitionSyncOnWrite", ""),
 
-    ADS_PARTITION_ID( "ads-partitionId", "" ),
+    ADS_PARTITION_INDEXED_ATTRIBUTES("ads-partitionIndexedAttributes", ""),
 
-    ADS_PARTITION_SUFFIX( "ads-partitionSuffix", "" ),
+    ADS_INDEX_ATTRIBUTE_ID("ads-indexAttributeId", ""),
 
-    ADS_PARTITION_CACHE_SIZE( "ads-partitionCacheSize", "" ),
+    ADS_JDBMINDEX("ads-jdbmIndex", ""),
 
-    ADS_JDBM_PARTITION_OPTIMIZER_ENABLED( "ads-jdbmPartitionOptimizerEnabled", "" ),
+    ADS_INDEX_CACHESIZE("ads-indexCacheSize", ""),
 
-    ADS_PARTITION_SYNCONWRITE( "ads-partitionSyncOnWrite", "" ),
+    ADS_INDEX_NUM_DUP_LIMIT("ads-indexNumDupLimit", ""),
 
-    ADS_PARTITION_INDEXED_ATTRIBUTES( "ads-partitionIndexedAttributes", "" ),
+    ADS_TRANSPORT_ID("ads-transportId", ""),
 
-    ADS_INDEX_ATTRIBUTE_ID( "ads-indexAttributeId", "" ),
+    ADS_TCP_TRANSPORT("ads-tcpTransport", ""),
 
-    ADS_JDBMINDEX( "ads-jdbmIndex", "" ),
+    ADS_UDP_TRANSPORT("ads-udpTransport", ""),
 
-    ADS_INDEX_CACHESIZE( "ads-indexCacheSize", "" ),
-    
-    ADS_INDEX_NUM_DUP_LIMIT( "ads-indexNumDupLimit", "" ),
+    ADS_SYSTEM_PORT("ads-systemPort", ""),
 
-    ADS_TRANSPORT_ID( "ads-transportId", "" ),
+    ADS_TRANSPORT_ADDRESS("ads-transportAddress", ""),
 
-    ADS_TCP_TRANSPORT( "ads-tcpTransport", "" ),
+    ADS_TRANSPORT_BACKLOG("ads-transportBacklog", ""),
 
-    ADS_UDP_TRANSPORT( "ads-udpTransport", "" ),
+    ADS_TRANSPORT_ENABLE_SSL("ads-transportEnableSSL", ""),
 
-    ADS_SYSTEM_PORT( "ads-systemPort", "" ),
+    ADS_TRANSPORT_NBTHREADS("ads-transportNbThreads", ""),
 
-    ADS_TRANSPORT_ADDRESS( "ads-transportAddress", "" ),
+    ADS_CHANGELOG_ENABLED("ads-changeLogEnabled", ""),
 
-    ADS_TRANSPORT_BACKLOG( "ads-transportBacklog", "" ),
+    ADS_CHANGELOG_EXPOSED("ads-changeLogExposed", ""),
 
-    ADS_TRANSPORT_ENABLE_SSL( "ads-transportEnableSSL", "" ),
+    ADS_JOURNAL_FILENAME("ads-journalFileName", ""),
 
-    ADS_TRANSPORT_NBTHREADS( "ads-transportNbThreads", "" ),
+    ADS_JOURNAL_WORKINGDIR("ads-journalWorkingDir", ""),
 
-    ADS_CHANGELOG_ENABLED( "ads-changeLogEnabled", "" ),
+    ADS_JOURNAL_ROTATION("ads-journalRotation", ""),
 
-    ADS_CHANGELOG_EXPOSED( "ads-changeLogExposed", "" ),
+    ADS_JOURNAL_ENABLED("ads-journalEnabled", ""),
 
-    ADS_JOURNAL_FILENAME( "ads-journalFileName", "" ),
+    ADS_HTTP_WARFILE("ads-httpWarFile", ""),
 
-    ADS_JOURNAL_WORKINGDIR( "ads-journalWorkingDir", "" ),
+    ADS_HTTP_APP_CTX_PATH("ads-httpAppCtxPath", ""),
 
-    ADS_JOURNAL_ROTATION( "ads-journalRotation", "" ),
+    ADS_ENABLED("ads-enabled", ""),
 
-    ADS_JOURNAL_ENABLED( "ads-journalEnabled", "" ),
+    ADS_CHANGEPWD_POLICY_CATEGORY_COUNT("ads-chgPwdPolicyCategoryCount", ""),
 
-    ADS_HTTP_WARFILE( "ads-httpWarFile", "" ),
+    ADS_CHANGEPWD_POLICY_PASSWORD_LENGTH("ads-chgPwdPolicyPasswordLength", ""),
 
-    ADS_HTTP_APP_CTX_PATH( "ads-httpAppCtxPath", "" ),
+    ADS_CHANGEPWD_POLICY_TOKEN_SIZE("ads-chgPwdPolicyTokenSize", ""),
+
+    ADS_CHANGEPWD_SERVICE_PRINCIPAL("ads-chgPwdServicePrincipal", ""),
 
-    ADS_ENABLED( "ads-enabled", "" ),
-    
-    ADS_CHANGEPWD_POLICY_CATEGORY_COUNT( "ads-chgPwdPolicyCategoryCount", "" ),
-    
-    ADS_CHANGEPWD_POLICY_PASSWORD_LENGTH( "ads-chgPwdPolicyPasswordLength", "" ),
-    
-    ADS_CHANGEPWD_POLICY_TOKEN_SIZE( "ads-chgPwdPolicyTokenSize", "" ),
-    
-    ADS_CHANGEPWD_SERVICE_PRINCIPAL( "ads-chgPwdServicePrincipal", "" ),
-    
     //ADS_REPL_SEARCH_FILTER( "ads-replSearchFilter", "" ),
-    
+
     //ADS_REPL_LAST_SENT_CSN( "ads-replLastSentCsn", "" ),
-    
+
     //ADS_REPL_ALIAS_DEREF_MODE( "ads-replAliasDerefMode", "" ),
-    
+
     //ADS_SEARCH_BASE( "ads-searchBaseDN", "" ),
-    
+
     //ADS_REPL_SEARCH_SCOPE( "ads-replSearchScope", "" ),
-    
+
     //ADS_REPL_REFRESH_N_PERSIST( "ads-replRefreshNPersist", "" ),
-    
+
     //ADS_REPL_PROV_HOST_NAME( "ads-replProvHostName", "" ),
-    
+
     //ADS_REPL_PROV_PORT( "ads-replProvPort", "" ),
-    
+
     //ADS_REPL_USER_DN( "ads-replUserDn", "" ),
-    
+
     //ADS_REPL_USER_PASSWORD( "ads-replUserPassword", "" ),
-    
+
     //ADS_REPL_REFRESH_INTERVAL( "ads-replRefreshInterval", "" ),
-    
+
     //ADS_REPL_ATTRIBUTE( "ads-replAttributes", "" ),
-    
+
     //ADS_REPL_SEARCH_SIZE_LIMIT( "ads-replSearchSizeLimit", "" ),
-    
+
     //ADS_REPL_SEARCH_TIMEOUT( "ads-replSearchTimeOut", "" ),
-    
+
     //ADS_REPL_COOKIE( "ads-replCookie", "" ),
-    
-    ADS_REPL_REQ_HANDLER( "ads-replReqHandler", "" ),
-    
-    ADS_REPL_ENABLE_PROVIDER( "ads-enableReplProvider", "" ),
-    
+
+    ADS_REPL_REQ_HANDLER("ads-replReqHandler", ""),
+
+    ADS_REPL_ENABLE_PROVIDER("ads-enableReplProvider", ""),
+
     //ADS_REPL_PEER_CERTIFICATE( "ads-replPeerCertificate", "" ),
-    
+
     //ADS_REPL_USE_TLS( "ads-replUseTls", "" ),
-    
-    ADS_LDAP_SERVER_SASL_MECH_NAME( "ads-ldapServerSaslMechName", "" ),
-    
-    ADS_LDAP_SERVER_SASL_MECH_CLASS_NAME( "ads-ldapServerSaslMechClassName", "" ),
-    
-    ADS_LDAP_SERVER_NTLM_MECH_PROVIDER( "ads-ldapServerNtlmMechProvider", "" ),
-    
-    ADS_LDAP_SERVER_EXT_OP_HANDLER_FQCN( "ads-ldapServerExtendedOpHandlerClass", "" ),
-    
-    ADS_LDAP_SERVER_KEYSTORE_FILE( "ads-ldapserverkeystorefile", "" ),
-    
-    ADS_LDAP_SERVER_CERT_PASSWORD( "ads-ldapServerCertificatePassword", "" );
-    
+
+    ADS_LDAP_SERVER_SASL_MECH_NAME("ads-ldapServerSaslMechName", ""),
+
+    ADS_LDAP_SERVER_SASL_MECH_CLASS_NAME("ads-ldapServerSaslMechClassName", ""),
+
+    ADS_LDAP_SERVER_NTLM_MECH_PROVIDER("ads-ldapServerNtlmMechProvider", ""),
+
+    ADS_LDAP_SERVER_EXT_OP_HANDLER_FQCN("ads-ldapServerExtendedOpHandlerClass", ""),
+
+    ADS_LDAP_SERVER_KEYSTORE_FILE("ads-ldapserverkeystorefile", ""),
+
+    ADS_LDAP_SERVER_CERT_PASSWORD("ads-ldapServerCertificatePassword", "");
+
     /** The interned value */
     private String value;
-    
+
     /** The associated OID */
     private String oid;
-    
+
+
     /** A private constructor */
     private ConfigSchemaConstants( String value, String oid )
     {
         this.value = value;
         this.oid = oid;
     }
-    
-    
+
+
     /**
      * @return The interned String
      */
@@ -292,8 +291,8 @@ public enum ConfigSchemaConstants
     {
         return value;
     }
-    
-    
+
+
     /**
      * @return The associated OID
      */

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java?rev=1235328&r1=1235327&r2=1235328&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java Tue Jan 24 16:22:33 2012
@@ -403,7 +403,7 @@ public class ConfigWriter
                                     // Adding the field value to the parent entry
                                     addAttributeTypeValues( attributeTypeForParentEntry, fieldValue, parentEntry );
                                 }
-                                
+
                                 // Checking if the field is optional and if the default value matches
                                 if ( configurationElement.isOptional() )
                                 {
@@ -578,7 +578,7 @@ public class ConfigWriter
             else
             {
                 // Adding the single value
-                addAttributeTypeValue( attributeType, o, entry);
+                addAttributeTypeValue( attributeType, o, entry );
             }
         }
     }
@@ -609,7 +609,7 @@ public class ConfigWriter
                 attribute = new DefaultAttribute( attributeType );
                 entry.addAttribute( attribute );
             }
-            
+
             // Storing the value to the attribute
             if ( value instanceof byte[] )
             {

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigurationException.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigurationException.java?rev=1235328&r1=1235327&r2=1235328&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigurationException.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigurationException.java Tue Jan 24 16:22:33 2012
@@ -19,8 +19,10 @@
  */
 package org.apache.directory.server.config;
 
+
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 
+
 /**
  * An exception used when we cannot read the configuration, or when an error
  * occured while reading it from the DIT.
@@ -32,7 +34,7 @@ public class ConfigurationException exte
     /** The serial version UUID */
     private static final long serialVersionUID = 1L;
 
-    
+
     /**
      * Creates a new instance of ConfigurationException.
      *
@@ -43,7 +45,7 @@ public class ConfigurationException exte
         super( message );
     }
 
-    
+
     /**
      * Creates a new instance of ConfigurationException.
      *

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java?rev=1235328&r1=1235327&r2=1235328&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java Tue Jan 24 16:22:33 2012
@@ -64,7 +64,7 @@ public class LdifConfigExtractor
 
     // java.util.regex.Pattern is immutable so only one instance is needed for all uses.
     private static final Pattern EXTRACT_PATTERN = Pattern.compile( ".*config"
-                            + "[/\\Q\\\\E]" + "ou=config.*\\.ldif" );
+        + "[/\\Q\\\\E]" + "ou=config.*\\.ldif" );
 
 
     /**
@@ -80,7 +80,7 @@ public class LdifConfigExtractor
             LOG.debug( "creating non existing output directory {}", outputDirectory.getAbsolutePath() );
             if ( !outputDirectory.mkdir() )
             {
-                throw new IOException(I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, outputDirectory ) );
+                throw new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, outputDirectory ) );
             }
         }
 
@@ -91,7 +91,7 @@ public class LdifConfigExtractor
             LOG.debug( "creating non existing config directory {}", configDirectory.getAbsolutePath() );
             if ( !configDirectory.mkdir() )
             {
-                throw new IOException(I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, configDirectory ) );
+                throw new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, configDirectory ) );
             }
         }
         else if ( !overwrite )
@@ -134,7 +134,7 @@ public class LdifConfigExtractor
         {
             if ( !destination.getParentFile().mkdirs() )
             {
-                throw new IOException(I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, destination.getParentFile() ) );
+                throw new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, destination.getParentFile() ) );
             }
         }
 
@@ -185,7 +185,8 @@ public class LdifConfigExtractor
             {
                 if ( !destination.getParentFile().mkdirs() )
                 {
-                    throw new IOException(I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, destination.getParentFile() ) );
+                    throw new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY,
+                        destination.getParentFile() ) );
                 }
             }
 
@@ -268,7 +269,7 @@ public class LdifConfigExtractor
         return destinationFile;
     }
 
-    
+
     /**
      * extracts or overwrites the configuration LDIF file and returns the absolute path of this file
      *
@@ -282,7 +283,7 @@ public class LdifConfigExtractor
         {
             file = LDIF_CONFIG_FILE;
         }
-        
+
         File configFile = new File( configDir, file );
 
         if ( !configDir.exists() )
@@ -291,48 +292,48 @@ public class LdifConfigExtractor
             if ( !configDir.mkdir() )
             {
                 throw new RuntimeException(
-                        new IOException(I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, configDir ) ) );
+                    new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, configDir ) ) );
             }
         }
         else
         {
-            if( configFile.exists() && !overwrite )
+            if ( configFile.exists() && !overwrite )
             {
                 LOG.warn( "config file already exists, returning, cause overwrite flag was set to false" );
                 return configFile.getAbsolutePath();
             }
         }
-        
+
         try
         {
-            
+
             URL configUrl = LdifConfigExtractor.class.getClassLoader().getResource( file );
 
             LOG.debug( "URL of the config ldif file {}", configUrl );
 
             InputStream in = configUrl.openStream();
-            byte[] buf = new byte[1024*1024];
-            
+            byte[] buf = new byte[1024 * 1024];
+
             FileWriter fw = new FileWriter( configFile );
-            
-            while( true )
+
+            while ( true )
             {
                 int read = in.read( buf );
-                
-                if( read <= 0 )
+
+                if ( read <= 0 )
                 {
                     break;
                 }
-                
-                String s = Strings.utf8ToString(buf, 0, read);
+
+                String s = Strings.utf8ToString( buf, 0, read );
                 fw.write( s );
             }
-            
+
             fw.close();
             in.close();
-            
+
             LOG.info( "successfully extracted the config file {}", configFile.getAbsoluteFile() );
-            
+
             return configFile.getAbsolutePath();
         }
         catch ( Exception e )

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/AdsBaseBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/AdsBaseBean.java?rev=1235328&r1=1235327&r2=1235328&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/AdsBaseBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/AdsBaseBean.java Tue Jan 24 16:22:33 2012
@@ -51,7 +51,7 @@ public abstract class AdsBaseBean
     /** the DN of the entry with which this bean is associated */
     private Dn dn;
 
-    
+
     /**
      * Create a new BaseBean instance
      */
@@ -184,11 +184,11 @@ public abstract class AdsBaseBean
 
         sb.append( toString( tabs, "enabled", enabled ) );
 
-        if ( !Strings.isEmpty(description) )
+        if ( !Strings.isEmpty( description ) )
         {
             sb.append( tabs ).append( "description : '" ).append( description ).append( "'\n" );
         }
-        
+
         if ( dn != null )
         {
             sb.append( tabs ).append( "DN: " ).append( dn ).append( "'\n" );
@@ -207,9 +207,9 @@ public abstract class AdsBaseBean
     }
 
 
-     /**
-      * {@inheritDoc}
-      */
+    /**
+     * {@inheritDoc}
+     */
     public Dn getDn()
     {
         return dn;

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/AuthenticationInterceptorBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/AuthenticationInterceptorBean.java?rev=1235328&r1=1235327&r2=1235328&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/AuthenticationInterceptorBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/AuthenticationInterceptorBean.java Tue Jan 24 16:22:33 2012
@@ -19,11 +19,13 @@
  */
 package org.apache.directory.server.config.beans;
 
+
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.directory.server.config.ConfigurationElement;
 
+
 /**
  * A bean used to store the Authentictor interceptor condifuration
  *
@@ -43,12 +45,12 @@ public class AuthenticationInterceptorBe
     /**
      * Creates a new AuthenticationInterceptorBean instance
      */
-    public AuthenticationInterceptorBean() 
+    public AuthenticationInterceptorBean()
     {
         super();
     }
-    
-    
+
+
     /**
      * @param authenticators the authenticators to set
      */
@@ -57,18 +59,18 @@ public class AuthenticationInterceptorBe
         this.authenticators = authenticators;
     }
 
-    
+
     /**
      * @param authenticators the authenticators to add
      */
     public void addAuthenticators( AuthenticatorBean... authenticators )
     {
         for ( AuthenticatorBean authenticator : authenticators )
-        {   
+        {
             this.authenticators.add( authenticator );
         }
     }
-    
+
 
     /**
      * @return the extendedOps
@@ -77,7 +79,7 @@ public class AuthenticationInterceptorBe
     {
         return authenticators;
     }
-    
+
 
     /**
      * @return the passwordPolicies
@@ -108,17 +110,17 @@ public class AuthenticationInterceptorBe
         }
     }
 
-    
+
     /**
      * {@inheritDoc}
      */
     public String toString( String tabs )
     {
         StringBuilder sb = new StringBuilder();
-        
+
         sb.append( tabs ).append( "AuthenticationInterceptor :\n" );
         sb.append( super.toString( tabs + "  " ) );
-        
+
         if ( ( authenticators != null ) && ( authenticators.size() > 0 ) )
         {
             sb.append( tabs ).append( "  authenticator :\n" );
@@ -128,7 +130,7 @@ public class AuthenticationInterceptorBe
                 sb.append( authenticator.toString( tabs + "    " ) );
             }
         }
-        
+
         if ( ( passwordPolicies != null ) && ( passwordPolicies.size() > 0 ) )
         {
             for ( PasswordPolicyBean ppolicy : passwordPolicies )

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/AuthenticatorBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/AuthenticatorBean.java?rev=1235328&r1=1235327&r2=1235328&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/AuthenticatorBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/AuthenticatorBean.java Tue Jan 24 16:22:33 2012
@@ -19,8 +19,10 @@
  */
 package org.apache.directory.server.config.beans;
 
+
 import org.apache.directory.server.config.ConfigurationElement;
 
+
 /**
  * Base authenticator bean
  *
@@ -31,7 +33,8 @@ public abstract class AuthenticatorBean 
     /** The authenticator id */
     @ConfigurationElement(attributeType = "ads-authenticatorId", isRdn = true)
     private String authenticatorId;
-    
+
+
     /**
      * @return the authenticatorId
      */

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java?rev=1235328&r1=1235327&r2=1235328&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java Tue Jan 24 16:22:33 2012
@@ -38,7 +38,7 @@ public class DSBasedServerBean extends S
      * configuration for catalog entries.  Otherwise it will use this
      * search base as a single point of searching the DIT.
      */
-    @ConfigurationElement( attributeType = SchemaConstants.ADS_SEARCH_BASE_DN )
+    @ConfigurationElement(attributeType = SchemaConstants.ADS_SEARCH_BASE_DN)
     private Dn searchBaseDn;
 
 
@@ -78,7 +78,7 @@ public class DSBasedServerBean extends S
         StringBuilder sb = new StringBuilder();
 
         sb.append( super.toString( tabs ) );
-        sb.append( toString( tabs, SchemaConstants.ADS_SEARCH_BASE_DN, searchBaseDn) );
+        sb.append( toString( tabs, SchemaConstants.ADS_SEARCH_BASE_DN, searchBaseDn ) );
 
         return sb.toString();
     }



Mime
View raw message