diff options
author | Eike Stepper | 2009-07-20 12:10:31 +0000 |
---|---|---|
committer | Eike Stepper | 2009-07-20 12:10:31 +0000 |
commit | 2b7a9857869ce75957ab40c48b94848921134161 (patch) | |
tree | b27e61ca94f55848bd3f16981f3aa0e6384043e5 | |
parent | ad9eae1a61f0735c8a69cc289f86174fd4191cfa (diff) | |
download | cdo-2b7a9857869ce75957ab40c48b94848921134161.tar.gz cdo-2b7a9857869ce75957ab40c48b94848921134161.tar.xz cdo-2b7a9857869ce75957ab40c48b94848921134161.zip |
[276845] Develop A CDORevisionCache that uses the file system
https://bugs.eclipse.org/bugs/show_bug.cgi?id=276845
4 files changed, 11 insertions, 12 deletions
diff --git a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/db/CDOCommonDBUtil.java b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/db/CDOCommonDBUtil.java index a90de41958..cffacf6fa9 100644 --- a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/db/CDOCommonDBUtil.java +++ b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/db/CDOCommonDBUtil.java @@ -15,7 +15,7 @@ import org.eclipse.emf.cdo.common.id.CDOIDProvider; import org.eclipse.emf.cdo.common.internal.db.cache.DBRevisionCache; import org.eclipse.emf.cdo.common.model.CDOPackageRegistry; import org.eclipse.emf.cdo.common.revision.CDOListFactory; -import org.eclipse.emf.cdo.common.revision.CDORevisionManager; +import org.eclipse.emf.cdo.common.revision.CDORevisionFactory; import org.eclipse.emf.cdo.common.revision.cache.CDORevisionCache; import org.eclipse.net4j.db.IDBAdapter; @@ -38,7 +38,7 @@ public final class CDOCommonDBUtil */ public static CDORevisionCache createDBCache(IDBAdapter dbAdapter, IDBConnectionProvider dbConnectionProvider, CDOIDProvider idProvider, CDOListFactory listFactory, CDOPackageRegistry packageRegistry, - CDORevisionManager revisionManager) + CDORevisionFactory revisionFactory) { DBRevisionCache cache = new DBRevisionCache(); cache.setDBAdapter(dbAdapter); @@ -46,7 +46,7 @@ public final class CDOCommonDBUtil cache.setIdProvider(idProvider); cache.setListFactory(listFactory); cache.setPackageRegistry(packageRegistry); - cache.setRevisionManager(revisionManager); + cache.setRevisionFactory(revisionFactory); return cache; } } diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/io/CDODataInputImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/io/CDODataInputImpl.java index 5517c5cd76..ad64efd33f 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/io/CDODataInputImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/io/CDODataInputImpl.java @@ -27,7 +27,6 @@ import org.eclipse.emf.cdo.common.revision.CDOList; import org.eclipse.emf.cdo.common.revision.CDOListFactory; import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.common.revision.CDORevisionFactory; -import org.eclipse.emf.cdo.common.revision.CDORevisionManager; import org.eclipse.emf.cdo.common.revision.CDORevisionUtil; import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta; import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; @@ -257,7 +256,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl boolean notNull = readBoolean(); if (notNull) { - CDORevisionFactory factory = ((InternalCDORevisionManager)getRevisionManager()).getFactory(); + CDORevisionFactory factory = ((InternalCDORevisionManager)getRevisionFactory()).getFactory(); InternalCDORevision revision = (InternalCDORevision)factory.createRevision(null); revision.read(this); return revision; @@ -405,7 +404,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl protected abstract CDOPackageRegistry getPackageRegistry(); - protected abstract CDORevisionManager getRevisionManager(); + protected abstract CDORevisionFactory getRevisionFactory(); protected abstract CDOListFactory getListFactory(); } diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndication.java index d8a4bad917..0b96ff990b 100644 --- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndication.java +++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndication.java @@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.common.io.CDODataInput; import org.eclipse.emf.cdo.common.io.CDODataOutput; import org.eclipse.emf.cdo.common.model.CDOPackageRegistry; import org.eclipse.emf.cdo.common.revision.CDOListFactory; -import org.eclipse.emf.cdo.common.revision.CDORevisionManager; +import org.eclipse.emf.cdo.common.revision.CDORevisionFactory; import org.eclipse.emf.cdo.internal.common.io.CDODataInputImpl; import org.eclipse.emf.cdo.internal.common.io.CDODataOutputImpl; import org.eclipse.emf.cdo.internal.common.revision.CDOListImpl; @@ -81,9 +81,9 @@ public abstract class CDOServerIndication extends IndicationWithResponse indicating(new CDODataInputImpl(in) { @Override - protected CDORevisionManager getRevisionManager() + protected CDORevisionFactory getRevisionFactory() { - return getRepository().getRevisionManager(); + return getRepository().getRevisionManager().getFactory(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitTransactionIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitTransactionIndication.java index 01e2f6f6c9..d2b98e0c11 100644 --- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitTransactionIndication.java +++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitTransactionIndication.java @@ -21,7 +21,7 @@ import org.eclipse.emf.cdo.common.io.CDODataOutput; import org.eclipse.emf.cdo.common.model.CDOPackageRegistry; import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; import org.eclipse.emf.cdo.common.revision.CDOListFactory; -import org.eclipse.emf.cdo.common.revision.CDORevisionManager; +import org.eclipse.emf.cdo.common.revision.CDORevisionFactory; import org.eclipse.emf.cdo.internal.common.io.CDODataInputImpl; import org.eclipse.emf.cdo.internal.common.io.CDODataOutputImpl; import org.eclipse.emf.cdo.internal.common.revision.CDOListImpl; @@ -139,9 +139,9 @@ public class CommitTransactionIndication extends IndicationWithMonitoring indicating(new CDODataInputImpl(in) { @Override - protected CDORevisionManager getRevisionManager() + protected CDORevisionFactory getRevisionFactory() { - return CommitTransactionIndication.this.getRepository().getRevisionManager(); + return CommitTransactionIndication.this.getRepository().getRevisionManager().getFactory(); } @Override |