You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sa...@apache.org on 2011/11/02 14:11:13 UTC
svn commit: r1196565 - in /directory/apacheds/branches/apacheds-txns:
core-api/src/main/java/org/apache/directory/server/core/api/log/
core-api/src/main/java/org/apache/directory/server/core/api/txn/
core-api/src/main/java/org/apache/directory/server/c...
Author: saya
Date: Wed Nov 2 13:11:12 2011
New Revision: 1196565
URL: http://svn.apache.org/viewvc?rev=1196565&view=rev
Log:
third part of packaage reorg
Added:
directory/apacheds/branches/apacheds-txns/core-shared/src/test/java/org/apache/directory/server/core/shared/
directory/apacheds/branches/apacheds-txns/core-shared/src/test/java/org/apache/directory/server/core/shared/log/
- copied from r1196552, directory/apacheds/branches/apacheds-txns/core-shared/src/test/java/org/apache/directory/server/core/log/
directory/apacheds/branches/apacheds-txns/core-shared/src/test/java/org/apache/directory/server/core/shared/txn/
- copied from r1196552, directory/apacheds/branches/apacheds-txns/core-shared/src/test/java/org/apache/directory/server/core/txn/
Removed:
directory/apacheds/branches/apacheds-txns/core-shared/src/test/java/org/apache/directory/server/core/log/
directory/apacheds/branches/apacheds-txns/core-shared/src/test/java/org/apache/directory/server/core/txn/
Modified:
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/InvalidLogException.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/Log.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/LogAnchor.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/LogAnchorComparator.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/LogScanner.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/UserLogRecord.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/TxnConflictException.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/TxnLogManager.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/TxnManager.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/logedit/AbstractDataChange.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/logedit/AbstractLogEdit.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/logedit/DataChange.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/logedit/LogEdit.java
directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/log/DefaultLog.java
directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/log/DefaultLogScanner.java
directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/log/LogFlushManager.java
directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/log/LogManager.java
directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/DefaultTxnLogManager.java
directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/DefaultTxnManager.java
directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/IndexWrapper.java
directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/MasterTableWrapper.java
directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/ReadWriteTxn.java
directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/TxnManagerFactory.java
directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/TxnManagerInternal.java
directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/logedit/DataChangeContainer.java
directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/logedit/EntryAddDelete.java
directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/logedit/EntryChange.java
directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/logedit/IndexChange.java
directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/logedit/TxnStateChange.java
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/InvalidLogException.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/InvalidLogException.java?rev=1196565&r1=1196564&r2=1196565&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/InvalidLogException.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/InvalidLogException.java Wed Nov 2 13:11:12 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.server.core.log;
+package org.apache.directory.server.core.api.log;
/**
* An exception used when the log content could be invalid.
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/Log.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/Log.java?rev=1196565&r1=1196564&r2=1196565&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/Log.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/Log.java Wed Nov 2 13:11:12 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.server.core.log;
+package org.apache.directory.server.core.api.log;
import java.io.IOException;
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/LogAnchor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/LogAnchor.java?rev=1196565&r1=1196564&r2=1196565&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/LogAnchor.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/LogAnchor.java Wed Nov 2 13:11:12 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.server.core.log;
+package org.apache.directory.server.core.api.log;
import org.apache.directory.server.i18n.I18n;
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/LogAnchorComparator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/LogAnchorComparator.java?rev=1196565&r1=1196564&r2=1196565&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/LogAnchorComparator.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/LogAnchorComparator.java Wed Nov 2 13:11:12 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.server.core.log;
+package org.apache.directory.server.core.api.log;
import java.util.Comparator;
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/LogScanner.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/LogScanner.java?rev=1196565&r1=1196564&r2=1196565&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/LogScanner.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/LogScanner.java Wed Nov 2 13:11:12 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.server.core.log;
+package org.apache.directory.server.core.api.log;
import java.io.IOException;
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/UserLogRecord.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/UserLogRecord.java?rev=1196565&r1=1196564&r2=1196565&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/UserLogRecord.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/UserLogRecord.java Wed Nov 2 13:11:12 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.server.core.log;
+package org.apache.directory.server.core.api.log;
/**
* A user log record that can be used to pass user record between the clients and the logger
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/TxnConflictException.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/TxnConflictException.java?rev=1196565&r1=1196564&r2=1196565&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/TxnConflictException.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/TxnConflictException.java Wed Nov 2 13:11:12 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.server.core.txn;
+package org.apache.directory.server.core.api.txn;
/**
* An exception used when the txn conflict is detected.
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/TxnLogManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/TxnLogManager.java?rev=1196565&r1=1196564&r2=1196565&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/TxnLogManager.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/TxnLogManager.java Wed Nov 2 13:11:12 2011
@@ -17,13 +17,13 @@
* under the License.
*
*/
-package org.apache.directory.server.core.txn;
+package org.apache.directory.server.core.api.txn;
import org.apache.directory.server.core.api.partition.index.IndexCursor;
import org.apache.directory.server.core.api.partition.index.IndexComparator;
-import org.apache.directory.server.core.txn.logedit.LogEdit;
+import org.apache.directory.server.core.api.txn.logedit.LogEdit;
-import org.apache.directory.server.core.log.UserLogRecord;
+import org.apache.directory.server.core.api.log.UserLogRecord;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.name.Dn;
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/TxnManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/TxnManager.java?rev=1196565&r1=1196564&r2=1196565&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/TxnManager.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/TxnManager.java Wed Nov 2 13:11:12 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.server.core.txn;
+package org.apache.directory.server.core.api.txn;
import java.io.IOException;
import org.apache.directory.server.core.api.partition.index.Serializer;
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/logedit/AbstractDataChange.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/logedit/AbstractDataChange.java?rev=1196565&r1=1196564&r2=1196565&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/logedit/AbstractDataChange.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/logedit/AbstractDataChange.java Wed Nov 2 13:11:12 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.server.core.txn.logedit;
+package org.apache.directory.server.core.api.txn.logedit;
/**
*
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/logedit/AbstractLogEdit.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/logedit/AbstractLogEdit.java?rev=1196565&r1=1196564&r2=1196565&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/logedit/AbstractLogEdit.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/logedit/AbstractLogEdit.java Wed Nov 2 13:11:12 2011
@@ -17,9 +17,9 @@
* under the License.
*
*/
-package org.apache.directory.server.core.txn.logedit;
+package org.apache.directory.server.core.api.txn.logedit;
-import org.apache.directory.server.core.log.LogAnchor;
+import org.apache.directory.server.core.api.log.LogAnchor;
/**
*
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/logedit/DataChange.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/logedit/DataChange.java?rev=1196565&r1=1196564&r2=1196565&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/logedit/DataChange.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/logedit/DataChange.java Wed Nov 2 13:11:12 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.server.core.txn.logedit;
+package org.apache.directory.server.core.api.txn.logedit;
import java.io.Externalizable;
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/logedit/LogEdit.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/logedit/LogEdit.java?rev=1196565&r1=1196564&r2=1196565&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/logedit/LogEdit.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/txn/logedit/LogEdit.java Wed Nov 2 13:11:12 2011
@@ -17,9 +17,9 @@
* under the License.
*
*/
-package org.apache.directory.server.core.txn.logedit;
+package org.apache.directory.server.core.api.txn.logedit;
-import org.apache.directory.server.core.log.LogAnchor;
+import org.apache.directory.server.core.api.log.LogAnchor;
import java.io.Externalizable;
Modified: directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/log/DefaultLog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/log/DefaultLog.java?rev=1196565&r1=1196564&r2=1196565&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/log/DefaultLog.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/log/DefaultLog.java Wed Nov 2 13:11:12 2011
@@ -20,7 +20,12 @@
package org.apache.directory.server.core.shared.log;
import java.io.IOException;
+import org.apache.directory.server.core.api.log.Log;
+import org.apache.directory.server.core.api.log.LogScanner;
+import org.apache.directory.server.core.api.log.LogAnchor;
+import org.apache.directory.server.core.api.log.UserLogRecord;
+import org.apache.directory.server.core.api.log.InvalidLogException;
/**
* Log interface default Implementation.
Modified: directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/log/DefaultLogScanner.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/log/DefaultLogScanner.java?rev=1196565&r1=1196564&r2=1196565&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/log/DefaultLogScanner.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/log/DefaultLogScanner.java Wed Nov 2 13:11:12 2011
@@ -26,8 +26,12 @@ import java.nio.ByteBuffer;
import java.util.zip.Adler32;
import java.util.zip.Checksum;
-import org.apache.directory.server.core.log.LogFileManager.LogFileReader;
import org.apache.directory.server.i18n.I18n;
+import org.apache.directory.server.core.api.log.LogScanner;
+import org.apache.directory.server.core.api.log.LogAnchor;
+import org.apache.directory.server.core.api.log.UserLogRecord;
+import org.apache.directory.server.core.api.log.InvalidLogException;
+import org.apache.directory.server.core.shared.log.LogFileManager.LogFileReader;
/**
* An implementation of a LogScanner.
Modified: directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/log/LogFlushManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/log/LogFlushManager.java?rev=1196565&r1=1196564&r2=1196565&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/log/LogFlushManager.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/log/LogFlushManager.java Wed Nov 2 13:11:12 2011
@@ -28,10 +28,14 @@ import java.util.concurrent.atomic.Atomi
import java.util.zip.Adler32;
import java.util.zip.Checksum;
+import org.apache.directory.server.core.api.log.LogAnchor;
+import org.apache.directory.server.core.api.log.UserLogRecord;
+import org.apache.directory.server.core.api.log.InvalidLogException;
+
import java.io.IOException;
-import org.apache.directory.server.core.log.LogFileManager.LogFileWriter;
+import org.apache.directory.server.core.shared.log.LogFileManager.LogFileWriter;
import org.apache.directory.server.i18n.I18n;
/**
Modified: directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/log/LogManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/log/LogManager.java?rev=1196565&r1=1196564&r2=1196565&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/log/LogManager.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/log/LogManager.java Wed Nov 2 13:11:12 2011
@@ -30,6 +30,12 @@ import java.io.IOException;
import java.io.FileNotFoundException;
import java.io.EOFException;
+import org.apache.directory.server.core.api.log.LogAnchor;
+import org.apache.directory.server.core.api.log.UserLogRecord;
+import org.apache.directory.server.core.api.log.InvalidLogException;
+import org.apache.directory.server.core.api.log.LogAnchorComparator;
+import org.apache.directory.server.core.api.log.LogScanner;
+
import org.apache.directory.server.i18n.I18n;
/**
Modified: directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/DefaultTxnLogManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/DefaultTxnLogManager.java?rev=1196565&r1=1196564&r2=1196565&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/DefaultTxnLogManager.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/DefaultTxnLogManager.java Wed Nov 2 13:11:12 2011
@@ -23,9 +23,9 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
-import org.apache.directory.server.core.log.UserLogRecord;
-import org.apache.directory.server.core.log.Log;
-import org.apache.directory.server.core.log.InvalidLogException;
+import org.apache.directory.server.core.api.log.UserLogRecord;
+import org.apache.directory.server.core.api.log.Log;
+import org.apache.directory.server.core.api.log.InvalidLogException;
import org.apache.directory.server.core.api.partition.index.IndexCursor;
import org.apache.directory.server.core.api.partition.index.IndexComparator;
@@ -33,7 +33,8 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.message.SearchScope;
import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.server.core.txn.logedit.LogEdit;
+import org.apache.directory.server.core.api.txn.TxnLogManager;
+import org.apache.directory.server.core.api.txn.logedit.LogEdit;
/**
Modified: directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/DefaultTxnManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/DefaultTxnManager.java?rev=1196565&r1=1196564&r2=1196565&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/DefaultTxnManager.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/DefaultTxnManager.java Wed Nov 2 13:11:12 2011
@@ -20,8 +20,10 @@
package org.apache.directory.server.core.shared.txn;
import org.apache.directory.server.core.api.partition.index.Serializer;
-import org.apache.directory.server.core.txn.logedit.TxnStateChange;
-import org.apache.directory.server.core.log.LogAnchor;
+import org.apache.directory.server.core.api.txn.TxnConflictException;
+import org.apache.directory.server.core.api.txn.TxnLogManager;
+import org.apache.directory.server.core.shared.txn.logedit.TxnStateChange;
+import org.apache.directory.server.core.api.log.LogAnchor;
import java.io.ByteArrayOutputStream;
import java.io.ObjectOutputStream;
@@ -38,7 +40,7 @@ import java.util.concurrent.locks.Reentr
import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.directory.server.core.log.UserLogRecord;
+import org.apache.directory.server.core.api.log.UserLogRecord;
import java.io.IOException;
Modified: directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/IndexWrapper.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/IndexWrapper.java?rev=1196565&r1=1196564&r2=1196565&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/IndexWrapper.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/IndexWrapper.java Wed Nov 2 13:11:12 2011
@@ -27,6 +27,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.api.partition.index.Index;
import org.apache.directory.server.core.api.partition.index.IndexCursor;
import org.apache.directory.server.core.api.partition.index.ReverseIndexComparator;
+import org.apache.directory.server.core.api.txn.TxnLogManager;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
import org.apache.directory.shared.ldap.model.entry.Entry;
Modified: directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/MasterTableWrapper.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/MasterTableWrapper.java?rev=1196565&r1=1196564&r2=1196565&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/MasterTableWrapper.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/MasterTableWrapper.java Wed Nov 2 13:11:12 2011
@@ -22,6 +22,7 @@ package org.apache.directory.server.core
import java.util.Comparator;
import org.apache.directory.server.core.api.partition.index.MasterTable;
+import org.apache.directory.server.core.api.txn.TxnLogManager;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
import org.apache.directory.shared.ldap.model.cursor.Tuple;
Modified: directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/ReadWriteTxn.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/ReadWriteTxn.java?rev=1196565&r1=1196564&r2=1196565&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/ReadWriteTxn.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/ReadWriteTxn.java Wed Nov 2 13:11:12 2011
@@ -29,14 +29,14 @@ import java.util.HashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.Comparator;
-import org.apache.directory.server.core.txn.logedit.LogEdit;
-import org.apache.directory.server.core.txn.logedit.IndexChange;
-import org.apache.directory.server.core.txn.logedit.DataChange;
-import org.apache.directory.server.core.txn.logedit.EntryAddDelete;
-import org.apache.directory.server.core.txn.logedit.EntryChange;
-import org.apache.directory.server.core.txn.logedit.DataChangeContainer;
+import org.apache.directory.server.core.api.txn.logedit.LogEdit;
+import org.apache.directory.server.core.shared.txn.logedit.IndexChange;
+import org.apache.directory.server.core.api.txn.logedit.DataChange;
+import org.apache.directory.server.core.shared.txn.logedit.EntryAddDelete;
+import org.apache.directory.server.core.shared.txn.logedit.EntryChange;
+import org.apache.directory.server.core.shared.txn.logedit.DataChangeContainer;
-import org.apache.directory.server.core.log.UserLogRecord;
+import org.apache.directory.server.core.api.log.UserLogRecord;
import org.apache.directory.server.core.api.partition.index.ForwardIndexEntry;
import org.apache.directory.server.core.api.partition.index.ReverseIndexEntry;
@@ -51,8 +51,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-
import org.apache.directory.shared.ldap.model.message.SearchScope;
/**
Modified: directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/TxnManagerFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/TxnManagerFactory.java?rev=1196565&r1=1196564&r2=1196565&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/TxnManagerFactory.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/TxnManagerFactory.java Wed Nov 2 13:11:12 2011
@@ -22,9 +22,11 @@ package org.apache.directory.server.core
import java.util.Comparator;
import org.apache.directory.server.core.api.partition.index.Serializer;
-import org.apache.directory.server.core.log.DefaultLog;
-import org.apache.directory.server.core.log.Log;
-import org.apache.directory.server.core.log.InvalidLogException;
+import org.apache.directory.server.core.api.txn.TxnLogManager;
+import org.apache.directory.server.core.api.txn.TxnManager;
+import org.apache.directory.server.core.shared.log.DefaultLog;
+import org.apache.directory.server.core.api.log.Log;
+import org.apache.directory.server.core.api.log.InvalidLogException;
import java.io.IOException;
Modified: directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/TxnManagerInternal.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/TxnManagerInternal.java?rev=1196565&r1=1196564&r2=1196565&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/TxnManagerInternal.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/TxnManagerInternal.java Wed Nov 2 13:11:12 2011
@@ -19,6 +19,8 @@
*/
package org.apache.directory.server.core.shared.txn;
+import org.apache.directory.server.core.api.txn.TxnManager;
+
/**
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
Modified: directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/logedit/DataChangeContainer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/logedit/DataChangeContainer.java?rev=1196565&r1=1196564&r2=1196565&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/logedit/DataChangeContainer.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/logedit/DataChangeContainer.java Wed Nov 2 13:11:12 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.server.core.txn.shared.logedit;
+package org.apache.directory.server.core.shared.txn.logedit;
import java.io.IOException;
@@ -31,8 +31,11 @@ import java.util.Iterator;
import org.apache.directory.shared.ldap.model.name.Dn;
import org.apache.directory.server.core.api.partition.index.Serializer;
+import org.apache.directory.server.core.api.txn.logedit.AbstractLogEdit;
+import org.apache.directory.server.core.api.txn.logedit.DataChange;
-import org.apache.directory.server.core.txn.TxnManagerFactory;
+import org.apache.directory.server.core.shared.txn.TxnManagerFactory;
+import org.apache.directory.server.core.api.txn.TxnManager;
/**
Modified: directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/logedit/EntryAddDelete.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/logedit/EntryAddDelete.java?rev=1196565&r1=1196564&r2=1196565&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/logedit/EntryAddDelete.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/logedit/EntryAddDelete.java Wed Nov 2 13:11:12 2011
@@ -17,12 +17,13 @@
* under the License.
*
*/
-package org.apache.directory.server.core.txn.shared.logedit;
+package org.apache.directory.server.core.shared.txn.logedit;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
+import org.apache.directory.server.core.api.txn.logedit.AbstractDataChange;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
Modified: directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/logedit/EntryChange.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/logedit/EntryChange.java?rev=1196565&r1=1196564&r2=1196565&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/logedit/EntryChange.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/logedit/EntryChange.java Wed Nov 2 13:11:12 2011
@@ -17,12 +17,13 @@
* under the License.
*
*/
-package org.apache.directory.server.core.txn.shared.logedit;
+package org.apache.directory.server.core.shared.txn.logedit;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
+import org.apache.directory.server.core.api.txn.logedit.AbstractDataChange;
import org.apache.directory.shared.ldap.model.entry.Modification;
import org.apache.directory.shared.ldap.model.entry.DefaultModification;
Modified: directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/logedit/IndexChange.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/logedit/IndexChange.java?rev=1196565&r1=1196564&r2=1196565&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/logedit/IndexChange.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/logedit/IndexChange.java Wed Nov 2 13:11:12 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.server.core.txn.shared.logedit;
+package org.apache.directory.server.core.shared.txn.logedit;
import java.io.IOException;
@@ -26,7 +26,8 @@ import java.io.ObjectOutput;
import org.apache.directory.server.core.api.partition.index.Index;
import org.apache.directory.server.core.api.partition.index.Serializer;
-import org.apache.directory.server.core.txn.TxnManagerFactory;
+import org.apache.directory.server.core.api.txn.logedit.AbstractDataChange;
+import org.apache.directory.server.core.shared.txn.TxnManagerFactory;
import org.apache.directory.shared.ldap.model.entry.Value;
Modified: directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/logedit/TxnStateChange.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/logedit/TxnStateChange.java?rev=1196565&r1=1196564&r2=1196565&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/logedit/TxnStateChange.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/logedit/TxnStateChange.java Wed Nov 2 13:11:12 2011
@@ -17,12 +17,14 @@
* under the License.
*
*/
-package org.apache.directory.server.core.txn.shared.logedit;
+package org.apache.directory.server.core.shared.txn.logedit;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
+import org.apache.directory.server.core.api.txn.logedit.AbstractLogEdit;
+
/**
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>