You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/10/25 19:42:58 UTC
svn commit: r1027202 - in
/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config:
ConfigPartitionReader.java beans/DirectoryServiceBean.java
beans/JdbmIndexBean.java
Author: elecharny
Date: Mon Oct 25 17:42:58 2010
New Revision: 1027202
URL: http://svn.apache.org/viewvc?rev=1027202&view=rev
Log:
Fixed the Index configurtion processing
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/DirectoryServiceBean.java
directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmIndexBean.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=1027202&r1=1027201&r2=1027202&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 17:42:58 2010
@@ -899,6 +899,12 @@ public class ConfigPartitionReader
// We have to remove the 's' at the end of the field name
String attributeName = fieldName.substring( 0, fieldName.length() - 1 );
+ if ( !schemaManager.getObjectClassRegistry().contains( attributeName ) )
+ {
+ // Try by removing 'es'
+ attributeName = fieldName.substring( 0, fieldName.length() - 2 );
+ }
+
Collection<AdsBaseBean> beans = read( newBase, attributeName, SearchScope.ONELEVEL, mandatory );
beanField.set( bean, beans );
}
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=1027202&r1=1027201&r2=1027202&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 17:42:58 2010
@@ -481,7 +481,7 @@ public class DirectoryServiceBean extend
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/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=1027202&r1=1027201&r2=1027202&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 17:42:58 2010
@@ -143,11 +143,11 @@ public class JdbmIndexBean<K, E> extends
StringBuilder sb = new StringBuilder();
sb.append( tabs ).append( "JdbmIndexBean :\n" );
- sb.append( super.toString( tabs + " " ) );
- sb.append( tabs ).append( " index file name : " ).append( indexfilename );
- sb.append( tabs ).append( " index working directory : " ).append( indexworkingdir );
- sb.append( tabs ).append( " index cache size : " ).append( indexcachesize );
- sb.append( tabs ).append( " index num dup limit : " ).append( indexnumduplimit );
+ 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 ) );
return sb.toString();
}