Merged BRANCHES\DEV\MODEL_SPLIT to HEAD

Split the data dictionary out from the repository.
    There is a new DataModel project to add into eclipse
    Still to move a few context dependent tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20877 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrew Hind
2010-06-30 14:17:18 +00:00
parent 3238ca154a
commit 1e19360747
172 changed files with 170 additions and 30303 deletions

View File

@@ -27,6 +27,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.repo.content.AbstractContentStore;
import org.alfresco.repo.content.AbstractContentStreamListener;
import org.alfresco.repo.content.ContentContext;
import org.alfresco.repo.content.ContentExistsException;
import org.alfresco.repo.content.ContentStore;
@@ -315,9 +316,10 @@ public class ReplicatingContentStore extends AbstractContentStore
" writer: " + writer);
}
// attach the listener
ContentStreamListener listener = new ReplicatingWriteListener(secondaryStores, writer, outboundThreadPoolExecutor);
ReplicatingWriteListener listener = new ReplicatingWriteListener(secondaryStores, writer, outboundThreadPoolExecutor);
listener.setRetryingTransactionHelper(transactionHelper); // mandatory when listeners are added
writer.addListener(listener);
writer.setRetryingTransactionHelper(transactionHelper); // mandatory when listeners are added
}
// done
@@ -388,13 +390,11 @@ public class ReplicatingContentStore extends AbstractContentStore
* Replicates the content upon stream closure. If the thread pool is available,
* then the process will be asynchronous.
* <p>
* No transaction boundaries have been declared as the
* {@link ContentWriter#addListener(ContentStreamListener)} method indicates that
* all listeners will be called within a transaction.
*
* @author Derek Hulley
*/
public static class ReplicatingWriteListener implements ContentStreamListener
public static class ReplicatingWriteListener extends AbstractContentStreamListener
{
private List<ContentStore> stores;
private ContentWriter writer;
@@ -410,7 +410,7 @@ public class ReplicatingContentStore extends AbstractContentStore
this.threadPoolExecutor = threadPoolExecutor;
}
public void contentStreamClosed() throws ContentIOException
public void contentStreamClosedImpl() throws ContentIOException
{
Runnable runnable = new ReplicateOnCloseRunnable();
if (threadPoolExecutor == null)