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:59:39 UTC
svn commit: r1027209 - in
/directory/apacheds/branches/apacheds-config/server-config/src/main:
java/org/apache/directory/server/config/
java/org/apache/directory/server/config/beans/ resources/
Author: elecharny
Date: Mon Oct 25 17:59:39 2010
New Revision: 1027209
URL: http://svn.apache.org/viewvc?rev=1027209&view=rev
Log:
Added code to process Journal and Changelog
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/DirectoryServiceBean.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/resources/config.ldif
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=1027209&r1=1027208&r2=1027209&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:59:39 2010
@@ -1034,9 +1034,6 @@ public class ConfigPartitionReader
Set<AttributeType> musts = getAllMusts( objectClass );
readFields( bean, entry, musts, MANDATORY );
- System.out.println("----------------------------");
- System.out.println( "Read ben : " + bean );
-
beans.add( bean );
}
while ( cursor.next() );
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=1027209&r1=1027208&r2=1027209&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 17:59:39 2010
@@ -90,7 +90,7 @@ 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( 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/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=1027209&r1=1027208&r2=1027209&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:59:39 2010
@@ -470,13 +470,12 @@ public class DirectoryServiceBean extend
if ( journal != null )
{
- sb.append( " journal : \n" );
- sb.append( journal.toString( " " ) );
+ sb.append( journal.toString( " " ) );
}
if ( changelog != null )
{
- sb.append( changelog.toString( " " ) );
+ sb.append( changelog.toString( " " ) );
}
if ( passwordpolicy != null )
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=1027209&r1=1027208&r2=1027209&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 17:59:39 2010
@@ -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( tabs ).append( " journal working dir :" ).append( journalworkingdir ).append( '\n' );
- sb.append( tabs ).append( " journal rotation :" ).append( journalrotation ).append( '\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 ) );
return sb.toString();
}
Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config.ldif?rev=1027209&r1=1027208&r2=1027209&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config.ldif (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config.ldif Mon Oct 25 17:59:39 2010
@@ -45,6 +45,24 @@ ads-interceptors: subentryInterceptor
ads-interceptors: triggerInterceptor
ads-enabled: true
+dn: ads-changeLogId=defaultChangeLog,ads-directoryServiceId=default,ou=config
+objectclass: top
+objectclass: ads-base
+objectclass: ads-changeLog
+ads-changeLogId: defaultChangeLog
+ads-changeLogExposed: FALSE
+
+
+dn: ads-journalId=defaultJournal,ads-directoryServiceId=default,ou=config
+objectclass: top
+objectclass: ads-base
+objectclass: ads-journal
+ads-journalId: defaultJournal
+ads-journalFileName: Journal.txt
+ads-journalWorkingDir: /
+ads-journalRotation: 2
+
+
dn: ou=interceptors,ads-directoryServiceId=default,ou=config
ou: interceptors
objectclass: organizationalUnit