directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
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 GMT
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 <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @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 );
 }



Mime
View raw message