directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1027290 [1/2] - in /directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config: ./ beans/
Date Mon, 25 Oct 2010 22:29:55 GMT
Author: elecharny
Date: Mon Oct 25 22:29:54 2010
New Revision: 1027290

URL: http://svn.apache.org/viewvc?rev=1027290&view=rev
Log:
o Modified the field name to be camelCased again
o Improved the getField error message

Modified:
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ChangeLogBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ChangePasswordServerBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ExtendedOpHandlerBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/HttpServerBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/HttpWebAppBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/IndexBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/InterceptorBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmIndexBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmPartitionBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JournalBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/KdcServerBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ReplProviderBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechHandlerBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ServerBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java?rev=1027290&r1=1027289&r2=1027290&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java Mon Oct 25 22:29:54 2010
@@ -101,7 +101,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.ObjectClass;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
-import org.apache.directory.shared.ldap.util.StringTools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -727,7 +726,7 @@ public class ConfigPartitionReader
     /**
      * Retrieve the Field associated with an AttributeType name, if any.
      */
-    private static Field getField( Class<?> clazz, String attributeName ) throws ConfigurationException 
+    private static Field getField( Class<?> clazz, String attributeName, Class<?> originalClazz ) throws ConfigurationException 
     {
         // We will check all the fields, as the AT name is case insentitive
         // when the field is case sensitive
@@ -746,10 +745,10 @@ public class ConfigPartitionReader
         // May be in the paren'ts class ?
         if ( clazz.getSuperclass() != null )
         {
-            return getField( clazz.getSuperclass(), attributeName );
+            return getField( clazz.getSuperclass(), attributeName, originalClazz );
         }
         
-        String message = "Cannot find a field named " + attributeName + " in class " + clazz.getName();
+        String message = "Cannot find a field named " + attributeName + " in class " + originalClazz.getName();
         LOG.error( message );
         throw new ConfigurationException( message );
     }
@@ -847,7 +846,10 @@ public class ConfigPartitionReader
         }
 
         Class<?> type = beanField.getType();
-        
+
+        String fieldName = beanField.getName();
+        String addMethodName = "add" + Character.toUpperCase( fieldName.charAt( 0 ) ) + fieldName.substring( 1 );
+
         // loop on the values and inject them in the bean
         for ( Value<?> value : fieldAttr )
         {
@@ -901,7 +903,7 @@ public class ConfigPartitionReader
                         }
                     }
     
-                    Method method = bean.getClass().getMethod( "add" + beanField.getName(), Array.newInstance( fieldArgClass, 0 ).getClass() );
+                    Method method = bean.getClass().getMethod( addMethodName, Array.newInstance( fieldArgClass, 0 ).getClass() );
     
                     method.invoke( bean, new Object[]{ new String[]{valueStr} } );
                 }
@@ -920,8 +922,8 @@ public class ConfigPartitionReader
                             fieldArgClass = (Class<?>) fieldArgType;
                         }
                     }
-    
-                    Method method = bean.getClass().getMethod( "add" + beanField.getName(), Array.newInstance( fieldArgClass, 0 ).getClass() );
+                    
+                    Method method = bean.getClass().getMethod( addMethodName, Array.newInstance( fieldArgClass, 0 ).getClass() );
     
                     method.invoke( bean, new Object[]{ new String[]{valueStr} } );
                 }
@@ -946,7 +948,7 @@ public class ConfigPartitionReader
             } 
             catch ( NoSuchMethodException nsme )
             {
-                String message = "Cannot find a constructor for the class " + bean.getClass().getName();
+                String message = "Cannot find a method " + addMethodName + " in the class " + bean.getClass().getName();
                 LOG.error( message );
                 throw new ConfigurationException( message );
             }
@@ -981,7 +983,7 @@ public class ConfigPartitionReader
             }
             
             // Get the field
-            Field beanField = getField( bean.getClass(), StringTools.toLowerCase( beanFieldName ) );
+            Field beanField = getField( bean.getClass(), beanFieldName, bean.getClass() );
             
             // The field is private, we need to modify it to be able to access it.
             beanField.setAccessible( true );

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ChangeLogBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ChangeLogBean.java?rev=1027290&r1=1027289&r2=1027290&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ChangeLogBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ChangeLogBean.java Mon Oct 25 22:29:54 2010
@@ -28,10 +28,10 @@ package org.apache.directory.server.conf
 public class ChangeLogBean extends AdsBaseBean
 {
     /** The ChangeLog unique ID */
-    private String changelogid;
+    private String changeLogId;
 
     /** Tells if the ChangeLog is exposed to the users */
-    private boolean changelogexposed;
+    private boolean changeLogExposed;
 
     /**
      * Create a new ChangeLogBean instance
@@ -39,7 +39,7 @@ public class ChangeLogBean extends AdsBa
     public ChangeLogBean()
     {
         // Not exposed by default
-        changelogexposed = false;
+        changeLogExposed = false;
         
         // Not enabled by default
         setEnabled( false );
@@ -51,7 +51,7 @@ public class ChangeLogBean extends AdsBa
      */
     public String getChangeLogId()
     {
-        return changelogid;
+        return changeLogId;
     }
 
 
@@ -60,7 +60,7 @@ public class ChangeLogBean extends AdsBa
      */
     public void setChangeLogId( String changeLogId )
     {
-        this.changelogid = changeLogId;
+        this.changeLogId = changeLogId;
     }
     
     
@@ -69,7 +69,7 @@ public class ChangeLogBean extends AdsBa
      */
     public boolean isChangeLogExposed() 
     {
-        return changelogexposed;
+        return changeLogExposed;
     }
 
     
@@ -78,7 +78,7 @@ public class ChangeLogBean extends AdsBa
      */
     public void setChangeLogExposed( boolean changeLogExposed ) 
     {
-        this.changelogexposed = changeLogExposed;
+        this.changeLogExposed = changeLogExposed;
     }
     
     
@@ -90,8 +90,8 @@ public class ChangeLogBean extends AdsBa
         StringBuilder sb = new StringBuilder();
         
         sb.append( tabs ).append( "ChangeLog :\n" );
-        sb.append( tabs ).append( "  changeLog id : " ).append( changelogid ).append( '\n' );
-        sb.append( toString( tabs, "  changeLog exposed", changelogexposed ) );
+        sb.append( tabs ).append( "  changeLog id : " ).append( changeLogId ).append( '\n' );
+        sb.append( toString( tabs, "  changeLog exposed", changeLogExposed ) );
         
         return sb.toString();
     }

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ChangePasswordServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ChangePasswordServerBean.java?rev=1027290&r1=1027289&r2=1027290&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ChangePasswordServerBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ChangePasswordServerBean.java Mon Oct 25 22:29:54 2010
@@ -31,28 +31,28 @@ import java.util.List;
 public class ChangePasswordServerBean extends DSBasedServerBean
 {
     /** The allowable clock skew. */
-    private long krballowableclockskew;
+    private long krbAllowableClockSkew;
     
     /** Whether empty addresses are allowed. */
-    private boolean krbemptyaddressesallowed;
+    private boolean krbEmptyAddressesAllowed;
     
     /** The encryption types. */
-    private List<String> krbencryptiontypes = new ArrayList<String>();
+    private List<String> krbEncryptionTypes = new ArrayList<String>();
     
     /** The primary realm. */
-    private String krbprimaryrealm;
+    private String krbPrimaryRealm;
     
     /** The policy for category count. */
-    private int chgpwdpolicycategorycount;
+    private int chgPwdPolicyCategoryCount;
     
     /** The policy for password length. */
-    private int chgpwdpolicypasswordlength;
+    private int chgPwdPolicyPasswordLength;
     
     /** The policy for token size. */
-    private int chgpwdpolicytokensize;
+    private int chgPwdPolicyTokenSize;
     
     /** The service principal name. */
-    private String chgpwdserviceprincipal;
+    private String chgPwdServicePrincipal;
 
     /**
      * Create a new ChangePasswordServer instance
@@ -67,7 +67,7 @@ public class ChangePasswordServerBean ex
      */
     public long getKrbAllowableClockSkew()
     {
-        return krballowableclockskew;
+        return krbAllowableClockSkew;
     }
 
     
@@ -76,7 +76,7 @@ public class ChangePasswordServerBean ex
      */
     public void setKrbAllowableClockSkew( long krbAllowableClockSkew )
     {
-        this.krballowableclockskew = krbAllowableClockSkew;
+        this.krbAllowableClockSkew = krbAllowableClockSkew;
     }
 
     
@@ -85,7 +85,7 @@ public class ChangePasswordServerBean ex
      */
     public boolean isKrbEmptyAddressesAllowed()
     {
-        return krbemptyaddressesallowed;
+        return krbEmptyAddressesAllowed;
     }
 
     
@@ -94,7 +94,7 @@ public class ChangePasswordServerBean ex
      */
     public void setKrbEmptyAddressesAllowed( boolean krbEmptyAddressesAllowed )
     {
-        this.krbemptyaddressesallowed = krbEmptyAddressesAllowed;
+        this.krbEmptyAddressesAllowed = krbEmptyAddressesAllowed;
     }
 
     
@@ -103,7 +103,7 @@ public class ChangePasswordServerBean ex
      */
     public List<String> getKrbEncryptionTypes()
     {
-        return krbencryptiontypes;
+        return krbEncryptionTypes;
     }
 
     
@@ -112,7 +112,7 @@ public class ChangePasswordServerBean ex
      */
     public void setKrbEncryptionTypes( List<String> krbEncryptionTypes )
     {
-        this.krbencryptiontypes = krbEncryptionTypes;
+        this.krbEncryptionTypes = krbEncryptionTypes;
     }
 
     
@@ -121,11 +121,11 @@ public class ChangePasswordServerBean ex
      * 
      * @param krbEncryptionTypes the encryptionTypes to set
      */
-    public void addkrbencryptiontypes( String... krbEncryptionTypes )
+    public void addKrbEncryptionTypes( String... krbEncryptionTypes )
     {
         for ( String encryptionType:krbEncryptionTypes )
         {
-            this.krbencryptiontypes.add( encryptionType );
+            this.krbEncryptionTypes.add( encryptionType );
         }
     }
 
@@ -135,7 +135,7 @@ public class ChangePasswordServerBean ex
      */
     public String getKrbPrimaryRealm()
     {
-        return krbprimaryrealm;
+        return krbPrimaryRealm;
     }
 
     
@@ -144,7 +144,7 @@ public class ChangePasswordServerBean ex
      */
     public void setKrbPrimaryRealm( String krbPrimaryRealm )
     {
-        this.krbprimaryrealm = krbPrimaryRealm;
+        this.krbPrimaryRealm = krbPrimaryRealm;
     }
 
     
@@ -153,7 +153,7 @@ public class ChangePasswordServerBean ex
      */
     public int getChgPwdPolicyCategoryCount()
     {
-        return chgpwdpolicycategorycount;
+        return chgPwdPolicyCategoryCount;
     }
 
     
@@ -162,7 +162,7 @@ public class ChangePasswordServerBean ex
      */
     public void setChgPwdPolicyCategoryCount( int chgPwdPolicyCategoryCount )
     {
-        this.chgpwdpolicycategorycount = chgPwdPolicyCategoryCount;
+        this.chgPwdPolicyCategoryCount = chgPwdPolicyCategoryCount;
     }
 
     
@@ -171,7 +171,7 @@ public class ChangePasswordServerBean ex
      */
     public int getChgPwdPolicyPasswordLength()
     {
-        return chgpwdpolicypasswordlength;
+        return chgPwdPolicyPasswordLength;
     }
 
     
@@ -180,7 +180,7 @@ public class ChangePasswordServerBean ex
      */
     public void setChgPwdPolicyPasswordLength( int chgPwdPolicyPasswordLength )
     {
-        this.chgpwdpolicypasswordlength = chgPwdPolicyPasswordLength;
+        this.chgPwdPolicyPasswordLength = chgPwdPolicyPasswordLength;
     }
 
     
@@ -189,7 +189,7 @@ public class ChangePasswordServerBean ex
      */
     public int getChgPwdPolicyTokenSize()
     {
-        return chgpwdpolicytokensize;
+        return chgPwdPolicyTokenSize;
     }
 
     
@@ -198,7 +198,7 @@ public class ChangePasswordServerBean ex
      */
     public void setChgPwdPolicyTokenSize( int chgPwdPolicyTokenSize )
     {
-        this.chgpwdpolicytokensize = chgPwdPolicyTokenSize;
+        this.chgPwdPolicyTokenSize = chgPwdPolicyTokenSize;
     }
 
     
@@ -207,7 +207,7 @@ public class ChangePasswordServerBean ex
      */
     public String getChgPwdServicePrincipal()
     {
-        return chgpwdserviceprincipal;
+        return chgPwdServicePrincipal;
     }
 
     
@@ -216,7 +216,7 @@ public class ChangePasswordServerBean ex
      */
     public void setChgPwdServicePrincipal( String chgPwdServicePrincipal )
     {
-        this.chgpwdserviceprincipal = chgPwdServicePrincipal;
+        this.chgPwdServicePrincipal = chgPwdServicePrincipal;
     }
     
     
@@ -229,24 +229,24 @@ public class ChangePasswordServerBean ex
         
         sb.append( tabs ).append( "ChangePasswordServer :\n" );
         sb.append( super.toString( tabs + "  " ) );
-        sb.append( toString( tabs, "  change password service principal", chgpwdserviceprincipal ) );
-        sb.append( toString( tabs, "  KRB primary realm", krbprimaryrealm ) );
+        sb.append( toString( tabs, "  change password service principal", chgPwdServicePrincipal ) );
+        sb.append( toString( tabs, "  KRB primary realm", krbPrimaryRealm ) );
         
-        if ( ( krbencryptiontypes != null ) && ( krbencryptiontypes.size() != 0 ) )
+        if ( ( krbEncryptionTypes != null ) && ( krbEncryptionTypes.size() != 0 ) )
         {
             sb.append( tabs ).append( "  encryption types : \n" );
 
-            for ( String encryptionType : krbencryptiontypes )
+            for ( String encryptionType : krbEncryptionTypes )
             {
                 sb.append( tabs ).append( "    encryptionType : " ).append( encryptionType ).append( '\n' );
             }
         }
         
-        sb.append( toString( tabs, "  change password policy category count", chgpwdpolicycategorycount ) );
-        sb.append( toString( tabs, "  change password policy password length", chgpwdpolicypasswordlength ) );
-        sb.append( toString( tabs, "  change password policy token size", chgpwdpolicytokensize ) );
-        sb.append( toString( tabs, "  KRB allowable clock skew", krballowableclockskew ) );
-        sb.append( toString( tabs, "  KRB empty addresses allowed", krbemptyaddressesallowed ) );
+        sb.append( toString( tabs, "  change password policy category count", chgPwdPolicyCategoryCount ) );
+        sb.append( toString( tabs, "  change password policy password length", chgPwdPolicyPasswordLength ) );
+        sb.append( toString( tabs, "  change password policy token size", chgPwdPolicyTokenSize ) );
+        sb.append( toString( tabs, "  KRB allowable clock skew", krbAllowableClockSkew ) );
+        sb.append( toString( tabs, "  KRB empty addresses allowed", krbEmptyAddressesAllowed ) );
 
         return sb.toString();
     }

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java?rev=1027290&r1=1027289&r2=1027290&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java Mon Oct 25 22:29:54 2010
@@ -33,7 +33,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.
      */
-    private String searchbasedn;
+    private String searchBaseDN;
 
     /**
      * Create a new JournalBean instance
@@ -51,7 +51,7 @@ public class DSBasedServerBean extends S
      */
     public String getSearchBaseDn()
     {
-        return searchbasedn;
+        return searchBaseDN;
     }
 
 
@@ -60,7 +60,7 @@ public class DSBasedServerBean extends S
      */
     public void setSearchBaseDn( String searchBaseDn )
     {
-        this.searchbasedn = searchBaseDn;
+        this.searchBaseDN = searchBaseDn;
     }
     
     
@@ -72,7 +72,7 @@ public class DSBasedServerBean extends S
         StringBuilder sb = new StringBuilder();
         
         sb.append( super.toString( tabs ) );
-        sb.append( toString( tabs, "searchBaseDN", searchbasedn ) );
+        sb.append( toString( tabs, "searchBaseDN", searchBaseDN ) );
         
         return sb.toString();
     }

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java?rev=1027290&r1=1027289&r2=1027290&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java Mon Oct 25 22:29:54 2010
@@ -32,34 +32,34 @@ import java.util.List;
 public class DirectoryServiceBean extends AdsBaseBean
 {
     /** The DS instance Id */
-    private String directoryserviceid;
+    private String directoryServiceId;
 
     /** The directory instance replication ID */
-    private int dsreplicaid;
+    private int dsReplicaId;
 
     /** The flag that tells if the AccessControl system is activated */
-    private boolean dsaccesscontrolenabled = true;
+    private boolean dsAccessControlEnabled = true;
 
     /** The flag that tells if Anonymous connections are allowed */
-    private boolean dsallowanonymousaccess = false;
+    private boolean dsAllowAnonymousAccess = false;
 
     /** The flag that tells if DN must be denormalized */
-    private boolean dsdenormalizeopattrsenabled = true;
+    private boolean dsDenormalizeOpAttrsEnabled = true;
 
     /** The maximum size of an incoming PDU */
-    private int dsmaxpdusize = 2048;
+    private int dsMaxPDUSize = 2048;
 
     /** The flag that tells if the password should be returned as a normal attribute or not */
-    private boolean dspasswordhidden = true;
+    private boolean dsPasswordHidden = true;
 
     /** The delay between two flushes on disk */
-    private long dssyncperiodmillis = 15000L;
+    private long dsSyncPeriodMillis = 15000L;
 
     /** The ldif entries to inject into the server at startup */
-    private String dstestentries;
+    private String dsTestEntries;
 
     /** The ChangeLog component */
-    private ChangeLogBean changelog;
+    private ChangeLogBean changeLog;
 
     /** The journal component */
     private JournalBean journal;
@@ -74,10 +74,10 @@ public class DirectoryServiceBean extend
     private List<PartitionBean> partitions = new ArrayList<PartitionBean>();
 
     /** The reference to the Password Policy component */
-    private PasswordPolicyBean passwordpolicy;
+    private PasswordPolicyBean passwordPolicy;
 
     /** The working directory */
-    private String dsworkingdirectory;
+    private String dsWorkingDirectory;
 
 
     /**
@@ -94,7 +94,7 @@ public class DirectoryServiceBean extend
      */
     public void setDirectoryServiceId( String directoryServiceId )
     {
-        this.directoryserviceid = directoryServiceId;
+        this.directoryServiceId = directoryServiceId;
     }
 
 
@@ -103,7 +103,7 @@ public class DirectoryServiceBean extend
      */
     public String getDirectoryServiceId()
     {
-        return directoryserviceid;
+        return directoryServiceId;
     }
 
 
@@ -112,7 +112,7 @@ public class DirectoryServiceBean extend
      */
     public int getDsReplicaId()
     {
-        return dsreplicaid;
+        return dsReplicaId;
     }
 
 
@@ -123,11 +123,11 @@ public class DirectoryServiceBean extend
     {
         if ( ( dsReplicaId < 0 ) || ( dsReplicaId > 999 ) )
         {
-            this.dsreplicaid = 0;
+            this.dsReplicaId = 0;
         }
         else
         {
-            this.dsreplicaid = dsReplicaId;
+            this.dsReplicaId = dsReplicaId;
         }
     }
 
@@ -173,7 +173,7 @@ public class DirectoryServiceBean extend
      */
     public boolean isDsAccessControlEnabled()
     {
-        return dsaccesscontrolenabled;
+        return dsAccessControlEnabled;
     }
 
 
@@ -182,7 +182,7 @@ public class DirectoryServiceBean extend
      */
     public void setDsAccessControlEnabled( boolean dsAccessControlEnabled )
     {
-        this.dsaccesscontrolenabled = dsAccessControlEnabled;
+        this.dsAccessControlEnabled = dsAccessControlEnabled;
     }
 
 
@@ -191,7 +191,7 @@ public class DirectoryServiceBean extend
      */
     public boolean isDsAllowAnonymousAccess()
     {
-        return dsallowanonymousaccess;
+        return dsAllowAnonymousAccess;
     }
 
 
@@ -200,7 +200,7 @@ public class DirectoryServiceBean extend
      */
     public void setDsAllowAnonymousAccess( boolean dsAllowAnonymousAccess )
     {
-        this.dsallowanonymousaccess = dsAllowAnonymousAccess;
+        this.dsAllowAnonymousAccess = dsAllowAnonymousAccess;
     }
 
 
@@ -209,7 +209,7 @@ public class DirectoryServiceBean extend
      */
     public boolean isDsDenormalizeOpAttrsEnabled()
     {
-        return dsdenormalizeopattrsenabled;
+        return dsDenormalizeOpAttrsEnabled;
     }
 
 
@@ -218,7 +218,7 @@ public class DirectoryServiceBean extend
      */
     public void setDsDenormalizeOpAttrsEnabled( boolean dsDenormalizeOpAttrsEnabled )
     {
-        this.dsdenormalizeopattrsenabled = dsDenormalizeOpAttrsEnabled;
+        this.dsDenormalizeOpAttrsEnabled = dsDenormalizeOpAttrsEnabled;
     }
 
 
@@ -227,7 +227,7 @@ public class DirectoryServiceBean extend
      */
     public int getDsMaxPDUSize()
     {
-        return dsmaxpdusize;
+        return dsMaxPDUSize;
     }
 
 
@@ -236,7 +236,7 @@ public class DirectoryServiceBean extend
      */
     public void setDsMaxPDUSize( int dsMaxPDUSize )
     {
-        this.dsmaxpdusize = dsMaxPDUSize;
+        this.dsMaxPDUSize = dsMaxPDUSize;
     }
 
 
@@ -245,7 +245,7 @@ public class DirectoryServiceBean extend
      */
     public boolean isDsPasswordHidden()
     {
-        return dspasswordhidden;
+        return dsPasswordHidden;
     }
 
 
@@ -254,7 +254,7 @@ public class DirectoryServiceBean extend
      */
     public void setDsPasswordHidden( boolean dsPasswordHidden )
     {
-        this.dspasswordhidden = dsPasswordHidden;
+        this.dsPasswordHidden = dsPasswordHidden;
     }
 
 
@@ -263,7 +263,7 @@ public class DirectoryServiceBean extend
      */
     public long getDsSyncPeriodMillis()
     {
-        return dssyncperiodmillis;
+        return dsSyncPeriodMillis;
     }
 
 
@@ -272,7 +272,7 @@ public class DirectoryServiceBean extend
      */
     public void setDsSyncPeriodMillis( long dsSyncPeriodMillis )
     {
-        this.dssyncperiodmillis = dsSyncPeriodMillis;
+        this.dsSyncPeriodMillis = dsSyncPeriodMillis;
     }
 
 
@@ -281,7 +281,7 @@ public class DirectoryServiceBean extend
      */
     public String getDsTestEntries()
     {
-        return dstestentries;
+        return dsTestEntries;
     }
 
 
@@ -290,7 +290,7 @@ public class DirectoryServiceBean extend
      */
     public void setDsTestEntries( String dsTestEntries )
     {
-        this.dstestentries = dsTestEntries;
+        this.dsTestEntries = dsTestEntries;
     }
 
 
@@ -299,7 +299,7 @@ public class DirectoryServiceBean extend
      */
     public ChangeLogBean getChangeLog()
     {
-        return changelog;
+        return changeLog;
     }
 
 
@@ -308,7 +308,7 @@ public class DirectoryServiceBean extend
      */
     public void setChangeLog( ChangeLogBean changeLog )
     {
-        this.changelog = changeLog;
+        this.changeLog = changeLog;
     }
 
 
@@ -395,7 +395,7 @@ public class DirectoryServiceBean extend
      */
     public PasswordPolicyBean getPasswordPolicy()
     {
-        return passwordpolicy;
+        return passwordPolicy;
     }
 
 
@@ -404,7 +404,7 @@ public class DirectoryServiceBean extend
      */
     public void setPasswordPolicy( PasswordPolicyBean passwordPolicy )
     {
-        this.passwordpolicy = passwordPolicy;
+        this.passwordPolicy = passwordPolicy;
     }
 
 
@@ -413,7 +413,7 @@ public class DirectoryServiceBean extend
      */
     public String getDsWorkingDirectory()
     {
-        return dsworkingdirectory;
+        return dsWorkingDirectory;
     }
 
 
@@ -422,7 +422,7 @@ public class DirectoryServiceBean extend
      */
     public void setDsWorkingDirectory( String dsWorkingDirectory )
     {
-        this.dsworkingdirectory = dsWorkingDirectory;
+        this.dsWorkingDirectory = dsWorkingDirectory;
     }
     
 
@@ -437,16 +437,16 @@ public class DirectoryServiceBean extend
         sb.append( super.toString( "  " ) );
         
         // Dump the must attributes
-        sb.append( "  directoryService ID : " ).append( directoryserviceid ).append( '\n' );
-        sb.append( "  replica ID : " ).append( dsreplicaid ).append( '\n' );
-        sb.append( "  working directory : " ).append( dsworkingdirectory ).append( '\n' );
-        sb.append( toString( "  ", "accessControl enabled", dsaccesscontrolenabled ) );
-        sb.append( toString( "  ", "allow anonymous access", dsallowanonymousaccess ) );
-        sb.append( toString( "  ", "denormalized attributes enabled", dsdenormalizeopattrsenabled ) );
-        sb.append( toString( "  ", "password hidden", dspasswordhidden ) );
-        sb.append( "  max PDU size : " ).append( dsmaxpdusize ).append( '\n' );
-        sb.append( "  sync period millisecond : " ).append( dssyncperiodmillis ).append( '\n' );
-        sb.append( toString( "  ", "test entries", dstestentries ) );
+        sb.append( "  directoryService ID : " ).append( directoryServiceId ).append( '\n' );
+        sb.append( "  replica ID : " ).append( dsReplicaId ).append( '\n' );
+        sb.append( "  working directory : " ).append( dsWorkingDirectory ).append( '\n' );
+        sb.append( toString( "  ", "accessControl enabled", dsAccessControlEnabled ) );
+        sb.append( toString( "  ", "allow anonymous access", dsAllowAnonymousAccess ) );
+        sb.append( toString( "  ", "denormalized attributes enabled", dsDenormalizeOpAttrsEnabled ) );
+        sb.append( toString( "  ", "password hidden", dsPasswordHidden ) );
+        sb.append( "  max PDU size : " ).append( dsMaxPDUSize ).append( '\n' );
+        sb.append( "  sync period millisecond : " ).append( dsSyncPeriodMillis ).append( '\n' );
+        sb.append( toString( "  ", "test entries", dsTestEntries ) );
         
         sb.append( "  interceptors : \n" );
         
@@ -473,14 +473,14 @@ public class DirectoryServiceBean extend
             sb.append( journal.toString( "  " ) );
         }
         
-        if ( changelog != null )
+        if ( changeLog != null )
         {
-            sb.append( changelog.toString( "  " ) );
+            sb.append( changeLog.toString( "  " ) );
         }
         
-        if ( passwordpolicy != null )
+        if ( passwordPolicy != null )
         {
-            sb.append( passwordpolicy.toString( "  " ) );
+            sb.append( passwordPolicy.toString( "  " ) );
         }
         
         sb.append( "  servers : \n" );

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ExtendedOpHandlerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ExtendedOpHandlerBean.java?rev=1027290&r1=1027289&r2=1027290&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ExtendedOpHandlerBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ExtendedOpHandlerBean.java Mon Oct 25 22:29:54 2010
@@ -28,10 +28,10 @@ package org.apache.directory.server.conf
 public class ExtendedOpHandlerBean extends AdsBaseBean
 {
     /** The Extended Operation ID */
-    private String extendedopid;
+    private String extendedOpId;
     
     /** The Extended Operation FQCN */
-    private String extendedophandlerclass;
+    private String extendedOpHandlerClass;
 
     /**
      * Create a new LdapServerExtendedOpHandlerBean instance
@@ -47,7 +47,7 @@ public class ExtendedOpHandlerBean exten
      */
     public String getExtendedOpId()
     {
-        return extendedopid;
+        return extendedOpId;
     }
 
     
@@ -56,7 +56,7 @@ public class ExtendedOpHandlerBean exten
      */
     public void setExtendedOpId( String extendedOpId )
     {
-        this.extendedopid = extendedOpId;
+        this.extendedOpId = extendedOpId;
     }
 
     
@@ -65,7 +65,7 @@ public class ExtendedOpHandlerBean exten
      */
     public String getExtendedOpHandlerClass()
     {
-        return extendedophandlerclass;
+        return extendedOpHandlerClass;
     }
 
     
@@ -74,7 +74,7 @@ public class ExtendedOpHandlerBean exten
      */
     public void setExtendedOpHandlerClass( String extendedOpHandlerClass )
     {
-        this.extendedophandlerclass = extendedOpHandlerClass;
+        this.extendedOpHandlerClass = extendedOpHandlerClass;
     }
     
     
@@ -86,8 +86,8 @@ public class ExtendedOpHandlerBean exten
         StringBuilder sb = new StringBuilder();
         
         sb.append( tabs ).append( "Extended operation handler :\n" );
-        sb.append( tabs ).append( "  extended operation ID : " ).append( extendedopid ).append( '\n' );
-        sb.append( tabs ).append( "  extended operation handler class : " ).append( extendedophandlerclass ).append( '\n' );
+        sb.append( tabs ).append( "  extended operation ID : " ).append( extendedOpId ).append( '\n' );
+        sb.append( tabs ).append( "  extended operation handler class : " ).append( extendedOpHandlerClass ).append( '\n' );
         
         return sb.toString();
     }

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/HttpServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/HttpServerBean.java?rev=1027290&r1=1027289&r2=1027290&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/HttpServerBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/HttpServerBean.java Mon Oct 25 22:29:54 2010
@@ -33,10 +33,10 @@ import java.util.List;
 public class HttpServerBean extends ServerBean
 {
     /** The configuration file */
-    private String httpconffile;
+    private String httpConfFile;
     
     /** The list of supported web apps */
-    private List<HttpWebAppBean> httpwebapps = new ArrayList<HttpWebAppBean>();
+    private List<HttpWebAppBean> httpWebApps = new ArrayList<HttpWebAppBean>();
 
     /**
      * Create a new HttpServerBean instance
@@ -55,7 +55,7 @@ public class HttpServerBean extends Serv
      */
     public String getHttpConfFile()
     {
-        return httpconffile;
+        return httpConfFile;
     }
 
     
@@ -64,7 +64,7 @@ public class HttpServerBean extends Serv
      */
     public void setHttpConfFile( String httpConfFile )
     {
-        this.httpconffile = httpConfFile;
+        this.httpConfFile = httpConfFile;
     }
 
     
@@ -73,7 +73,7 @@ public class HttpServerBean extends Serv
      */
     public List<HttpWebAppBean> getExtendedOps()
     {
-        return httpwebapps;
+        return httpWebApps;
     }
 
     
@@ -82,7 +82,7 @@ public class HttpServerBean extends Serv
      */
     public void setExtendedOps( List<HttpWebAppBean> httpWebApps )
     {
-        this.httpwebapps = httpWebApps;
+        this.httpWebApps = httpWebApps;
     }
 
     
@@ -93,7 +93,7 @@ public class HttpServerBean extends Serv
     {
         for ( HttpWebAppBean httpWebApp : httpWebApps )
         {   
-            this.httpwebapps.add( httpWebApp );
+            this.httpWebApps.add( httpWebApp );
         }
     }
 
@@ -107,13 +107,13 @@ public class HttpServerBean extends Serv
         
         sb.append( tabs ).append( "HttpServer :\n" );
         sb.append( super.toString( tabs + "  " ) );
-        sb.append(  toString( tabs, "  http configuration file", httpconffile ) );
+        sb.append(  toString( tabs, "  http configuration file", httpConfFile ) );
         
-        if ( ( httpwebapps != null ) && ( httpwebapps.size() > 0 ) )
+        if ( ( httpWebApps != null ) && ( httpWebApps.size() > 0 ) )
         {
             sb.append( tabs ).append( "  web applications :\n" );
             
-            for ( HttpWebAppBean httpWebApp : httpwebapps )
+            for ( HttpWebAppBean httpWebApp : httpWebApps )
             {
                 sb.append( httpWebApp.toString( tabs + "    " ) );
             }

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/HttpWebAppBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/HttpWebAppBean.java?rev=1027290&r1=1027289&r2=1027290&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/HttpWebAppBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/HttpWebAppBean.java Mon Oct 25 22:29:54 2010
@@ -31,10 +31,10 @@ public class HttpWebAppBean extends AdsB
     private String id;
     
     /** The context path */
-    private String httpappctxpath;
+    private String httpAppCtxPath;
     
     /** The war file */
-    private String httpwarfile;
+    private String httpWarFile;
 
     /**
      * Create a new HttpWebAppBean instance
@@ -71,7 +71,7 @@ public class HttpWebAppBean extends AdsB
      */
     public String getHttpAppCtxPath()
     {
-        return httpappctxpath;
+        return httpAppCtxPath;
     }
 
     
@@ -80,7 +80,7 @@ public class HttpWebAppBean extends AdsB
      */
     public void setHttpAppCtxPath( String httpAppCtxPath )
     {
-        this.httpappctxpath = httpAppCtxPath;
+        this.httpAppCtxPath = httpAppCtxPath;
     }
 
     
@@ -89,7 +89,7 @@ public class HttpWebAppBean extends AdsB
      */
     public String getHttpWarFile()
     {
-        return httpwarfile;
+        return httpWarFile;
     }
 
     
@@ -98,7 +98,7 @@ public class HttpWebAppBean extends AdsB
      */
     public void setHttpWarFile( String httpWarFile )
     {
-        this.httpwarfile = httpWarFile;
+        this.httpWarFile = httpWarFile;
     }
 
     
@@ -112,8 +112,8 @@ public class HttpWebAppBean extends AdsB
         sb.append( tabs ).append( "HttpWebApp :\n" );
         sb.append( super.toString( tabs + "  " ) );
         sb.append( tabs ).append( "  id : " ).append( id ).append( '\n' );
-        sb.append( tabs ).append( "  war file : " ).append( httpwarfile ).append( '\n' );
-        sb.append(  toString( tabs, "  application context path", httpappctxpath ) );
+        sb.append( tabs ).append( "  war file : " ).append( httpWarFile ).append( '\n' );
+        sb.append(  toString( tabs, "  application context path", httpAppCtxPath ) );
 
         return sb.toString();
     }

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/IndexBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/IndexBean.java?rev=1027290&r1=1027289&r2=1027290&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/IndexBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/IndexBean.java Mon Oct 25 22:29:54 2010
@@ -27,7 +27,7 @@ package org.apache.directory.server.conf
 public abstract class IndexBean extends AdsBaseBean
 {
     /** The index unique identifier */
-    private String indexattributeid;
+    private String indexAttributeId;
     
     /**
      * Create a new IndexBean instance
@@ -41,7 +41,7 @@ public abstract class IndexBean extends 
      */
     public String getIndexAttributeId()
     {
-        return indexattributeid;
+        return indexAttributeId;
     }
 
     
@@ -50,7 +50,7 @@ public abstract class IndexBean extends 
      */
     public void setIndexAttributeId( String indexAttributeId )
     {
-        this.indexattributeid = indexAttributeId;
+        this.indexAttributeId = indexAttributeId;
     }
     
     
@@ -62,7 +62,7 @@ public abstract class IndexBean extends 
         StringBuilder sb = new StringBuilder();
         
         sb.append( super.toString( tabs + "  " ) );
-        sb.append( tabs ).append( "  indexed attribute ID : " ).append( indexattributeid ).append( '\n' );
+        sb.append( tabs ).append( "  indexed attribute ID : " ).append( indexAttributeId ).append( '\n' );
 
         return sb.toString();
     }

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/InterceptorBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/InterceptorBean.java?rev=1027290&r1=1027289&r2=1027290&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/InterceptorBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/InterceptorBean.java Mon Oct 25 22:29:54 2010
@@ -29,13 +29,13 @@ package org.apache.directory.server.conf
 public class InterceptorBean extends AdsBaseBean implements Comparable<InterceptorBean>
 {
     /** The Interceptor ID */
-    private String interceptorid;
+    private String interceptorId;
     
     /** The interceptor FQCN */
-    private String interceptorclassname;
+    private String interceptorClassName;
     
     /** The interceptor position in the chain */
-    private int interceptororder;
+    private int interceptorOrder;
 
 
     /**
@@ -54,11 +54,11 @@ public class InterceptorBean extends Ads
      */
     public int compareTo( InterceptorBean o )
     {
-        if ( interceptororder > o.interceptororder )
+        if ( interceptorOrder > o.interceptorOrder )
         {
             return 1;
         }
-        else if ( interceptororder < o.interceptororder )
+        else if ( interceptorOrder < o.interceptorOrder )
         {
             return -1;
         }
@@ -72,7 +72,7 @@ public class InterceptorBean extends Ads
      */
     public String getInterceptorId() 
     {
-        return interceptorid;
+        return interceptorId;
     }
 
 
@@ -81,7 +81,7 @@ public class InterceptorBean extends Ads
      */
     public void setInterceptorId( String id ) 
     {
-        this.interceptorid = id;
+        this.interceptorId = id;
     }
 
 
@@ -90,7 +90,7 @@ public class InterceptorBean extends Ads
      */
     public int getInterceptorOrder() 
     {
-        return interceptororder;
+        return interceptorOrder;
     }
 
 
@@ -99,7 +99,7 @@ public class InterceptorBean extends Ads
      */
     public void setInterceptorOrder( int interceptorOrder ) 
     {
-        this.interceptororder = interceptorOrder;
+        this.interceptorOrder = interceptorOrder;
     }
 
 
@@ -108,7 +108,7 @@ public class InterceptorBean extends Ads
      */
     public String getInterceptorClassName()
     {
-        return interceptorclassname;
+        return interceptorClassName;
     }
 
 
@@ -117,7 +117,7 @@ public class InterceptorBean extends Ads
      */
     public void setFqcn( String interceptorClassName )
     {
-        this.interceptorclassname = interceptorClassName;
+        this.interceptorClassName = interceptorClassName;
     }
     
     
@@ -128,9 +128,9 @@ public class InterceptorBean extends Ads
     {
         StringBuilder sb = new StringBuilder();
         
-        sb.append( tabs ).append( "interceptor[" ).append( interceptororder ).append( "] : " ).append( '\n' );
-        sb.append( tabs ).append( "  interceptor id : " ).append( interceptorid ).append( '\n' );
-        sb.append( tabs ).append( "  class name : " ).append(  interceptorclassname ).append( '\n' );
+        sb.append( tabs ).append( "interceptor[" ).append( interceptorOrder ).append( "] : " ).append( '\n' );
+        sb.append( tabs ).append( "  interceptor id : " ).append( interceptorId ).append( '\n' );
+        sb.append( tabs ).append( "  class name : " ).append(  interceptorClassName ).append( '\n' );
         
         return sb.toString();
     }

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmIndexBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmIndexBean.java?rev=1027290&r1=1027289&r2=1027290&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmIndexBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmIndexBean.java Mon Oct 25 22:29:54 2010
@@ -34,16 +34,16 @@ public class JdbmIndexBean<K, E> extends
     private static final int DEFAULT_DUPLICATE_LIMIT = 512;
 
     /** the size (number of index entries) for the cache */
-    private int indexcachesize = DEFAULT_INDEX_CACHE_SIZE;
+    private int indexCacheSize = DEFAULT_INDEX_CACHE_SIZE;
 
     /** duplicate limit before duplicate keys switch to using a btree for values */
-    private int indexnumduplimit = DEFAULT_DUPLICATE_LIMIT;
+    private int indexNumDupLimit = DEFAULT_DUPLICATE_LIMIT;
     
     /** The index file name */
-    private String indexfilename;
+    private String indexFileName;
     
     /** The index working directory */
-    private String indexworkingdir;
+    private String indexWorkingDir;
 
     /**
      * Create a new JdbmIndexBean instance
@@ -60,7 +60,7 @@ public class JdbmIndexBean<K, E> extends
      */
     public int getIndexCacheSize()
     {
-        return indexcachesize;
+        return indexCacheSize;
     }
 
 
@@ -71,7 +71,7 @@ public class JdbmIndexBean<K, E> extends
      */
     public void setIndexCacheSize( int indexCacheSize )
     {
-        this.indexcachesize = indexCacheSize;
+        this.indexCacheSize = indexCacheSize;
     }
 
 
@@ -83,7 +83,7 @@ public class JdbmIndexBean<K, E> extends
      */
     public int getIndexNumDupLimit()
     {
-        return indexnumduplimit;
+        return indexNumDupLimit;
     }
 
 
@@ -95,7 +95,7 @@ public class JdbmIndexBean<K, E> extends
      */
     public void setIndexNumDupLimit( int indexNumDupLimit )
     {
-        this.indexnumduplimit = indexNumDupLimit;
+        this.indexNumDupLimit = indexNumDupLimit;
     }
 
 
@@ -104,7 +104,7 @@ public class JdbmIndexBean<K, E> extends
      */
     public String getIndexFileName()
     {
-        return indexfilename;
+        return indexFileName;
     }
 
 
@@ -113,7 +113,7 @@ public class JdbmIndexBean<K, E> extends
      */
     public void setIndexFileName( String indexFileName )
     {
-        this.indexfilename = indexFileName;
+        this.indexFileName = indexFileName;
     }
 
 
@@ -122,7 +122,7 @@ public class JdbmIndexBean<K, E> extends
      */
     public String getIndexWorkingDir()
     {
-        return indexworkingdir;
+        return indexWorkingDir;
     }
 
 
@@ -131,7 +131,7 @@ public class JdbmIndexBean<K, E> extends
      */
     public void setIndexWorkingDir( String indexWorkingDir )
     {
-        this.indexworkingdir = indexWorkingDir;
+        this.indexWorkingDir = indexWorkingDir;
     }
     
     
@@ -144,10 +144,10 @@ public class JdbmIndexBean<K, E> extends
         
         sb.append( tabs ).append( "JdbmIndexBean :\n" );
         sb.append( super.toString( tabs ) );
-        sb.append( toString( tabs, "  index file name", indexfilename ) );
-        sb.append( toString( tabs, "  index working directory", indexworkingdir ) );
-        sb.append( toString( tabs, "  index cache size", indexcachesize ) );
-        sb.append( toString( tabs, "  index num dup limit", indexnumduplimit ) );
+        sb.append( toString( tabs, "  index file name", indexFileName ) );
+        sb.append( toString( tabs, "  index working directory", indexWorkingDir ) );
+        sb.append( toString( tabs, "  index cache size", indexCacheSize ) );
+        sb.append( toString( tabs, "  index num dup limit", indexNumDupLimit ) );
         
         return sb.toString();
     }

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmPartitionBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmPartitionBean.java?rev=1027290&r1=1027289&r2=1027290&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmPartitionBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmPartitionBean.java Mon Oct 25 22:29:54 2010
@@ -29,10 +29,10 @@ package org.apache.directory.server.conf
 public class JdbmPartitionBean extends PartitionBean
 {
     /** The Entry cache size for this partition */
-    private int partitioncachesize = -1;
+    private int partitionCacheSize = -1;
 
     /** Tells if the optimizer is enabled or not */
-    private boolean jdbmpartitionoptimizerenabled = true;
+    private boolean jdbmPartitionOptimizerEnabled = true;
     
     /**
      * Create a new JdbmPartitionBean instance
@@ -51,7 +51,7 @@ public class JdbmPartitionBean extends P
      */
     public void setPartitionCacheSize( int partitionCacheSize )
     {
-        this.partitioncachesize = partitionCacheSize;
+        this.partitionCacheSize = partitionCacheSize;
     }
 
 
@@ -62,7 +62,7 @@ public class JdbmPartitionBean extends P
      */
     public int getPartitionCacheSize()
     {
-        return partitioncachesize;
+        return partitionCacheSize;
     }
 
     
@@ -71,7 +71,7 @@ public class JdbmPartitionBean extends P
      */
     public boolean isJdbmPartitionOptimizerEnabled()
     {
-        return jdbmpartitionoptimizerenabled;
+        return jdbmPartitionOptimizerEnabled;
     }
 
 
@@ -82,7 +82,7 @@ public class JdbmPartitionBean extends P
      */
     public void setJdbmPartitionOptimizerEnabled( boolean jdbmPartitionOptimizerEnabled )
     {
-        this.jdbmpartitionoptimizerenabled = jdbmPartitionOptimizerEnabled;
+        this.jdbmPartitionOptimizerEnabled = jdbmPartitionOptimizerEnabled;
     }
     
     
@@ -95,8 +95,8 @@ public class JdbmPartitionBean extends P
         
         sb.append( tabs ).append( "JdbmPartitionBean :\n" );
         sb.append( super.toString( tabs ) );
-        sb.append( tabs ).append( "  partition cache size : " ).append( partitioncachesize ).append( '\n' );
-        sb.append( toString( tabs, "  jdbm partition optimizer enabled", jdbmpartitionoptimizerenabled ) );
+        sb.append( tabs ).append( "  partition cache size : " ).append( partitionCacheSize ).append( '\n' );
+        sb.append( toString( tabs, "  jdbm partition optimizer enabled", jdbmPartitionOptimizerEnabled ) );
         
         return sb.toString();
     }

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JournalBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JournalBean.java?rev=1027290&r1=1027289&r2=1027290&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JournalBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JournalBean.java Mon Oct 25 22:29:54 2010
@@ -27,16 +27,16 @@ package org.apache.directory.server.conf
 public class JournalBean extends AdsBaseBean
 {
     /** The journal unique Id */
-    private String journalid;
+    private String journalId;
     
     /** The journal file name */
-    private String journalfilename;
+    private String journalFileName;
     
     /** The journal working directory */
-    private String journalworkingdir;
+    private String journalWorkingDir;
     
     /** The journal rotation */
-    private int journalrotation;
+    private int journalRotation;
 
     /**
      * Create a new JournalBean instance
@@ -44,7 +44,7 @@ public class JournalBean extends AdsBase
     public JournalBean()
     {
         // Default to infinite
-        journalrotation = 0;
+        journalRotation = 0;
         
         // Not enabled by default
         setEnabled( false );
@@ -56,7 +56,7 @@ public class JournalBean extends AdsBase
      */
     public String getJournalId()
     {
-        return journalid;
+        return journalId;
     }
 
 
@@ -65,7 +65,7 @@ public class JournalBean extends AdsBase
      */
     public void setJournalId( String journalId )
     {
-        this.journalid = journalId;
+        this.journalId = journalId;
     }
     
     
@@ -74,7 +74,7 @@ public class JournalBean extends AdsBase
      */
     public String getJournalFileName() 
     {
-        return journalfilename;
+        return journalFileName;
     }
 
     
@@ -83,7 +83,7 @@ public class JournalBean extends AdsBase
      */
     public void setJournalFileName( String journalFileName ) 
     {
-        this.journalfilename = journalFileName;
+        this.journalFileName = journalFileName;
     }
 
     
@@ -92,7 +92,7 @@ public class JournalBean extends AdsBase
      */
     public String getJournalWorkingDir() 
     {
-        return journalworkingdir;
+        return journalWorkingDir;
     }
 
     
@@ -101,7 +101,7 @@ public class JournalBean extends AdsBase
      */
     public void setJournalWorkingDir( String journalWorkingDir ) 
     {
-        this.journalworkingdir = journalWorkingDir;
+        this.journalWorkingDir = journalWorkingDir;
     }
 
     
@@ -110,7 +110,7 @@ public class JournalBean extends AdsBase
      */
     public int getJournalRotation() 
     {
-        return journalrotation;
+        return journalRotation;
     }
 
     
@@ -119,7 +119,7 @@ public class JournalBean extends AdsBase
      */
     public void setJournalRotation( int journalRotation ) 
     {
-        this.journalrotation = journalRotation;
+        this.journalRotation = journalRotation;
     }
     
     
@@ -131,10 +131,10 @@ public class JournalBean extends AdsBase
         StringBuilder sb = new StringBuilder();
         
         sb.append( tabs ).append( "Journal :\n" );
-        sb.append( tabs ).append( "  journal id : " ).append( journalid ).append( '\n' );
-        sb.append( tabs ).append( "  journal file name : " ).append( journalfilename ).append( '\n' );
-        sb.append( toString( tabs, "  journal working dir", journalworkingdir ) );
-        sb.append( toString( tabs, "  journal rotation", journalrotation ) );
+        sb.append( tabs ).append( "  journal id : " ).append( journalId ).append( '\n' );
+        sb.append( tabs ).append( "  journal file name : " ).append( journalFileName ).append( '\n' );
+        sb.append( toString( tabs, "  journal working dir", journalWorkingDir ) );
+        sb.append( toString( tabs, "  journal rotation", journalRotation ) );
         
         return sb.toString();
     }

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/KdcServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/KdcServerBean.java?rev=1027290&r1=1027289&r2=1027290&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/KdcServerBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/KdcServerBean.java Mon Oct 25 22:29:54 2010
@@ -38,7 +38,7 @@ public class KdcServerBean extends DSBas
     private static final boolean DEFAULT_EMPTY_ADDRESSES_ALLOWED = true;
 
     /** The allowable clock skew. */
-    private long krballowableclockskew = DEFAULT_ALLOWABLE_CLOCKSKEW;
+    private long krbAllowableClockSkew = DEFAULT_ALLOWABLE_CLOCKSKEW;
 
     /** The default for allowing forwardable tickets */
     private static final boolean DEFAULT_TGS_FORWARDABLE_ALLOWED = true;
@@ -71,37 +71,37 @@ public class KdcServerBean extends DSBas
     private static final String DEFAULT_PRINCIPAL = "krbtgt/EXAMPLE.COM@EXAMPLE.COM";
 
     /** Whether empty addresses are allowed. */
-    private boolean krbemptyaddressesallowed = DEFAULT_EMPTY_ADDRESSES_ALLOWED;
+    private boolean krbEmptyAddressesAllowed = DEFAULT_EMPTY_ADDRESSES_ALLOWED;
 
     /** Whether forwardable addresses are allowed. */
-    private boolean krbforwardableallowed = DEFAULT_TGS_FORWARDABLE_ALLOWED;
+    private boolean krbForwardableAllowed = DEFAULT_TGS_FORWARDABLE_ALLOWED;
 
     /** Whether pre-authentication by encrypted timestamp is required. */
-    private boolean krbpaenctimestamprequired = DEFAULT_PA_ENC_TIMESTAMP_REQUIRED;
+    private boolean krbPAEncTimestampRequired = DEFAULT_PA_ENC_TIMESTAMP_REQUIRED;
 
     /** Whether postdated tickets are allowed. */
-    private boolean krbpostdatedallowed = DEFAULT_TGS_POSTDATED_ALLOWED;
+    private boolean krbPostdatedAllowed = DEFAULT_TGS_POSTDATED_ALLOWED;
 
     /** Whether proxiable addresses are allowed. */
-    private boolean krbproxiableallowed = DEFAULT_TGS_PROXIABLE_ALLOWED;
+    private boolean krbProxiableAllowed = DEFAULT_TGS_PROXIABLE_ALLOWED;
 
     /** Whether renewable tickets are allowed. */
-    private boolean krbrenewableallowed = DEFAULT_TGS_RENEWABLE_ALLOWED;
+    private boolean krbRenewableAllowed = DEFAULT_TGS_RENEWABLE_ALLOWED;
 
     /** The maximum renewable lifetime. */
-    private long krbmaximumrenewablelifetime = DEFAULT_TGS_MAXIMUM_RENEWABLE_LIFETIME;
+    private long krbMaximumRenewableLifetime = DEFAULT_TGS_MAXIMUM_RENEWABLE_LIFETIME;
 
     /** The maximum ticket lifetime. */
-    private long krbmaximumticketlifetime = DEFAULT_TGS_MAXIMUM_TICKET_LIFETIME;
+    private long krbMaximumTicketLifetime = DEFAULT_TGS_MAXIMUM_TICKET_LIFETIME;
 
     /** The primary realm */
-    private String krbprimaryrealm = DEFAULT_REALM;
+    private String krbPrimaryRealm = DEFAULT_REALM;
 
     /** Whether to verify the body checksum. */
-    private boolean krbbodychecksumverified = DEFAULT_VERIFY_BODY_CHECKSUM;
+    private boolean krbBodyChecksumVerified = DEFAULT_VERIFY_BODY_CHECKSUM;
 
     /** The encryption types. */
-    private List<String> krbencryptiontypes = new ArrayList<String>();
+    private List<String> krbEncryptionTypes = new ArrayList<String>();
 
     /** The service principal name. */
     private String krbkdcprincipal = DEFAULT_PRINCIPAL;
@@ -125,7 +125,7 @@ public class KdcServerBean extends DSBas
      */
     public long getKrbAllowableClockSkew()
     {
-        return krballowableclockskew;
+        return krbAllowableClockSkew;
     }
 
 
@@ -134,7 +134,7 @@ public class KdcServerBean extends DSBas
      */
     public void setKrbAllowableClockSkew( long krbAllowableClockSkew )
     {
-        this.krballowableclockskew = krbAllowableClockSkew;
+        this.krbAllowableClockSkew = krbAllowableClockSkew;
     }
 
 
@@ -145,7 +145,7 @@ public class KdcServerBean extends DSBas
      */
     public List<String> getKrbEncryptionTypes()
     {
-        return krbencryptiontypes;
+        return krbEncryptionTypes;
     }
 
 
@@ -154,11 +154,11 @@ public class KdcServerBean extends DSBas
      * 
      * @param krbEncryptionTypes the encryptionTypes to set
      */
-    public void addkrbencryptiontypes( String... krbEncryptionTypes )
+    public void addKrbEncryptionTypes( String... krbEncryptionTypes )
     {
         for ( String encryptionType:krbEncryptionTypes )
         {
-            this.krbencryptiontypes.add( encryptionType );
+            this.krbEncryptionTypes.add( encryptionType );
         }
     }
 
@@ -168,7 +168,7 @@ public class KdcServerBean extends DSBas
      */
     public boolean isKrbEmptyAddressesAllowed()
     {
-        return krbemptyaddressesallowed;
+        return krbEmptyAddressesAllowed;
     }
 
 
@@ -177,7 +177,7 @@ public class KdcServerBean extends DSBas
      */
     public void setKrbEmptyAddressesAllowed( boolean krbEmptyAddressesAllowed )
     {
-        this.krbemptyaddressesallowed = krbEmptyAddressesAllowed;
+        this.krbEmptyAddressesAllowed = krbEmptyAddressesAllowed;
     }
 
 
@@ -186,7 +186,7 @@ public class KdcServerBean extends DSBas
      */
     public boolean isKrbForwardableAllowed()
     {
-        return krbforwardableallowed;
+        return krbForwardableAllowed;
     }
 
 
@@ -195,7 +195,7 @@ public class KdcServerBean extends DSBas
      */
     public void setKrbForwardableAllowed( boolean krbForwardableAllowed )
     {
-        this.krbforwardableallowed = krbForwardableAllowed;
+        this.krbForwardableAllowed = krbForwardableAllowed;
     }
 
 
@@ -206,7 +206,7 @@ public class KdcServerBean extends DSBas
      */
     public boolean isKrbPaEncTimestampRequired()
     {
-        return krbpaenctimestamprequired;
+        return krbPAEncTimestampRequired;
     }
 
 
@@ -215,7 +215,7 @@ public class KdcServerBean extends DSBas
      */
     public void setKrbPaEncTimestampRequired( boolean krbPaEncTimestampRequired )
     {
-        this.krbpaenctimestamprequired = krbPaEncTimestampRequired;
+        this.krbPAEncTimestampRequired = krbPaEncTimestampRequired;
     }
 
 
@@ -224,7 +224,7 @@ public class KdcServerBean extends DSBas
      */
     public boolean isKrbPostdatedAllowed()
     {
-        return krbpostdatedallowed;
+        return krbPostdatedAllowed;
     }
 
 
@@ -233,7 +233,7 @@ public class KdcServerBean extends DSBas
      */
     public void setKrbPostdatedAllowed( boolean krbPostdatedAllowed )
     {
-        this.krbpostdatedallowed = krbPostdatedAllowed;
+        this.krbPostdatedAllowed = krbPostdatedAllowed;
     }
 
 
@@ -242,7 +242,7 @@ public class KdcServerBean extends DSBas
      */
     public boolean isKrbProxiableAllowed()
     {
-        return krbproxiableallowed;
+        return krbProxiableAllowed;
     }
 
 
@@ -251,7 +251,7 @@ public class KdcServerBean extends DSBas
      */
     public void setKrbProxiableAllowed( boolean krbProxiableAllowed )
     {
-        this.krbproxiableallowed = krbProxiableAllowed;
+        this.krbProxiableAllowed = krbProxiableAllowed;
     }
 
 
@@ -260,7 +260,7 @@ public class KdcServerBean extends DSBas
      */
     public boolean isKrbRenewableAllowed()
     {
-        return krbrenewableallowed;
+        return krbRenewableAllowed;
     }
 
 
@@ -269,7 +269,7 @@ public class KdcServerBean extends DSBas
      */
     public void setKrbRenewableAllowed( boolean krbRenewableAllowed )
     {
-        this.krbrenewableallowed = krbRenewableAllowed;
+        this.krbRenewableAllowed = krbRenewableAllowed;
     }
 
 
@@ -278,7 +278,7 @@ public class KdcServerBean extends DSBas
      */
     public long getKrbMaximumRenewableLifetime()
     {
-        return krbmaximumrenewablelifetime;
+        return krbMaximumRenewableLifetime;
     }
 
 
@@ -287,7 +287,7 @@ public class KdcServerBean extends DSBas
      */
     public void setKrbMaximumRenewableLifetime( long krbMaximumRenewableLifetime )
     {
-        this.krbmaximumrenewablelifetime = krbMaximumRenewableLifetime;
+        this.krbMaximumRenewableLifetime = krbMaximumRenewableLifetime;
     }
 
 
@@ -296,7 +296,7 @@ public class KdcServerBean extends DSBas
      */
     public long getKrbMaximumTicketLifetime()
     {
-        return krbmaximumticketlifetime;
+        return krbMaximumTicketLifetime;
     }
 
 
@@ -305,7 +305,7 @@ public class KdcServerBean extends DSBas
      */
     public void setKrbMaximumTicketLifetime( long krbMaximumTicketLifetime )
     {
-        this.krbmaximumticketlifetime = krbMaximumTicketLifetime;
+        this.krbMaximumTicketLifetime = krbMaximumTicketLifetime;
     }
 
 
@@ -316,7 +316,7 @@ public class KdcServerBean extends DSBas
      */
     public String getKrbPrimaryRealm()
     {
-        return krbprimaryrealm;
+        return krbPrimaryRealm;
     }
 
 
@@ -325,7 +325,7 @@ public class KdcServerBean extends DSBas
      */
     public void setKrbPrimaryRealm( String krbPrimaryRealm )
     {
-        this.krbprimaryrealm = krbPrimaryRealm;
+        this.krbPrimaryRealm = krbPrimaryRealm;
     }
 
 
@@ -334,7 +334,7 @@ public class KdcServerBean extends DSBas
      */
     public boolean isKrbBodyChecksumVerified()
     {
-        return krbbodychecksumverified;
+        return krbBodyChecksumVerified;
     }
 
 
@@ -343,7 +343,7 @@ public class KdcServerBean extends DSBas
      */
     public void setKrbBodyChecksumVerified( boolean krbBodyChecksumVerified )
     {
-        this.krbbodychecksumverified = krbBodyChecksumVerified;
+        this.krbBodyChecksumVerified = krbBodyChecksumVerified;
     }
 
 
@@ -376,24 +376,24 @@ public class KdcServerBean extends DSBas
         
         sb.append( tabs ).append( "KDCServer :\n" );
         sb.append( super.toString( tabs + "  " ) );
-        sb.append( toString( tabs, "  body checksum verified", krbbodychecksumverified ) );
-        sb.append( toString( tabs, "  empty address alowed", krbemptyaddressesallowed ) );
-        sb.append( toString( tabs, "  forwardable allowed", krbforwardableallowed ) );
-        sb.append( toString( tabs, "  PA encode timestamp required", krbpaenctimestamprequired ) );
-        sb.append( toString( tabs, "  postdated allowed", krbpostdatedallowed ) );
-        sb.append( toString( tabs, "  proxiable allowed", krbproxiableallowed ) );
-        sb.append( toString( tabs, "  renew allowed", krbrenewableallowed ) );
-        sb.append( toString( tabs, "  allowable clock skew", krballowableclockskew ) );
+        sb.append( toString( tabs, "  body checksum verified", krbBodyChecksumVerified ) );
+        sb.append( toString( tabs, "  empty address alowed", krbEmptyAddressesAllowed ) );
+        sb.append( toString( tabs, "  forwardable allowed", krbForwardableAllowed ) );
+        sb.append( toString( tabs, "  PA encode timestamp required", krbPAEncTimestampRequired ) );
+        sb.append( toString( tabs, "  postdated allowed", krbPostdatedAllowed ) );
+        sb.append( toString( tabs, "  proxiable allowed", krbProxiableAllowed ) );
+        sb.append( toString( tabs, "  renew allowed", krbRenewableAllowed ) );
+        sb.append( toString( tabs, "  allowable clock skew", krbAllowableClockSkew ) );
         sb.append( toString( tabs, "  KDC principal", krbkdcprincipal ) );
-        sb.append( toString( tabs, "  maximum renewable lifetime", krbmaximumrenewablelifetime ) );
-        sb.append( toString( tabs, "  maximum ticket lifetime", krbmaximumticketlifetime ) );
-        sb.append( toString( tabs, "  primary realm", krbprimaryrealm ) );
+        sb.append( toString( tabs, "  maximum renewable lifetime", krbMaximumRenewableLifetime ) );
+        sb.append( toString( tabs, "  maximum ticket lifetime", krbMaximumTicketLifetime ) );
+        sb.append( toString( tabs, "  primary realm", krbPrimaryRealm ) );
 
-        if ( ( krbencryptiontypes != null ) && ( krbencryptiontypes.size() > 0 ) )
+        if ( ( krbEncryptionTypes != null ) && ( krbEncryptionTypes.size() > 0 ) )
         {
             sb.append( tabs ).append( "  encryption types :\n" );
             
-            for ( String encryptionType : krbencryptiontypes )
+            for ( String encryptionType : krbEncryptionTypes )
             {
                 sb.append( toString( tabs, "    encryption type", encryptionType ) );
             }

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java?rev=1027290&r1=1027289&r2=1027290&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java Mon Oct 25 22:29:54 2010
@@ -36,43 +36,43 @@ public class LdapServerBean extends DSBa
     private boolean confidentialityrequired;
     
     /** The maximum number of entries returned by the server */
-    private int maxsizelimit;
+    private int maxSizeLimit;
     
     /** The maximum time to execute a request on the server */
-    private int maxtimelimit;
+    private int maxTimeLimit;
     
     /** The SASL host */
-    private String saslhost;
+    private String saslHost;
     
     /** The SASL  principal */
-    private String saslprincipal;
+    private String saslPrincipal;
     
     /** The SASL realms */
-    private Set<String> saslrealms = new HashSet<String>();
+    private Set<String> saslRealms = new HashSet<String>();
     
     /** The keystore file */
-    private String keystorefile;
+    private String keystoreFile;
     
     /** The certificate password */
-    private String certificatepassword;
+    private String certificatePassword;
     
     /** tells if the replication is enabled */
-    private boolean enablereplprovider; 
+    private boolean enableReplProvider; 
     
     /** The PasswordPolicy component */
-    private PasswordPolicyBean passwordpolicy;
+    private PasswordPolicyBean passwordPolicy;
 
     /** The replication consumer Bean */
-    private ReplConsumerBean replconsumer;
+    private ReplConsumerBean replConsumer;
     
     /** The replication producer Bean */
-    private ReplProviderBean replprovider;
+    private ReplProviderBean replProvider;
     
     /** The list of supported mechanisms */
-    private List<SaslMechHandlerBean> saslmechhandlers = new ArrayList<SaslMechHandlerBean>();
+    private List<SaslMechHandlerBean> saslMechHandlers = new ArrayList<SaslMechHandlerBean>();
     
     /** The list of supported extended operation handlers */
-    private List<ExtendedOpHandlerBean> extendedophandlers = new ArrayList<ExtendedOpHandlerBean>();
+    private List<ExtendedOpHandlerBean> extendedOpHandlers = new ArrayList<ExtendedOpHandlerBean>();
 
     /**
      * Create a new LdapServerBean instance
@@ -109,7 +109,7 @@ public class LdapServerBean extends DSBa
      */
     public int getLdapServerMaxSizeLimit()
     {
-        return maxsizelimit;
+        return maxSizeLimit;
     }
 
     
@@ -118,7 +118,7 @@ public class LdapServerBean extends DSBa
      */
     public void setLdapServerMaxSizeLimit( int ldapServerMaxSizeLimit )
     {
-        this.maxsizelimit = ldapServerMaxSizeLimit;
+        this.maxSizeLimit = ldapServerMaxSizeLimit;
     }
 
     
@@ -127,7 +127,7 @@ public class LdapServerBean extends DSBa
      */
     public int getLdapServerMaxTimeLimit()
     {
-        return maxtimelimit;
+        return maxTimeLimit;
     }
 
     
@@ -136,7 +136,7 @@ public class LdapServerBean extends DSBa
      */
     public void setLdapServerMaxTimeLimit( int ldapServerMaxTimeLimit )
     {
-        this.maxtimelimit = ldapServerMaxTimeLimit;
+        this.maxTimeLimit = ldapServerMaxTimeLimit;
     }
 
     
@@ -145,7 +145,7 @@ public class LdapServerBean extends DSBa
      */
     public String getLdapServerSaslHost()
     {
-        return saslhost;
+        return saslHost;
     }
 
     
@@ -154,7 +154,7 @@ public class LdapServerBean extends DSBa
      */
     public void setLdapServerSaslHost( String ldapServerSaslHost )
     {
-        this.saslhost = ldapServerSaslHost;
+        this.saslHost = ldapServerSaslHost;
     }
 
     
@@ -163,7 +163,7 @@ public class LdapServerBean extends DSBa
      */
     public String getLdapServerSaslPrincipal()
     {
-        return saslprincipal;
+        return saslPrincipal;
     }
 
     
@@ -172,7 +172,7 @@ public class LdapServerBean extends DSBa
      */
     public void setLdapServerSaslPrincipal( String ldapServerSaslPrincipal )
     {
-        this.saslprincipal = ldapServerSaslPrincipal;
+        this.saslPrincipal = ldapServerSaslPrincipal;
     }
 
     
@@ -181,7 +181,7 @@ public class LdapServerBean extends DSBa
      */
     public Set<String> getLdapServerSaslRealms()
     {
-        return saslrealms;
+        return saslRealms;
     }
 
     
@@ -190,18 +190,18 @@ public class LdapServerBean extends DSBa
      */
     public void setLdapServerSaslRealms( Set<String> ldapServerSaslRealms )
     {
-        this.saslrealms = ldapServerSaslRealms;
+        this.saslRealms = ldapServerSaslRealms;
     }
 
     
     /**
      * @param ldapServerSaslRealms the ldapServerSaslRealms to add
      */
-    public void addsaslrealms( String... ldapServerSaslRealms )
+    public void addSaslRealms( String... ldapServerSaslRealms )
     {
         for ( String saslRealm : ldapServerSaslRealms )
         {
-            this.saslrealms.add( saslRealm );
+            this.saslRealms.add( saslRealm );
         }
     }
 
@@ -211,7 +211,7 @@ public class LdapServerBean extends DSBa
      */
     public String getLdapServerKeystoreFile()
     {
-        return keystorefile;
+        return keystoreFile;
     }
 
     
@@ -220,7 +220,7 @@ public class LdapServerBean extends DSBa
      */
     public void setLdapServerKeystoreFile( String ldapServerKeystoreFile )
     {
-        this.keystorefile = ldapServerKeystoreFile;
+        this.keystoreFile = ldapServerKeystoreFile;
     }
 
     
@@ -229,7 +229,7 @@ public class LdapServerBean extends DSBa
      */
     public String getLdapServerCertificatePassword()
     {
-        return certificatepassword;
+        return certificatePassword;
     }
 
     
@@ -238,7 +238,7 @@ public class LdapServerBean extends DSBa
      */
     public void setLdapServerCertificatePassword( String ldapServerCertificatePassword )
     {
-        this.certificatepassword = ldapServerCertificatePassword;
+        this.certificatePassword = ldapServerCertificatePassword;
     }
 
     
@@ -265,7 +265,7 @@ public class LdapServerBean extends DSBa
      */
     public boolean isEnableReplProvider()
     {
-        return enablereplprovider;
+        return enableReplProvider;
     }
 
     
@@ -274,7 +274,7 @@ public class LdapServerBean extends DSBa
      */
     public void setEnableReplProvider( boolean enableReplProvider )
     {
-        this.enablereplprovider = enableReplProvider;
+        this.enableReplProvider = enableReplProvider;
     }
 
     
@@ -283,7 +283,7 @@ public class LdapServerBean extends DSBa
      */
     public List<SaslMechHandlerBean> getSaslMechHandlers()
     {
-        return saslmechhandlers;
+        return saslMechHandlers;
     }
 
     
@@ -292,7 +292,7 @@ public class LdapServerBean extends DSBa
      */
     public void setSaslMechHandlers( List<SaslMechHandlerBean> saslMechHandlers )
     {
-        this.saslmechhandlers = saslMechHandlers;
+        this.saslMechHandlers = saslMechHandlers;
     }
 
     
@@ -303,7 +303,7 @@ public class LdapServerBean extends DSBa
     {
         for ( SaslMechHandlerBean saslMechHandler : saslMechHandlers )
         {
-            this.saslmechhandlers.add( saslMechHandler );
+            this.saslMechHandlers.add( saslMechHandler );
         }
     }
 
@@ -313,7 +313,7 @@ public class LdapServerBean extends DSBa
      */
     public List<ExtendedOpHandlerBean> getExtendedOps()
     {
-        return extendedophandlers;
+        return extendedOpHandlers;
     }
 
     
@@ -322,7 +322,7 @@ public class LdapServerBean extends DSBa
      */
     public void setExtendedOps( List<ExtendedOpHandlerBean> extendedOps )
     {
-        this.extendedophandlers = extendedOps;
+        this.extendedOpHandlers = extendedOps;
     }
 
     
@@ -333,7 +333,7 @@ public class LdapServerBean extends DSBa
     {
         for ( ExtendedOpHandlerBean extendedOp : extendedOps )
         {   
-            this.extendedophandlers.add( extendedOp );
+            this.extendedOpHandlers.add( extendedOp );
         }
     }
 
@@ -343,7 +343,7 @@ public class LdapServerBean extends DSBa
      */
     public PasswordPolicyBean getPwdPolicy()
     {
-        return passwordpolicy;
+        return passwordPolicy;
     }
 
 
@@ -352,7 +352,7 @@ public class LdapServerBean extends DSBa
      */
     public void setPwdPolicy( PasswordPolicyBean pwdPolicy )
     {
-        this.passwordpolicy = pwdPolicy;
+        this.passwordPolicy = pwdPolicy;
     }
 
 
@@ -361,7 +361,7 @@ public class LdapServerBean extends DSBa
      */
     public ReplConsumerBean getReplConsumer()
     {
-        return replconsumer;
+        return replConsumer;
     }
 
 
@@ -370,7 +370,7 @@ public class LdapServerBean extends DSBa
      */
     public void setReplConsumer( ReplConsumerBean replConsumer )
     {
-        this.replconsumer = replConsumer;
+        this.replConsumer = replConsumer;
     }
 
 
@@ -379,7 +379,7 @@ public class LdapServerBean extends DSBa
      */
     public ReplProviderBean getReplProvider()
     {
-        return replprovider;
+        return replProvider;
     }
 
 
@@ -388,7 +388,7 @@ public class LdapServerBean extends DSBa
      */
     public void setReplProvider( ReplProviderBean replProvider )
     {
-        this.replprovider = replProvider;
+        this.replProvider = replProvider;
     }
 
     
@@ -401,58 +401,58 @@ public class LdapServerBean extends DSBa
         
         sb.append( tabs ).append( "LdapServer :\n" );
         sb.append( super.toString( tabs + "  " ) );
-        sb.append( tabs ).append( "  max size limit : " ).append( maxsizelimit ).append( '\n' );
-        sb.append( tabs ).append( "  max time limit : " ).append( maxtimelimit ).append( '\n' );
-        sb.append( toString( tabs, "  certificate password", certificatepassword ) );
-        sb.append( toString( tabs, "  keystore file", keystorefile ) );
-        sb.append( toString( tabs, "  sasl principal", saslprincipal ) );
-        sb.append( tabs ).append( "  sasl host : " ).append( saslhost ).append( '\n' );
+        sb.append( tabs ).append( "  max size limit : " ).append( maxSizeLimit ).append( '\n' );
+        sb.append( tabs ).append( "  max time limit : " ).append( maxTimeLimit ).append( '\n' );
+        sb.append( toString( tabs, "  certificate password", certificatePassword ) );
+        sb.append( toString( tabs, "  keystore file", keystoreFile ) );
+        sb.append( toString( tabs, "  sasl principal", saslPrincipal ) );
+        sb.append( tabs ).append( "  sasl host : " ).append( saslHost ).append( '\n' );
         sb.append( toString( tabs, "  confidentiality required", confidentialityrequired ) );
-        sb.append( toString( tabs, "  enable replication provider", enablereplprovider ) );
+        sb.append( toString( tabs, "  enable replication provider", enableReplProvider ) );
         
-        if ( ( extendedophandlers != null ) && ( extendedophandlers.size() > 0 ) )
+        if ( ( extendedOpHandlers != null ) && ( extendedOpHandlers.size() > 0 ) )
         {
             sb.append( tabs ).append( "  extended operation handlers :\n" );
             
-            for ( ExtendedOpHandlerBean extendedOpHandler : extendedophandlers )
+            for ( ExtendedOpHandlerBean extendedOpHandler : extendedOpHandlers )
             {
                 sb.append( extendedOpHandler.toString( tabs + "    " ) );
             }
         }
         
-        if ( saslmechhandlers != null )
+        if ( saslMechHandlers != null )
         {
             sb.append( tabs ).append( "  SASL mechanism handlers :\n" );
             
-            for ( SaslMechHandlerBean saslMechHandler : saslmechhandlers )
+            for ( SaslMechHandlerBean saslMechHandler : saslMechHandlers )
             {
                 sb.append( saslMechHandler.toString( tabs + "    " ) );
             }
         }
         
-        if ( ( saslrealms != null ) && ( saslrealms.size() > 0 ) )
+        if ( ( saslRealms != null ) && ( saslRealms.size() > 0 ) )
         {
             sb.append( tabs ).append( "  SASL realms :\n" );
             
-            for ( String saslRealm : saslrealms )
+            for ( String saslRealm : saslRealms )
             {
                 sb.append( tabs ).append( "    " ).append( saslRealm ).append( "\n" );
             }
         }
         
-        if ( passwordpolicy != null )
+        if ( passwordPolicy != null )
         {
-            sb.append( tabs ).append( passwordpolicy.toString( tabs + "  " ) );
+            sb.append( tabs ).append( passwordPolicy.toString( tabs + "  " ) );
         }
         
-        if ( replconsumer != null )
+        if ( replConsumer != null )
         {
-            sb.append( tabs ).append( replconsumer.toString( tabs + "  " ) );
+            sb.append( tabs ).append( replConsumer.toString( tabs + "  " ) );
         }
         
-        if ( replprovider != null )
+        if ( replProvider != null )
         {
-            sb.append( tabs ).append( replprovider.toString( tabs + "  " ) );
+            sb.append( tabs ).append( replProvider.toString( tabs + "  " ) );
         }
         
         return sb.toString();

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java?rev=1027290&r1=1027289&r2=1027290&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java Mon Oct 25 22:29:54 2010
@@ -29,13 +29,13 @@ import java.util.List;
 public abstract class PartitionBean extends AdsBaseBean
 {
     /** The Partition identifier */
-    private String partitionid;
+    private String partitionId;
     
     /** The Partition suffix */
-    private String partitionsuffix;
+    private String partitionSuffix;
     
     /** Tells if the data should be flushed to disk immediately */
-    private boolean partitionsynconwrite;
+    private boolean partitionSyncOnWrite;
 
     /** The list of declared indexes */
     private List<IndexBean> indexes;
@@ -53,7 +53,7 @@ public abstract class PartitionBean exte
      */
     public String getPartitionId()
     {
-        return partitionid;
+        return partitionId;
     }
 
     
@@ -62,7 +62,7 @@ public abstract class PartitionBean exte
      */
     public void setPartitionId( String partitionId )
     {
-        this.partitionid = partitionId;
+        this.partitionId = partitionId;
     }
 
     
@@ -71,7 +71,7 @@ public abstract class PartitionBean exte
      */
     public String getPartitionSuffix()
     {
-        return partitionsuffix;
+        return partitionSuffix;
     }
 
     
@@ -80,7 +80,7 @@ public abstract class PartitionBean exte
      */
     public void setPartitionSuffix( String partitionSuffix )
     {
-        this.partitionsuffix = partitionSuffix;
+        this.partitionSuffix = partitionSuffix;
     }
 
     
@@ -89,7 +89,7 @@ public abstract class PartitionBean exte
      */
     public boolean isPartitionSyncOnWrite()
     {
-        return partitionsynconwrite;
+        return partitionSyncOnWrite;
     }
 
     
@@ -98,7 +98,7 @@ public abstract class PartitionBean exte
      */
     public void setPartitionSyncOnWrite( boolean partitionSyncOnWrite )
     {
-        this.partitionsynconwrite = partitionSyncOnWrite;
+        this.partitionSyncOnWrite = partitionSyncOnWrite;
     }
     
     
@@ -128,9 +128,9 @@ public abstract class PartitionBean exte
         StringBuilder sb = new StringBuilder();
         
         sb.append( super.toString( tabs + "  " ) );
-        sb.append( tabs ).append( "  partition ID : " ).append( partitionid ).append( '\n' );
-        sb.append( tabs ).append( "  suffix : " ).append( partitionsuffix ).append( '\n' );
-        sb.append( toString( tabs, "  sync on write", partitionsynconwrite ) );
+        sb.append( tabs ).append( "  partition ID : " ).append( partitionId ).append( '\n' );
+        sb.append( tabs ).append( "  suffix : " ).append( partitionSuffix ).append( '\n' );
+        sb.append( toString( tabs, "  sync on write", partitionSyncOnWrite ) );
         
         sb.append( tabs ).append( "  indexes : \n" );
         



Mime
View raw message