Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 58055 invoked from network); 16 Mar 2009 13:01:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 16 Mar 2009 13:01:01 -0000 Received: (qmail 53816 invoked by uid 500); 16 Mar 2009 13:01:01 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 53747 invoked by uid 500); 16 Mar 2009 13:01:01 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 53738 invoked by uid 99); 16 Mar 2009 13:01:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Mar 2009 06:01:01 -0700 X-ASF-Spam-Status: No, hits=-1998.8 required=10.0 tests=ALL_TRUSTED,FS_REPLICA X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Mar 2009 13:00:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A17D223888EB; Mon, 16 Mar 2009 13:00:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r754882 - in /directory/apacheds/branches/apacheds-replication/core/src/main/java/org/apache/directory/server/core/journal: DefaultJournal.java DefaultJournalStore.java Journal.java JournalStore.java Date: Mon, 16 Mar 2009 13:00:37 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090316130037.A17D223888EB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Mon Mar 16 13:00:36 2009 New Revision: 754882 URL: http://svn.apache.org/viewvc?rev=754882&view=rev Log: o Added XBeans tags to Journal. o Added the missing setters Modified: directory/apacheds/branches/apacheds-replication/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournal.java directory/apacheds/branches/apacheds-replication/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournalStore.java directory/apacheds/branches/apacheds-replication/core/src/main/java/org/apache/directory/server/core/journal/Journal.java directory/apacheds/branches/apacheds-replication/core/src/main/java/org/apache/directory/server/core/journal/JournalStore.java Modified: directory/apacheds/branches/apacheds-replication/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournal.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournal.java?rev=754882&r1=754881&r2=754882&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-replication/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournal.java (original) +++ directory/apacheds/branches/apacheds-replication/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournal.java Mon Mar 16 13:00:36 2009 @@ -18,8 +18,6 @@ */ package org.apache.directory.server.core.journal; -import java.util.concurrent.atomic.AtomicLong; - import org.apache.directory.server.core.DirectoryService; import org.apache.directory.server.core.authn.LdapPrincipal; import org.apache.directory.shared.ldap.ldif.LdifEntry; Modified: directory/apacheds/branches/apacheds-replication/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournalStore.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournalStore.java?rev=754882&r1=754881&r2=754882&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-replication/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournalStore.java (original) +++ directory/apacheds/branches/apacheds-replication/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournalStore.java Mon Mar 16 13:00:36 2009 @@ -72,7 +72,10 @@ */ public void init( DirectoryService service ) throws Exception { - workingDirectory = service.getWorkingDirectory(); + if ( workingDirectory == null ) + { + workingDirectory = service.getWorkingDirectory(); + } /** Load or create the journal file */ if ( fileName == null ) @@ -224,4 +227,13 @@ { this.fileName = fileName; } + + + /** + * {@inheritDoc} + */ + public void setWorkingDirectory( String workingDirectoryName ) + { + this.workingDirectory = new File( workingDirectoryName ); + } } Modified: directory/apacheds/branches/apacheds-replication/core/src/main/java/org/apache/directory/server/core/journal/Journal.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/core/src/main/java/org/apache/directory/server/core/journal/Journal.java?rev=754882&r1=754881&r2=754882&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-replication/core/src/main/java/org/apache/directory/server/core/journal/Journal.java (original) +++ directory/apacheds/branches/apacheds-replication/core/src/main/java/org/apache/directory/server/core/journal/Journal.java Mon Mar 16 13:00:36 2009 @@ -28,6 +28,7 @@ /** * A facade for the Journal subsystem. * + * @org.apache.xbean.XBean * @author Apache Directory Project * @version $Rev$, $Date$ */ Modified: directory/apacheds/branches/apacheds-replication/core/src/main/java/org/apache/directory/server/core/journal/JournalStore.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/core/src/main/java/org/apache/directory/server/core/journal/JournalStore.java?rev=754882&r1=754881&r2=754882&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-replication/core/src/main/java/org/apache/directory/server/core/journal/JournalStore.java (original) +++ directory/apacheds/branches/apacheds-replication/core/src/main/java/org/apache/directory/server/core/journal/JournalStore.java Mon Mar 16 13:00:36 2009 @@ -98,4 +98,17 @@ * @throws Exception if there are problems logging the nack */ boolean nack( long revision ); + + + /** + * @param fileName the fileName to set + */ + void setFileName( String fileName ); + + + /** + * @param workingDirectory The working directory in which the journal file + * will be stored + */ + void setWorkingDirectory( String workingDirectory ); }