diff options
| author | Simon McDuff | 2008-06-09 13:19:27 +0000 |
|---|---|---|
| committer | Simon McDuff | 2008-06-09 13:19:27 +0000 |
| commit | 887f965550df17f58259a6d3a8fdd43b6efc805a (patch) | |
| tree | dfaec3126de0e082995eeabf29419a61ab8695db | |
| parent | c10bf6566f2536a0b38f4142a9b05b25d4f105c0 (diff) | |
| download | cdo-887f965550df17f58259a6d3a8fdd43b6efc805a.tar.gz cdo-887f965550df17f58259a6d3a8fdd43b6efc805a.tar.xz cdo-887f965550df17f58259a6d3a8fdd43b6efc805a.zip | |
Merge From HEAD to simon_pre_0_9committers/smcduff/merge-20080609
153 files changed, 1179 insertions, 720 deletions
diff --git a/plugins/org.eclipse.emf.cdo.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.common/META-INF/MANIFEST.MF index 8027e18644..528d9d80cc 100644 --- a/plugins/org.eclipse.emf.cdo.common/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.common/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.common -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOID.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOID.java index fb4b0d11bc..19285b0062 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOID.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOID.java @@ -7,6 +7,7 @@ * * Contributors: * Eike Stepper - initial API and implementation + * Simon McDuff - https://bugs.eclipse.org/bugs/show_bug.cgi?id=226778 **************************************************************************/ package org.eclipse.emf.cdo.common.id; @@ -38,6 +39,8 @@ public interface CDOID extends Serializable public void read(ExtendedDataInput in) throws IOException; public void write(ExtendedDataOutput out) throws IOException; + + public String getCDOIDString(); /** * @author Eike Stepper diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDObjectFactory.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDObjectFactory.java index 65574730e2..b31303dcf5 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDObjectFactory.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDObjectFactory.java @@ -7,6 +7,7 @@ * * Contributors: * Eike Stepper - initial API and implementation + * Simon McDuff - https://bugs.eclipse.org/bugs/show_bug.cgi?id=226778 **************************************************************************/ package org.eclipse.emf.cdo.common.id; @@ -24,4 +25,11 @@ public interface CDOIDObjectFactory * instance. */ public CDOIDObject createCDOIDObject(ExtendedDataInput in); + + /** + * Returns a new instance of CDOIDObject. This implementation is different from createCDOIDObject(ExtendedDataInput + * in) since the implementor of this method needs to construct completely CDOIDObject from the String. + */ + public CDOIDObject createCDOIDObject(String in); + } diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDUtil.java index 85829635c6..c24b1fa60e 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDUtil.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDUtil.java @@ -7,6 +7,7 @@ * * Contributors: * Eike Stepper - initial API and implementation + * Simon McDuff - https://bugs.eclipse.org/bugs/show_bug.cgi?id=226778 **************************************************************************/ package org.eclipse.emf.cdo.common.id; @@ -218,6 +219,115 @@ public final class CDOIDUtil id.write(out); } + + /** + * Format of the string Not legacy : <ORDINAL>/<CUSTOM STRING FROM OBJECT FACTORY> Legacy : + * <ORDINAL>/<PACKAGEURI>/<CLASSIFIERID>/<CUSTOM STRING FROM OBJECT FACTORY> + */ + public static CDOID read(String in, CDOIDObjectFactory factory) + { + byte ordinal = Byte.valueOf(in.substring(0, 1)); + + if (TRACER.isEnabled()) + { + String type; + try + { + type = Type.values()[ordinal].toString(); + } + catch (RuntimeException ex) + { + type = ex.getMessage(); + } + + TRACER.format("Reading CDOID of type {0} ({1})", ordinal, type); + } + + Type type = Type.values()[ordinal]; + String fragment = in.substring(2); + switch (type) + { + case NULL: + return CDOID.NULL; + + case TEMP_OBJECT: + return new CDOIDTempObjectImpl(Integer.valueOf(fragment)); + + case TEMP_META: + return new CDOIDTempMetaImpl(Integer.valueOf(fragment)); + + case META: + return new CDOIDMetaImpl(Long.valueOf(fragment)); + + case OBJECT: + { + CDOIDObject id = factory.createCDOIDObject(fragment); + return id; + } + + case LEGACY_OBJECT: + { + int packageIndex = fragment.indexOf("/"); + String packageURI = fragment.substring(0, packageIndex); + int classifierIndex = fragment.indexOf("/", packageIndex + 1); + + String strClassifier = fragment.substring(packageIndex, classifierIndex); + int classifierID = Integer.valueOf(strClassifier); + + CDOClassRef cdoClassRef = CDOModelUtil.createClassRef(packageURI, classifierID); + + CDOIDObject id = factory.createCDOIDObject(fragment.substring(classifierIndex + 1)); + + return id.asLegacy(cdoClassRef); + } + + default: + throw new ImplementationError(); + } + } + + /** + * Format of the string Not legacy : <ORDINAL>/<CUSTOM STRING FROM OBJECT FACTORY> Legacy : + * <ORDINAL>/<PACKAGEURI>/<CLASSIFIERID>/<CUSTOM STRING FROM OBJECT FACTORY> + */ + + public static void write(StringBuffer stringBuffer, CDOID id) + { + if (id == null) + { + id = CDOID.NULL; + } + + Type type = id.getType(); + int ordinal = type.ordinal(); + + if (TRACER.isEnabled()) + { + TRACER.format("Writing CDOID of type {0} ({1})", ordinal, type); + } + stringBuffer.append(ordinal); + + switch (type) + { + case NULL: + case TEMP_OBJECT: + case TEMP_META: + case META: + case OBJECT: + break; + + case LEGACY_OBJECT: + CDOIDObject legacy = (CDOIDObject)id; + stringBuffer.append("/" + legacy.getClassRef().getPackageURI()); + stringBuffer.append("/" + legacy.getClassRef().getClassifierID()); + break; + + default: + throw new ImplementationError(); + } + stringBuffer.append("/" + id.getCDOIDString()); + } + public static CDOIDMeta createMeta(long value) { return new CDOIDMetaImpl(value); diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDNullImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDNullImpl.java index dd959a4baa..2b89ba7641 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDNullImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDNullImpl.java @@ -7,6 +7,7 @@ * * Contributors: * Eike Stepper - initial API and implementation + * Simon McDuff - https://bugs.eclipse.org/bugs/show_bug.cgi?id=226778 **************************************************************************/ package org.eclipse.emf.cdo.internal.common.id; @@ -58,6 +59,11 @@ public final class CDOIDNullImpl extends AbstractCDOID implements CDOIDMeta, CDO { return null; } + + public String getCDOIDString() + { + return "NULL"; + } public void read(ExtendedDataInput in) throws IOException { diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/AbstractCDOIDInteger.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/AbstractCDOIDInteger.java index e06304e8d2..c6458922e5 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/AbstractCDOIDInteger.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/AbstractCDOIDInteger.java @@ -7,6 +7,7 @@ * * Contributors: * Eike Stepper - initial API and implementation + * Simon McDuff - https://bugs.eclipse.org/bugs/show_bug.cgi?id=226778 **************************************************************************/ package org.eclipse.emf.cdo.spi.common; @@ -42,7 +43,12 @@ public abstract class AbstractCDOIDInteger extends AbstractCDOID implements Comp { return value; } - + + public String getCDOIDString() + { + return String.valueOf(value); + } + public void read(ExtendedDataInput in) throws IOException { value = in.readInt(); diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/AbstractCDOIDLong.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/AbstractCDOIDLong.java index 1b452fbef4..547c19bb4b 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/AbstractCDOIDLong.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/AbstractCDOIDLong.java @@ -7,6 +7,7 @@ * * Contributors: * Eike Stepper - initial API and implementation + * Simon McDuff - https://bugs.eclipse.org/bugs/show_bug.cgi?id=226778 **************************************************************************/ package org.eclipse.emf.cdo.spi.common; @@ -44,6 +45,11 @@ public abstract class AbstractCDOIDLong extends AbstractCDOID implements Compara return value; } + public String getCDOIDString() + { + return String.valueOf(value); + } + public void read(ExtendedDataInput in) throws IOException { value = in.readLong(); diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/CDOIDLongFactoryImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/CDOIDLongFactoryImpl.java index 216bba9c59..07ab627d3b 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/CDOIDLongFactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/CDOIDLongFactoryImpl.java @@ -7,6 +7,7 @@ * * Contributors: * Eike Stepper - initial API and implementation + * Simon McDuff - https://bugs.eclipse.org/bugs/show_bug.cgi?id=226778 **************************************************************************/ package org.eclipse.emf.cdo.spi.common; @@ -34,6 +35,11 @@ public class CDOIDLongFactoryImpl implements CDOIDObjectFactory { return new CDOIDLongImpl(); } + + public CDOIDObject createCDOIDObject(String in) + { + return new CDOIDLongImpl(Long.valueOf(in)); + } public LibraryHandler getLibraryHandler() { diff --git a/plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF index eb6bc44722..d348ff78eb 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.server.db;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -11,7 +11,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.net4j.db;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, - org.eclipse.emf.cdo.server;bundle-version="[1.0.0,2.0.0)";visibility:=reexport -Export-Package: org.eclipse.emf.cdo.server.db;version="1.0.0", - org.eclipse.emf.cdo.server.internal.db;version="1.0.0";x-friends:="org.eclipse.emf.cdo.tests", - org.eclipse.emf.cdo.server.internal.db.bundle;version="1.0.0";x-internal:=true + org.eclipse.emf.cdo.server;bundle-version="[2.0.0,3.0.0)";visibility:=reexport +Export-Package: org.eclipse.emf.cdo.server.db;version="2.0.0", + org.eclipse.emf.cdo.server.internal.db;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests", + org.eclipse.emf.cdo.server.internal.db.bundle;version="2.0.0";x-internal:=true diff --git a/plugins/org.eclipse.emf.cdo.server/plugin.xml b/plugins/org.eclipse.emf.cdo.server/plugin.xml index 85f4c7e3a3..8152bbe16a 100644 --- a/plugins/org.eclipse.emf.cdo.server/plugin.xml +++ b/plugins/org.eclipse.emf.cdo.server/plugin.xml @@ -29,12 +29,12 @@ <factory type="challenge" productGroup="org.eclipse.net4j.Negotiators" - class="org.eclipse.net4j.internal.util.security.ChallengeNegotiatorFactory"/> + class="org.eclipse.net4j.util.security.ChallengeNegotiatorFactory"/> </extension> <extension point="org.eclipse.net4j.util.elementProcessors"> - <elementProcessor class="org.eclipse.net4j.internal.util.security.ChallengeNegotiatorConfigurer"/> + <elementProcessor class="org.eclipse.net4j.util.security.ChallengeNegotiatorConfigurer"/> </extension> <extension diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/LongIDStore.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/LongIDStore.java index 0caf20980b..31b03e6d8b 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/LongIDStore.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/LongIDStore.java @@ -10,12 +10,12 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server; -import org.eclipse.emf.cdo.internal.protocol.id.CDOIDLongFactoryImpl; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDLibraryDescriptor; -import org.eclipse.emf.cdo.protocol.id.CDOIDLibraryProvider; -import org.eclipse.emf.cdo.protocol.id.CDOIDObjectFactory; -import org.eclipse.emf.cdo.protocol.id.CDOIDUtil; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDLibraryDescriptor; +import org.eclipse.emf.cdo.common.id.CDOIDLibraryProvider; +import org.eclipse.emf.cdo.common.id.CDOIDObjectFactory; +import org.eclipse.emf.cdo.common.id.CDOIDUtil; +import org.eclipse.emf.cdo.spi.common.CDOIDLongFactoryImpl; /** * @author Eike Stepper @@ -35,7 +35,7 @@ public abstract class LongIDStore extends Store public synchronized CDOID getNextCDOID() { - return CDOIDUtil.createCDOID(++lastObjectID); + return CDOIDUtil.createLong(++lastObjectID); } public long getLastObjectID() diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/MEMStore.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/MEMStore.java index 52b01b2be1..e43e8a4678 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/MEMStore.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/MEMStore.java @@ -11,9 +11,9 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.model.resource.CDOPathFeature; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.model.resource.CDOPathFeature; +import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.server.ISession; import org.eclipse.emf.cdo.server.IView; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/MEMStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/MEMStoreAccessor.java index 02abd52280..766a281adb 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/MEMStoreAccessor.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/MEMStoreAccessor.java @@ -11,22 +11,22 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server; -import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.model.CDOClassRef; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; -import org.eclipse.emf.cdo.protocol.model.CDOPackage; -import org.eclipse.emf.cdo.protocol.model.CDOPackageInfo; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; -import org.eclipse.emf.cdo.protocol.revision.CDORevisionUtil; -import org.eclipse.emf.cdo.protocol.revision.delta.CDORevisionDelta; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.model.CDOClassRef; +import org.eclipse.emf.cdo.common.model.CDOFeature; +import org.eclipse.emf.cdo.common.model.CDOPackage; +import org.eclipse.emf.cdo.common.model.CDOPackageInfo; +import org.eclipse.emf.cdo.common.revision.CDORevision; +import org.eclipse.emf.cdo.common.revision.CDORevisionUtil; +import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; import org.eclipse.emf.cdo.server.ISession; import org.eclipse.emf.cdo.server.IStoreChunkReader; import org.eclipse.emf.cdo.server.IStoreReader; import org.eclipse.emf.cdo.server.IStoreWriter; import org.eclipse.emf.cdo.server.IView; +import org.eclipse.emf.cdo.spi.common.InternalCDORevision; -import org.eclipse.net4j.util.io.CloseableIterator; +import org.eclipse.net4j.util.collection.CloseableIterator; import java.util.ArrayList; import java.util.Collection; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/MEMStoreChunkReader.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/MEMStoreChunkReader.java index 837cf39c82..933e40c53f 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/MEMStoreChunkReader.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/MEMStoreChunkReader.java @@ -11,11 +11,11 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server; -import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.model.CDOFeature; +import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.server.IStoreReader; +import org.eclipse.emf.cdo.spi.common.InternalCDORevision; import java.util.List; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NOOPStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NOOPStoreAccessor.java index 03a140f7a4..89576f1a21 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NOOPStoreAccessor.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NOOPStoreAccessor.java @@ -10,19 +10,19 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.model.CDOClassRef; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; -import org.eclipse.emf.cdo.protocol.model.CDOPackage; -import org.eclipse.emf.cdo.protocol.model.CDOPackageInfo; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.model.CDOClassRef; +import org.eclipse.emf.cdo.common.model.CDOFeature; +import org.eclipse.emf.cdo.common.model.CDOPackage; +import org.eclipse.emf.cdo.common.model.CDOPackageInfo; +import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.server.ISession; import org.eclipse.emf.cdo.server.IStoreChunkReader; import org.eclipse.emf.cdo.server.IStoreReader; import org.eclipse.emf.cdo.server.IStoreWriter; import org.eclipse.emf.cdo.server.IView; -import org.eclipse.net4j.util.io.CloseableIterator; +import org.eclipse.net4j.util.collection.CloseableIterator; import java.util.Collection; import java.util.Collections; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NOOPStoreChunkReader.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NOOPStoreChunkReader.java index eeabf04f82..41977fb9e4 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NOOPStoreChunkReader.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NOOPStoreChunkReader.java @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; +import org.eclipse.emf.cdo.common.model.CDOFeature; +import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.server.IStoreReader; import java.util.List; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/PackageManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/PackageManager.java index cc87d2f578..9ddac6d8fe 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/PackageManager.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/PackageManager.java @@ -10,11 +10,11 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server; -import org.eclipse.emf.cdo.internal.protocol.model.CDOPackageManagerImpl; -import org.eclipse.emf.cdo.protocol.id.CDOIDObjectFactory; -import org.eclipse.emf.cdo.protocol.model.CDOModelUtil; -import org.eclipse.emf.cdo.protocol.model.CDOPackage; -import org.eclipse.emf.cdo.protocol.model.CDOPackageInfo; +import org.eclipse.emf.cdo.common.id.CDOIDObjectFactory; +import org.eclipse.emf.cdo.common.model.CDOModelUtil; +import org.eclipse.emf.cdo.common.model.CDOPackage; +import org.eclipse.emf.cdo.common.model.CDOPackageInfo; +import org.eclipse.emf.cdo.internal.common.model.CDOPackageManagerImpl; import org.eclipse.emf.cdo.server.IPackageManager; import org.eclipse.emf.cdo.server.IStoreReader; import org.eclipse.emf.cdo.server.StoreUtil; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java index 822e5989e7..dd663f812c 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java @@ -11,16 +11,15 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server; -import org.eclipse.emf.cdo.internal.protocol.id.CDOIDMetaImpl; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDMetaRange; -import org.eclipse.emf.cdo.protocol.id.CDOIDUtil; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDMetaRange; +import org.eclipse.emf.cdo.common.id.CDOIDUtil; import org.eclipse.emf.cdo.server.IRepository; import org.eclipse.emf.cdo.server.IRepositoryElement; import org.eclipse.emf.cdo.server.IStore; -import org.eclipse.net4j.internal.util.container.Container; import org.eclipse.net4j.util.StringUtil; +import org.eclipse.net4j.util.container.Container; import org.eclipse.net4j.util.lifecycle.LifecycleUtil; import java.text.MessageFormat; @@ -176,7 +175,7 @@ public class Repository extends Container<IRepositoryElement> implements IReposi public synchronized CDOIDMetaRange getMetaIDRange(int count) { - CDOID lowerBound = new CDOIDMetaImpl(lastMetaID + 1); + CDOID lowerBound = CDOIDUtil.createMeta(lastMetaID + 1); lastMetaID += count; return CDOIDUtil.createMetaRange(lowerBound, count); } diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryConfigurator.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryConfigurator.java index 40ef4a028a..b4cee5cb7b 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryConfigurator.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryConfigurator.java @@ -17,10 +17,10 @@ import org.eclipse.emf.cdo.server.IRepositoryFactory; import org.eclipse.emf.cdo.server.IStore; import org.eclipse.emf.cdo.server.IStoreFactory; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.ObjectUtil; import org.eclipse.net4j.util.StringUtil; import org.eclipse.net4j.util.container.IManagedContainer; +import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ResourceManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ResourceManager.java index 4776a1bc56..5de15a83c8 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ResourceManager.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ResourceManager.java @@ -10,14 +10,14 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server; +import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.internal.server.bundle.OM; -import org.eclipse.emf.cdo.protocol.id.CDOID; import org.eclipse.emf.cdo.server.IResourceManager; import org.eclipse.emf.cdo.server.IStoreReader; import org.eclipse.emf.cdo.server.StoreUtil; -import org.eclipse.net4j.internal.util.lifecycle.Lifecycle; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; +import org.eclipse.net4j.util.lifecycle.Lifecycle; +import org.eclipse.net4j.util.om.trace.ContextTracer; import java.util.HashMap; import java.util.Map; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManager.java index fab0677ebe..72c8407509 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManager.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManager.java @@ -12,20 +12,20 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server; -import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionResolverImpl; -import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDObjectFactory; -import org.eclipse.emf.cdo.protocol.model.CDOClass; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; -import org.eclipse.emf.cdo.protocol.model.resource.CDOPathFeature; -import org.eclipse.emf.cdo.protocol.revision.CDOReferenceProxy; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDObjectFactory; +import org.eclipse.emf.cdo.common.model.CDOClass; +import org.eclipse.emf.cdo.common.model.CDOFeature; +import org.eclipse.emf.cdo.common.model.resource.CDOPathFeature; +import org.eclipse.emf.cdo.common.revision.CDOReferenceProxy; +import org.eclipse.emf.cdo.internal.common.revision.CDORevisionResolverImpl; import org.eclipse.emf.cdo.server.IRevisionManager; import org.eclipse.emf.cdo.server.IStoreChunkReader; import org.eclipse.emf.cdo.server.IStoreReader; import org.eclipse.emf.cdo.server.StoreUtil; import org.eclipse.emf.cdo.server.IRepository.Props; import org.eclipse.emf.cdo.server.IStoreChunkReader.Chunk; +import org.eclipse.emf.cdo.spi.common.InternalCDORevision; import org.eclipse.net4j.util.collection.MoveableList; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java index e821ae939a..512d797390 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java @@ -11,28 +11,28 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server; -import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.CDOProtocolView; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDObject; +import org.eclipse.emf.cdo.common.id.CDOIDProvider; +import org.eclipse.emf.cdo.common.model.CDOClass; +import org.eclipse.emf.cdo.common.model.CDOClassRef; +import org.eclipse.emf.cdo.common.model.CDOFeature; import org.eclipse.emf.cdo.internal.server.bundle.OM; import org.eclipse.emf.cdo.internal.server.protocol.CDOServerProtocol; import org.eclipse.emf.cdo.internal.server.protocol.InvalidationNotification; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.protocol.CDOProtocolView; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDObject; -import org.eclipse.emf.cdo.protocol.id.CDOIDProvider; -import org.eclipse.emf.cdo.protocol.model.CDOClass; -import org.eclipse.emf.cdo.protocol.model.CDOClassRef; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; import org.eclipse.emf.cdo.server.ISession; import org.eclipse.emf.cdo.server.IView; import org.eclipse.emf.cdo.server.SessionCreationException; import org.eclipse.emf.cdo.server.StoreUtil; +import org.eclipse.emf.cdo.spi.common.InternalCDORevision; -import org.eclipse.net4j.internal.util.container.Container; -import org.eclipse.net4j.internal.util.lifecycle.LifecycleEventAdapter; import org.eclipse.net4j.util.ImplementationError; +import org.eclipse.net4j.util.container.Container; import org.eclipse.net4j.util.event.IListener; import org.eclipse.net4j.util.lifecycle.ILifecycle; +import org.eclipse.net4j.util.lifecycle.LifecycleEventAdapter; import java.text.MessageFormat; import java.util.List; @@ -51,7 +51,7 @@ public class Session extends Container<IView> implements ISession, CDOIDProvider private int sessionID; - private boolean disableLegacyObjects; + private boolean legacySupportEnabled; private ConcurrentMap<Integer, IView> views = new ConcurrentHashMap<Integer, IView>(); @@ -64,13 +64,13 @@ public class Session extends Container<IView> implements ISession, CDOIDProvider } }; - public Session(SessionManager sessionManager, CDOServerProtocol protocol, int sessionID, boolean disableLegacyObjects) + public Session(SessionManager sessionManager, CDOServerProtocol protocol, int sessionID, boolean legacySupportEnabled) throws SessionCreationException { this.sessionManager = sessionManager; this.protocol = protocol; this.sessionID = sessionID; - this.disableLegacyObjects = disableLegacyObjects; + this.legacySupportEnabled = legacySupportEnabled; protocol.addListener(protocolListener); try @@ -93,9 +93,9 @@ public class Session extends Container<IView> implements ISession, CDOIDProvider return sessionID; } - public boolean isDisableLegacyObjects() + public boolean isLegacySupportEnabled() { - return disableLegacyObjects; + return legacySupportEnabled; } public CDOServerProtocol getProtocol() @@ -212,7 +212,7 @@ public class Session extends Container<IView> implements ISession, CDOIDProvider public CDOID provideCDOID(Object idObject) { CDOID id = (CDOID)idObject; - if (disableLegacyObjects || id.isNull() || id.isMeta()) + if (!legacySupportEnabled || id.isNull() || id.isMeta()) { return id; } diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java index 7adafdbdd4..02cfb5ad0a 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java @@ -12,15 +12,15 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server; +import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.internal.server.bundle.OM; import org.eclipse.emf.cdo.internal.server.protocol.CDOServerProtocol; -import org.eclipse.emf.cdo.protocol.id.CDOID; import org.eclipse.emf.cdo.server.ISession; import org.eclipse.emf.cdo.server.ISessionManager; import org.eclipse.emf.cdo.server.SessionCreationException; -import org.eclipse.net4j.internal.util.container.Container; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; +import org.eclipse.net4j.util.container.Container; +import org.eclipse.net4j.util.om.trace.ContextTracer; import java.util.HashMap; import java.util.List; @@ -71,7 +71,7 @@ public class SessionManager extends Container<ISession> implements ISessionManag } } - public Session openSession(CDOServerProtocol protocol, boolean disableLegacyObjects) throws SessionCreationException + public Session openSession(CDOServerProtocol protocol, boolean legacySupportEnabled) throws SessionCreationException { int id = ++lastSessionID; if (TRACER.isEnabled()) @@ -79,7 +79,7 @@ public class SessionManager extends Container<ISession> implements ISessionManag TRACER.trace("Opening session " + id); } - Session session = new Session(this, protocol, id, disableLegacyObjects); + Session session = new Session(this, protocol, id, legacySupportEnabled); synchronized (sessions) { sessions.put(id, session); diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Store.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Store.java index 37585dfca5..2d4df264ea 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Store.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Store.java @@ -17,8 +17,8 @@ import org.eclipse.emf.cdo.server.IStoreReader; import org.eclipse.emf.cdo.server.IStoreWriter; import org.eclipse.emf.cdo.server.IView; -import org.eclipse.net4j.internal.util.lifecycle.Lifecycle; import org.eclipse.net4j.util.ReflectUtil.ExcludeFromDump; +import org.eclipse.net4j.util.lifecycle.Lifecycle; import java.util.HashMap; import java.util.Map; @@ -63,9 +63,9 @@ public abstract class Store extends Lifecycle implements IStore this.properties = properties; } - public Repository getRepository() + public IRepository getRepository() { - return (Repository)repository; + return repository; } public void setRepository(IRepository repository) diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/StoreAccessor.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/StoreAccessor.java index fa9405d514..5659ecce4d 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/StoreAccessor.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/StoreAccessor.java @@ -11,23 +11,23 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server; -import org.eclipse.emf.cdo.internal.protocol.model.CDOClassProxy; -import org.eclipse.emf.cdo.internal.protocol.model.InternalCDOClass; -import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDTemp; +import org.eclipse.emf.cdo.common.model.CDOClass; +import org.eclipse.emf.cdo.common.model.CDOClassProxy; +import org.eclipse.emf.cdo.common.model.CDOFeature; +import org.eclipse.emf.cdo.common.model.CDOPackage; +import org.eclipse.emf.cdo.common.revision.CDORevision; +import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; import org.eclipse.emf.cdo.internal.server.bundle.OM; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDTemp; -import org.eclipse.emf.cdo.protocol.model.CDOClass; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; -import org.eclipse.emf.cdo.protocol.model.CDOPackage; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; -import org.eclipse.emf.cdo.protocol.revision.delta.CDORevisionDelta; import org.eclipse.emf.cdo.server.ISession; import org.eclipse.emf.cdo.server.IStoreAccessor; import org.eclipse.emf.cdo.server.IView; import org.eclipse.emf.cdo.server.IStoreWriter.CommitContext; +import org.eclipse.emf.cdo.spi.common.InternalCDOClass; +import org.eclipse.emf.cdo.spi.common.InternalCDORevision; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; +import org.eclipse.net4j.util.om.trace.ContextTracer; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/StoreChunkReader.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/StoreChunkReader.java index 869956ca8f..960dc3ef30 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/StoreChunkReader.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/StoreChunkReader.java @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; +import org.eclipse.emf.cdo.common.model.CDOFeature; +import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.server.IStoreChunkReader; import org.eclipse.emf.cdo.server.IStoreReader; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Transaction.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Transaction.java index dcd21dec9d..25cc439d40 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Transaction.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Transaction.java @@ -10,31 +10,31 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server; -import org.eclipse.emf.cdo.internal.protocol.model.InternalCDOPackage; -import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; -import org.eclipse.emf.cdo.internal.protocol.revision.delta.InternalCDORevisionDelta; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDMetaRange; +import org.eclipse.emf.cdo.common.id.CDOIDObjectFactory; +import org.eclipse.emf.cdo.common.id.CDOIDTemp; +import org.eclipse.emf.cdo.common.model.CDOPackage; +import org.eclipse.emf.cdo.common.model.CDOPackageManager; +import org.eclipse.emf.cdo.common.model.core.CDOCorePackage; +import org.eclipse.emf.cdo.common.model.resource.CDOResourcePackage; +import org.eclipse.emf.cdo.common.revision.CDORevision; +import org.eclipse.emf.cdo.common.revision.CDORevisionResolver; +import org.eclipse.emf.cdo.common.revision.CDORevisionUtil; +import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; import org.eclipse.emf.cdo.internal.server.bundle.OM; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDMetaRange; -import org.eclipse.emf.cdo.protocol.id.CDOIDObjectFactory; -import org.eclipse.emf.cdo.protocol.id.CDOIDTemp; -import org.eclipse.emf.cdo.protocol.model.CDOPackage; -import org.eclipse.emf.cdo.protocol.model.CDOPackageManager; -import org.eclipse.emf.cdo.protocol.model.core.CDOCorePackage; -import org.eclipse.emf.cdo.protocol.model.resource.CDOResourcePackage; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; -import org.eclipse.emf.cdo.protocol.revision.CDORevisionResolver; -import org.eclipse.emf.cdo.protocol.revision.CDORevisionUtil; -import org.eclipse.emf.cdo.protocol.revision.delta.CDORevisionDelta; import org.eclipse.emf.cdo.server.IPackageManager; import org.eclipse.emf.cdo.server.IRepository; import org.eclipse.emf.cdo.server.IStoreWriter; import org.eclipse.emf.cdo.server.ITransaction; import org.eclipse.emf.cdo.server.StoreUtil; +import org.eclipse.emf.cdo.spi.common.InternalCDOPackage; +import org.eclipse.emf.cdo.spi.common.InternalCDORevision; +import org.eclipse.emf.cdo.spi.common.InternalCDORevisionDelta; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.ObjectUtil; import org.eclipse.net4j.util.event.IListener; +import org.eclipse.net4j.util.om.trace.ContextTracer; import java.util.ArrayList; import java.util.Collections; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/CDOServerApplication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/CDOServerApplication.java index 6d69817de8..c8320b8e0e 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/CDOServerApplication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/CDOServerApplication.java @@ -13,14 +13,13 @@ package org.eclipse.emf.cdo.internal.server.bundle; import org.eclipse.emf.cdo.internal.server.RepositoryConfigurator; import org.eclipse.emf.cdo.server.IRepository; +import org.eclipse.net4j.Net4jConfigurator; import org.eclipse.net4j.acceptor.IAcceptor; import org.eclipse.net4j.util.container.IPluginContainer; import org.eclipse.net4j.util.lifecycle.LifecycleUtil; import org.eclipse.net4j.util.om.OMPlatform; import org.eclipse.net4j.util.om.OSGiApplication; -import org.eclipse.internal.net4j.Net4jConfigurator; - import java.io.File; /** diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerProtocol.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerProtocol.java index ac3dc2bd2d..0f9f42a690 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerProtocol.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerProtocol.java @@ -10,9 +10,9 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server.protocol; -import org.eclipse.emf.cdo.internal.protocol.CDOProtocolImpl; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.emf.cdo.internal.common.CDOProtocolImpl; import org.eclipse.emf.cdo.internal.server.Session; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; import org.eclipse.net4j.signal.SignalReactor; @@ -32,7 +32,7 @@ public class CDOServerProtocol extends CDOProtocolImpl } @Override - protected SignalReactor doCreateSignalReactor(short signalID) + protected SignalReactor createSignalReactor(short signalID) { switch (signalID) { @@ -74,8 +74,9 @@ public class CDOServerProtocol extends CDOProtocolImpl case CDOProtocolConstants.SIGNAL_COMMIT_TRANSACTION: return new CommitTransactionIndication(); - } - return null; + default: + return null; + } } } diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerProtocolFactory.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerProtocolFactory.java index 31347a8723..b8dedb1c20 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerProtocolFactory.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerProtocolFactory.java @@ -1,12 +1,11 @@ package org.eclipse.emf.cdo.internal.server.protocol; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; import org.eclipse.emf.cdo.server.IRepositoryProvider; +import org.eclipse.net4j.protocol.ServerProtocolFactory; import org.eclipse.net4j.util.container.IManagedContainer; -import org.eclipse.internal.net4j.protocol.ServerProtocolFactory; - /** * @author Eike Stepper */ diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java index 2469731807..20cd92ec6d 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java @@ -11,27 +11,27 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server.protocol; -import org.eclipse.emf.cdo.internal.protocol.revision.delta.CDORevisionDeltaImpl; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDMetaRange; +import org.eclipse.emf.cdo.common.id.CDOIDTemp; +import org.eclipse.emf.cdo.common.id.CDOIDUtil; +import org.eclipse.emf.cdo.common.model.CDOModelUtil; +import org.eclipse.emf.cdo.common.model.CDOPackage; +import org.eclipse.emf.cdo.common.revision.CDORevision; +import org.eclipse.emf.cdo.common.revision.CDORevisionResolver; +import org.eclipse.emf.cdo.common.revision.CDORevisionUtil; +import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; +import org.eclipse.emf.cdo.internal.common.revision.delta.CDORevisionDeltaImpl; import org.eclipse.emf.cdo.internal.server.Transaction; import org.eclipse.emf.cdo.internal.server.Transaction.TransactionPackageManager; import org.eclipse.emf.cdo.internal.server.bundle.OM; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDMetaRange; -import org.eclipse.emf.cdo.protocol.id.CDOIDTemp; -import org.eclipse.emf.cdo.protocol.id.CDOIDUtil; -import org.eclipse.emf.cdo.protocol.model.CDOModelUtil; -import org.eclipse.emf.cdo.protocol.model.CDOPackage; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; -import org.eclipse.emf.cdo.protocol.revision.CDORevisionResolver; -import org.eclipse.emf.cdo.protocol.revision.CDORevisionUtil; -import org.eclipse.emf.cdo.protocol.revision.delta.CDORevisionDelta; import org.eclipse.emf.cdo.server.IRepository; import org.eclipse.emf.cdo.server.IView; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; +import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; import java.util.List; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/InvalidationNotification.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/InvalidationNotification.java index e07c1799e9..1a6c64fa7d 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/InvalidationNotification.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/InvalidationNotification.java @@ -11,15 +11,15 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server.protocol; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDUtil; import org.eclipse.emf.cdo.internal.server.bundle.OM; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDUtil; import org.eclipse.net4j.channel.IChannel; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.signal.Request; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; +import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; import java.util.List; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadChunkIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadChunkIndication.java index 4dbf9b6351..087d9e61fa 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadChunkIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadChunkIndication.java @@ -11,21 +11,21 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server.protocol; -import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDUtil; +import org.eclipse.emf.cdo.common.model.CDOClass; +import org.eclipse.emf.cdo.common.model.CDOClassRef; +import org.eclipse.emf.cdo.common.model.CDOFeature; +import org.eclipse.emf.cdo.common.model.CDOModelUtil; import org.eclipse.emf.cdo.internal.server.Session; import org.eclipse.emf.cdo.internal.server.bundle.OM; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDUtil; -import org.eclipse.emf.cdo.protocol.model.CDOClass; -import org.eclipse.emf.cdo.protocol.model.CDOClassRef; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; -import org.eclipse.emf.cdo.protocol.model.CDOModelUtil; - -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; +import org.eclipse.emf.cdo.spi.common.InternalCDORevision; + import org.eclipse.net4j.util.collection.MoveableList; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; +import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadLibrariesIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadLibrariesIndication.java index 480c3ba138..3fd6646387 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadLibrariesIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadLibrariesIndication.java @@ -10,14 +10,14 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server.protocol; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.id.CDOIDLibraryProvider; import org.eclipse.emf.cdo.internal.server.bundle.OM; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.protocol.id.CDOIDLibraryProvider; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; import org.eclipse.net4j.util.io.IOUtil; +import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; import java.io.InputStream; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadPackageIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadPackageIndication.java index 20915db150..115d408efa 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadPackageIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadPackageIndication.java @@ -10,15 +10,15 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server.protocol; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.model.CDOModelUtil; +import org.eclipse.emf.cdo.common.model.CDOPackage; import org.eclipse.emf.cdo.internal.server.bundle.OM; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.protocol.model.CDOModelUtil; -import org.eclipse.emf.cdo.protocol.model.CDOPackage; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.ImplementationError; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; +import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionByTimeIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionByTimeIndication.java index c27029a6c4..c0e84da4d6 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionByTimeIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionByTimeIndication.java @@ -10,13 +10,13 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server.protocol; -import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.internal.server.bundle.OM; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.protocol.id.CDOID; +import org.eclipse.emf.cdo.spi.common.InternalCDORevision; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.io.ExtendedDataInputStream; +import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionByVersionIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionByVersionIndication.java index 2e54da00e8..6195828582 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionByVersionIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionByVersionIndication.java @@ -10,13 +10,13 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server.protocol; -import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.internal.server.bundle.OM; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.protocol.id.CDOID; +import org.eclipse.emf.cdo.spi.common.InternalCDORevision; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.io.ExtendedDataInputStream; +import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionIndication.java index a7574d8b35..5d96766085 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionIndication.java @@ -10,22 +10,22 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server.protocol; -import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.analyzer.CDOFetchRule; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDObjectFactory; +import org.eclipse.emf.cdo.common.id.CDOIDUtil; +import org.eclipse.emf.cdo.common.model.CDOClass; +import org.eclipse.emf.cdo.common.model.CDOFeature; import org.eclipse.emf.cdo.internal.server.RevisionManager; import org.eclipse.emf.cdo.internal.server.Session; import org.eclipse.emf.cdo.internal.server.bundle.OM; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.protocol.analyzer.CDOFetchRule; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDObjectFactory; -import org.eclipse.emf.cdo.protocol.id.CDOIDUtil; -import org.eclipse.emf.cdo.protocol.model.CDOClass; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; - -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; +import org.eclipse.emf.cdo.spi.common.InternalCDORevision; + import org.eclipse.net4j.util.collection.MoveableList; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; +import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; import java.util.ArrayList; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java index 279efac2ad..8c09b314f2 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java @@ -10,24 +10,24 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server.protocol; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.id.CDOIDUtil; +import org.eclipse.emf.cdo.common.model.CDOPackage; import org.eclipse.emf.cdo.internal.server.PackageManager; import org.eclipse.emf.cdo.internal.server.Repository; import org.eclipse.emf.cdo.internal.server.Session; import org.eclipse.emf.cdo.internal.server.SessionManager; import org.eclipse.emf.cdo.internal.server.bundle.OM; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.protocol.id.CDOIDUtil; -import org.eclipse.emf.cdo.protocol.model.CDOPackage; import org.eclipse.emf.cdo.server.IRepository; import org.eclipse.emf.cdo.server.IRepositoryProvider; import org.eclipse.emf.cdo.server.ISession; import org.eclipse.emf.cdo.server.RepositoryNotFoundException; import org.eclipse.emf.cdo.server.SessionCreationException; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.signal.IndicationWithResponse; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; +import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; @@ -40,7 +40,7 @@ public class OpenSessionIndication extends IndicationWithResponse private String repositoryName; - private boolean disableLegacyObjects; + private boolean legacySupportEnabled; public OpenSessionIndication() { @@ -61,10 +61,10 @@ public class OpenSessionIndication extends IndicationWithResponse PROTOCOL.format("Read repositoryName: {0}", repositoryName); } - disableLegacyObjects = in.readBoolean(); + legacySupportEnabled = in.readBoolean(); if (PROTOCOL.isEnabled()) { - PROTOCOL.format("Read disableLegacyObjects: {0}", disableLegacyObjects); + PROTOCOL.format("Read legacySupportEnabled: {0}", legacySupportEnabled); } } @@ -77,7 +77,7 @@ public class OpenSessionIndication extends IndicationWithResponse SessionManager sessionManager = repository.getSessionManager(); CDOServerProtocol serverProtocol = (CDOServerProtocol)getProtocol(); - Session session = sessionManager.openSession(serverProtocol, disableLegacyObjects); + Session session = sessionManager.openSession(serverProtocol, legacySupportEnabled); serverProtocol.setInfraStructure(session); writeSessionID(out, session); diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/QueryObjectTypesIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/QueryObjectTypesIndication.java index e8eb25f0eb..507d2c531d 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/QueryObjectTypesIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/QueryObjectTypesIndication.java @@ -10,17 +10,17 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server.protocol; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDObjectFactory; +import org.eclipse.emf.cdo.common.id.CDOIDUtil; +import org.eclipse.emf.cdo.common.model.CDOClassRef; +import org.eclipse.emf.cdo.common.model.CDOModelUtil; import org.eclipse.emf.cdo.internal.server.bundle.OM; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDObjectFactory; -import org.eclipse.emf.cdo.protocol.id.CDOIDUtil; -import org.eclipse.emf.cdo.protocol.model.CDOClassRef; -import org.eclipse.emf.cdo.protocol.model.CDOModelUtil; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; +import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourceIDIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourceIDIndication.java index 562f539500..814924c7ae 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourceIDIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourceIDIndication.java @@ -10,14 +10,14 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server.protocol; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDUtil; import org.eclipse.emf.cdo.internal.server.bundle.OM; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDUtil; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; +import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourcePathIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourcePathIndication.java index eb9b415288..4113003c03 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourcePathIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourcePathIndication.java @@ -10,14 +10,14 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server.protocol; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDUtil; import org.eclipse.emf.cdo.internal.server.bundle.OM; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDUtil; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; +import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/VerifyRevisionIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/VerifyRevisionIndication.java index 7d42e60e04..ad9f087179 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/VerifyRevisionIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/VerifyRevisionIndication.java @@ -10,17 +10,17 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server.protocol; -import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDObjectFactory; +import org.eclipse.emf.cdo.common.id.CDOIDUtil; import org.eclipse.emf.cdo.internal.server.RevisionManager; import org.eclipse.emf.cdo.internal.server.bundle.OM; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDObjectFactory; -import org.eclipse.emf.cdo.protocol.id.CDOIDUtil; +import org.eclipse.emf.cdo.spi.common.InternalCDORevision; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; +import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ViewsChangedIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ViewsChangedIndication.java index 286d0bfd18..de5fc2371f 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ViewsChangedIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ViewsChangedIndication.java @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server.protocol; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; import org.eclipse.emf.cdo.internal.server.Session; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IPackageManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IPackageManager.java index af13f79aaa..7c722cea88 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IPackageManager.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IPackageManager.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo.server; -import org.eclipse.emf.cdo.protocol.model.CDOPackageManager; +import org.eclipse.emf.cdo.common.model.CDOPackageManager; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepository.java index 10fbfd8fa6..89c5f7c7f4 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepository.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepository.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo.server; -import org.eclipse.emf.cdo.protocol.id.CDOIDMetaRange; +import org.eclipse.emf.cdo.common.id.CDOIDMetaRange; import org.eclipse.net4j.util.container.IContainer; @@ -49,6 +49,8 @@ public interface IRepository extends IContainer<IRepositoryElement> public IRevisionManager getRevisionManager(); + public long getLastMetaID(); + public CDOIDMetaRange getMetaIDRange(int count); /** diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IResourceManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IResourceManager.java index f6cc6030e7..1be1de8c18 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IResourceManager.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IResourceManager.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo.server; -import org.eclipse.emf.cdo.protocol.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOID; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRevisionManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRevisionManager.java index 3966b93184..0b35992e37 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRevisionManager.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRevisionManager.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo.server; -import org.eclipse.emf.cdo.protocol.revision.CDORevisionResolver; +import org.eclipse.emf.cdo.common.revision.CDORevisionResolver; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ISession.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ISession.java index 199a2c67ef..2440591baa 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ISession.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ISession.java @@ -10,9 +10,9 @@ **************************************************************************/ package org.eclipse.emf.cdo.server; +import org.eclipse.emf.cdo.common.CDOProtocolSession; +import org.eclipse.emf.cdo.common.CDOProtocolView; import org.eclipse.emf.cdo.internal.server.protocol.CDOServerProtocol; -import org.eclipse.emf.cdo.protocol.CDOProtocolSession; -import org.eclipse.emf.cdo.protocol.CDOProtocolView; import org.eclipse.net4j.util.container.IContainer; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ISessionManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ISessionManager.java index 49ba7b1c82..785b6dbb9b 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ISessionManager.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ISessionManager.java @@ -24,5 +24,5 @@ public interface ISessionManager extends IRepositoryElement, IContainer<ISession /** * @return Never <code>null</code> */ - public ISession openSession(CDOServerProtocol protocol, boolean disableLegacyObjects) throws SessionCreationException; + public ISession openSession(CDOServerProtocol protocol, boolean legacySupportEnabled) throws SessionCreationException; } diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreChunkReader.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreChunkReader.java index 89cd8cbf1a..af0a905665 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreChunkReader.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreChunkReader.java @@ -11,9 +11,9 @@ **************************************************************************/ package org.eclipse.emf.cdo.server; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.model.CDOFeature; +import org.eclipse.emf.cdo.common.revision.CDORevision; import java.util.List; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreReader.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreReader.java index 86e02a7369..7fd4f6f947 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreReader.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreReader.java @@ -10,14 +10,14 @@ **************************************************************************/ package org.eclipse.emf.cdo.server; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.model.CDOClassRef; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; -import org.eclipse.emf.cdo.protocol.model.CDOPackage; -import org.eclipse.emf.cdo.protocol.model.CDOPackageInfo; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.model.CDOClassRef; +import org.eclipse.emf.cdo.common.model.CDOFeature; +import org.eclipse.emf.cdo.common.model.CDOPackage; +import org.eclipse.emf.cdo.common.model.CDOPackageInfo; +import org.eclipse.emf.cdo.common.revision.CDORevision; -import org.eclipse.net4j.util.io.CloseableIterator; +import org.eclipse.net4j.util.collection.CloseableIterator; import java.util.Collection; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreWriter.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreWriter.java index 05963ad91c..fd163233f4 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreWriter.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreWriter.java @@ -11,12 +11,12 @@ **************************************************************************/ package org.eclipse.emf.cdo.server; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDTemp; -import org.eclipse.emf.cdo.protocol.model.CDOPackage; -import org.eclipse.emf.cdo.protocol.model.CDOPackageManager; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; -import org.eclipse.emf.cdo.protocol.revision.delta.CDORevisionDelta; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDTemp; +import org.eclipse.emf.cdo.common.model.CDOPackage; +import org.eclipse.emf.cdo.common.model.CDOPackageManager; +import org.eclipse.emf.cdo.common.revision.CDORevision; +import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; import java.util.Map; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ITransaction.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ITransaction.java index 5f229cf6cc..ecf12ce77a 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ITransaction.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ITransaction.java @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.emf.cdo.server; -import org.eclipse.emf.cdo.protocol.CDOProtocolView; -import org.eclipse.emf.cdo.protocol.model.CDOPackageManager; +import org.eclipse.emf.cdo.common.CDOProtocolView; +import org.eclipse.emf.cdo.common.model.CDOPackageManager; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IView.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IView.java index bf3172a196..d39dd0cdb4 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IView.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IView.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo.server; -import org.eclipse.emf.cdo.protocol.CDOProtocolView; +import org.eclipse.emf.cdo.common.CDOProtocolView; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/RepositoryNotFoundException.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/RepositoryNotFoundException.java index b333f6c6e3..e14f047fa6 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/RepositoryNotFoundException.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/RepositoryNotFoundException.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo.server; -import org.eclipse.emf.cdo.protocol.util.CDOException; +import org.eclipse.emf.cdo.common.util.CDOException; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ServerConstants.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ServerConstants.java index 092a0404ea..f2a429cbca 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ServerConstants.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ServerConstants.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo.server; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/SessionCreationException.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/SessionCreationException.java index b0aade6771..9e31012816 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/SessionCreationException.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/SessionCreationException.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo.server; -import org.eclipse.emf.cdo.protocol.util.CDOException; +import org.eclipse.emf.cdo.common.util.CDOException; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.mango/META-INF/MANIFEST.MF index 3944f40d9d..231470bfb2 100644 --- a/plugins/org.eclipse.emf.cdo.tests.mango/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.tests.mango/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.mango; singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -9,8 +9,8 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, - org.eclipse.emf.cdo;bundle-version="[1.0.0,2.0.0)";visibility:=reexport -Export-Package: org.eclipse.emf.cdo.tests.mango;version="1.0.0", - org.eclipse.emf.cdo.tests.mango.impl;version="1.0.0", - org.eclipse.emf.cdo.tests.mango.util;version="1.0.0" + org.eclipse.emf.cdo;bundle-version="[2.0.0,3.0.0)";visibility:=reexport +Export-Package: org.eclipse.emf.cdo.tests.mango;version="2.0.0", + org.eclipse.emf.cdo.tests.mango.impl;version="2.0.0", + org.eclipse.emf.cdo.tests.mango.util;version="2.0.0" diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF index 664e5a7c2a..040281bb6b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF @@ -1,14 +1,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model1; singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", - org.eclipse.emf.cdo;bundle-version="[1.0.0,2.0.0)";visibility:=reexport -Export-Package: org.eclipse.emf.cdo.tests.model1;version="1.0.0", - org.eclipse.emf.cdo.tests.model1.impl;version="1.0.0", - org.eclipse.emf.cdo.tests.model1.util;version="1.0.0" + org.eclipse.emf.cdo;bundle-version="[2.0.0,3.0.0)";visibility:=reexport +Export-Package: org.eclipse.emf.cdo.tests.model1;version="2.0.0", + org.eclipse.emf.cdo.tests.model1.impl;version="2.0.0", + org.eclipse.emf.cdo.tests.model1.util;version="2.0.0" diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model2/META-INF/MANIFEST.MF index 441bd42478..3d8395bd2b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.tests.model2/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model2; singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -9,8 +9,8 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, - org.eclipse.emf.cdo;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, - org.eclipse.emf.cdo.tests.model1;bundle-version="[1.0.0,2.0.0)";visibility:=reexport -Export-Package: org.eclipse.emf.cdo.tests.model2;version="1.0.0", - org.eclipse.emf.cdo.tests.model2.impl;version="1.0.0", - org.eclipse.emf.cdo.tests.model2.util;version="1.0.0" + org.eclipse.emf.cdo;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.cdo.tests.model1;bundle-version="[2.0.0,3.0.0)";visibility:=reexport +Export-Package: org.eclipse.emf.cdo.tests.model2;version="2.0.0", + org.eclipse.emf.cdo.tests.model2.impl;version="2.0.0", + org.eclipse.emf.cdo.tests.model2.util;version="2.0.0" diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model3/META-INF/MANIFEST.MF index 5501ef67a5..5a767b3d6d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.tests.model3/META-INF/MANIFEST.MF @@ -2,18 +2,18 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model3; singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.emf.cdo.tests.model3;version="1.0.0", - org.eclipse.emf.cdo.tests.model3.impl;version="1.0.0", - org.eclipse.emf.cdo.tests.model3.subpackage;version="1.0.0", - org.eclipse.emf.cdo.tests.model3.subpackage.impl;version="1.0.0", - org.eclipse.emf.cdo.tests.model3.subpackage.util;version="1.0.0", - org.eclipse.emf.cdo.tests.model3.util;version="1.0.0" +Export-Package: org.eclipse.emf.cdo.tests.model3;version="2.0.0", + org.eclipse.emf.cdo.tests.model3.impl;version="2.0.0", + org.eclipse.emf.cdo.tests.model3.subpackage;version="2.0.0", + org.eclipse.emf.cdo.tests.model3.subpackage.impl;version="2.0.0", + org.eclipse.emf.cdo.tests.model3.subpackage.util;version="2.0.0", + org.eclipse.emf.cdo.tests.model3.util;version="2.0.0" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, - org.eclipse.emf.cdo;bundle-version="[1.0.0,2.0.0)";visibility:=reexport + org.eclipse.emf.cdo;bundle-version="[2.0.0,3.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.emf.cdo.tests/net4j/org/eclipse/net4j/tests/AbstractOMTest.java b/plugins/org.eclipse.emf.cdo.tests/net4j/org/eclipse/net4j/tests/AbstractOMTest.java index e20a413bce..815f0c8e1b 100644 --- a/plugins/org.eclipse.emf.cdo.tests/net4j/org/eclipse/net4j/tests/AbstractOMTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/net4j/org/eclipse/net4j/tests/AbstractOMTest.java @@ -10,11 +10,11 @@ **************************************************************************/ package org.eclipse.net4j.tests; -import org.eclipse.net4j.internal.util.om.log.PrintLogHandler; -import org.eclipse.net4j.internal.util.om.trace.PrintTraceHandler; import org.eclipse.net4j.util.concurrent.ConcurrencyUtil; import org.eclipse.net4j.util.io.IOUtil; import org.eclipse.net4j.util.om.OMPlatform; +import org.eclipse.net4j.util.om.log.PrintLogHandler; +import org.eclipse.net4j.util.om.trace.PrintTraceHandler; import junit.framework.TestCase; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTests.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTests.java index 65c647a63b..feeb57cbe0 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTests.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTests.java @@ -28,7 +28,7 @@ public class AllTests suite.addTestSuite(EnumTest.class); suite.addTestSuite(StateMachineTest.class); suite.addTestSuite(ViewTest.class); - suite.addTestSuite(ResourceTest.class); + suite.addTestSuite(NonCDOResourceTest.class); suite.addTestSuite(ContainmentTest.class); suite.addTestSuite(InvalidationTest.class); suite.addTestSuite(RollbackTest.class); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingWithMEMTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingWithMEMTest.java index e50dbee4dc..2165bb33dd 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingWithMEMTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingWithMEMTest.java @@ -13,10 +13,10 @@ package org.eclipse.emf.cdo.tests; import org.eclipse.emf.cdo.CDOSession; import org.eclipse.emf.cdo.CDOTransaction; +import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.internal.server.Repository; import org.eclipse.emf.cdo.internal.server.RevisionManager; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; import org.eclipse.emf.cdo.server.IStore; import org.eclipse.emf.cdo.tests.model1.Customer; import org.eclipse.emf.cdo.tests.model1.Model1Factory; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContentAdapterTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContentAdapterTest.java index 0c30a69146..b6bcf0011f 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContentAdapterTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContentAdapterTest.java @@ -13,9 +13,9 @@ package org.eclipse.emf.cdo.tests; import org.eclipse.emf.cdo.CDOSession; import org.eclipse.emf.cdo.CDOTransaction; import org.eclipse.emf.cdo.analyzer.CDOFetchRuleManager; +import org.eclipse.emf.cdo.common.analyzer.CDOFetchRule; +import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.eresource.CDOResource; -import org.eclipse.emf.cdo.protocol.analyzer.CDOFetchRule; -import org.eclipse.emf.cdo.protocol.id.CDOID; import org.eclipse.emf.cdo.tests.model1.Model1Factory; import org.eclipse.emf.cdo.tests.model1.Supplier; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FetchRuleAnalyzerTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FetchRuleAnalyzerTest.java index 2a3133d078..82c9eb1a3b 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FetchRuleAnalyzerTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FetchRuleAnalyzerTest.java @@ -14,8 +14,8 @@ package org.eclipse.emf.cdo.tests; import org.eclipse.emf.cdo.CDOObject; import org.eclipse.emf.cdo.CDOSession; import org.eclipse.emf.cdo.CDOTransaction; +import org.eclipse.emf.cdo.common.analyzer.CDOFetchRule; import org.eclipse.emf.cdo.eresource.CDOResource; -import org.eclipse.emf.cdo.protocol.analyzer.CDOFetchRule; import org.eclipse.emf.cdo.tests.model1.Company; import org.eclipse.emf.cdo.tests.model1.Model1Factory; import org.eclipse.emf.cdo.tests.model1.Model1Package; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/IndexReconstructionTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/IndexReconstructionTest.java index acf57bc0a6..d54249497b 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/IndexReconstructionTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/IndexReconstructionTest.java @@ -12,13 +12,13 @@ package org.eclipse.emf.cdo.tests; import org.eclipse.emf.cdo.CDOSession; import org.eclipse.emf.cdo.CDOTransaction; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.model.CDOFeature; +import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta; +import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.eresource.EresourcePackage; -import org.eclipse.emf.cdo.internal.protocol.revision.delta.CDOListFeatureDeltaImpl; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; -import org.eclipse.emf.cdo.protocol.revision.delta.CDOFeatureDelta; -import org.eclipse.emf.cdo.protocol.revision.delta.CDORevisionDelta; +import org.eclipse.emf.cdo.internal.common.revision.delta.CDOListFeatureDeltaImpl; import org.eclipse.emf.cdo.tests.model1.Customer; import org.eclipse.emf.cdo.tests.model1.Model1Factory; import org.eclipse.emf.cdo.tests.model1.Model1Package; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java index 4d537f24fe..17675287e1 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java @@ -14,6 +14,7 @@ import org.eclipse.emf.cdo.CDOSession; import org.eclipse.emf.cdo.CDOState; import org.eclipse.emf.cdo.CDOTransaction; import org.eclipse.emf.cdo.eresource.CDOResource; +import org.eclipse.emf.cdo.tests.model1.Category; import org.eclipse.emf.cdo.tests.model1.Model1Factory; import org.eclipse.emf.cdo.tests.model1.Model1Package; import org.eclipse.emf.cdo.tests.model1.OrderAddress; @@ -27,10 +28,16 @@ import org.eclipse.net4j.channel.IChannel; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EcoreFactory; +import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.emf.ecore.util.EcoreUtil; +import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl; import java.util.Date; @@ -783,4 +790,43 @@ public class InitialTest extends AbstractCDOTest } } + + public void testDirectResourceEMF() throws Exception + { + Resource resource1 = new XMLResourceImpl(); + + EPackage p = EcoreFactory.eINSTANCE.createEPackage(); + EClass c = EcoreFactory.eINSTANCE.createEClass(); + + resource1.getContents().add(p); + p.getEClassifiers().add(c); + + assertEquals(null, ((InternalEObject)c).eDirectResource()); + assertEquals(resource1, ((InternalEObject)p).eDirectResource()); + } + + public void testDirectResource() throws Exception + { + CDOSession session = openModel1Session(); + CDOTransaction transaction = (CDOTransaction)session.openTransaction(); + + CDOResource resource1 = transaction.getOrCreateResource("/test1"); + // Resource resource1 = new XMIResourceImpl(); + + Category cat1 = Model1Factory.eINSTANCE.createCategory(); + assertTransient(cat1); + + Category cat2 = Model1Factory.eINSTANCE.createCategory(); + assertTransient(cat2); + + // resource1.getContents().add(cat2); + resource1.getContents().add(cat1); + cat1.getCategories().add(cat2); + + assertEquals(null, ((InternalEObject)cat2).eDirectResource()); + assertEquals(resource1, ((InternalEObject)cat1).eDirectResource()); + + transaction.close(); + session.close(); + } } diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/NonCDOResourceTest.java index f63638a920..c9500823c5 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/NonCDOResourceTest.java @@ -25,7 +25,7 @@ import junit.framework.TestCase; * @author Simon McDuff * @author Eike Stepper */ -public class ResourceTest extends TestCase +public class NonCDOResourceTest extends TestCase { public void testNonCDOResource() throws Exception { diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java index 905e1f842b..29d3405339 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java @@ -14,8 +14,8 @@ import org.eclipse.emf.cdo.CDOObject; import org.eclipse.emf.cdo.CDOSession; import org.eclipse.emf.cdo.CDOSessionConfiguration; import org.eclipse.emf.cdo.CDOTransaction; +import org.eclipse.emf.cdo.common.model.CDOPackage; import org.eclipse.emf.cdo.eresource.CDOResource; -import org.eclipse.emf.cdo.protocol.model.CDOPackage; import org.eclipse.emf.cdo.tests.mango.MangoFactory; import org.eclipse.emf.cdo.tests.mango.MangoPackage; import org.eclipse.emf.cdo.tests.mango.Value; @@ -133,8 +133,7 @@ public class PackageRegistryTest extends AbstractCDOTest public void testCommitNestedPackages() throws Exception { CDOSession session = openSession(); - session.getPackageRegistry().putEPackage(Model3Package.eINSTANCE); - assertEquals(2, session.getPackageRegistry().size()); + assertEquals(0, session.getPackageRegistry().size()); try { @@ -145,6 +144,17 @@ public class PackageRegistryTest extends AbstractCDOTest { } + session.close(); + } + + public void testCommitTopLevelPackages() throws Exception + { + CDOSession session = openSession(); + assertEquals(0, session.getPackageRegistry().size()); + + session.getPackageRegistry().putEPackage(Model3Package.eINSTANCE); + assertEquals(2, session.getPackageRegistry().size()); + CDOTransaction transaction = session.openTransaction(); CDOResource res = transaction.createResource("/res"); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaTest.java index 8900968fa7..447d2f7879 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaTest.java @@ -14,17 +14,17 @@ package org.eclipse.emf.cdo.tests; import org.eclipse.emf.cdo.CDOObject; import org.eclipse.emf.cdo.CDOSession; import org.eclipse.emf.cdo.CDOTransaction; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.model.CDOFeature; +import org.eclipse.emf.cdo.common.revision.CDORevision; +import org.eclipse.emf.cdo.common.revision.CDORevisionUtil; +import org.eclipse.emf.cdo.common.revision.delta.CDOAddFeatureDelta; +import org.eclipse.emf.cdo.common.revision.delta.CDOClearFeatureDelta; +import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; +import org.eclipse.emf.cdo.common.revision.delta.CDOSetFeatureDelta; import org.eclipse.emf.cdo.eresource.CDOResource; -import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; -import org.eclipse.emf.cdo.internal.protocol.revision.delta.CDOListFeatureDeltaImpl; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; -import org.eclipse.emf.cdo.protocol.revision.CDORevisionUtil; -import org.eclipse.emf.cdo.protocol.revision.delta.CDOAddFeatureDelta; -import org.eclipse.emf.cdo.protocol.revision.delta.CDOClearFeatureDelta; -import org.eclipse.emf.cdo.protocol.revision.delta.CDORevisionDelta; -import org.eclipse.emf.cdo.protocol.revision.delta.CDOSetFeatureDelta; +import org.eclipse.emf.cdo.internal.common.revision.delta.CDOListFeatureDeltaImpl; +import org.eclipse.emf.cdo.spi.common.InternalCDORevision; import org.eclipse.emf.cdo.tests.model1.Category; import org.eclipse.emf.cdo.tests.model1.Company; import org.eclipse.emf.cdo.tests.model1.Customer; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionHolderTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionHolderTest.java index dc2573969a..79b41b73ad 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionHolderTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionHolderTest.java @@ -10,17 +10,17 @@ **************************************************************************/ package org.eclipse.emf.cdo.tests; -import org.eclipse.emf.cdo.internal.protocol.revision.DLRevisionHolder; -import org.eclipse.emf.cdo.internal.protocol.revision.LRURevisionHolder; -import org.eclipse.emf.cdo.internal.protocol.revision.LRURevisionList; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDProvider; -import org.eclipse.emf.cdo.protocol.id.CDOIDUtil; -import org.eclipse.emf.cdo.protocol.model.CDOClass; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; -import org.eclipse.emf.cdo.protocol.revision.CDORevisionData; -import org.eclipse.emf.cdo.protocol.revision.CDORevisionResolver; -import org.eclipse.emf.cdo.protocol.revision.delta.CDORevisionDelta; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDProvider; +import org.eclipse.emf.cdo.common.id.CDOIDUtil; +import org.eclipse.emf.cdo.common.model.CDOClass; +import org.eclipse.emf.cdo.common.revision.CDORevision; +import org.eclipse.emf.cdo.common.revision.CDORevisionData; +import org.eclipse.emf.cdo.common.revision.CDORevisionResolver; +import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; +import org.eclipse.emf.cdo.internal.common.revision.DLRevisionHolder; +import org.eclipse.emf.cdo.internal.common.revision.LRURevisionHolder; +import org.eclipse.emf.cdo.internal.common.revision.LRURevisionList; import org.eclipse.net4j.tests.AbstractOMTest; import org.eclipse.net4j.util.io.ExtendedDataOutput; @@ -192,7 +192,7 @@ public class RevisionHolderTest extends AbstractOMTest public RevisionStub(long id) { - this.id = CDOIDUtil.createCDOID(id); + this.id = CDOIDUtil.createLong(id); } public CDOClass getCDOClass() diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/StateMachineTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/StateMachineTest.java index 4d40fd4423..884f70d62a 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/StateMachineTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/StateMachineTest.java @@ -14,8 +14,8 @@ import org.eclipse.emf.cdo.CDOObject; import org.eclipse.emf.cdo.CDOSession; import org.eclipse.emf.cdo.CDOState; import org.eclipse.emf.cdo.CDOTransaction; +import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.eresource.CDOResource; -import org.eclipse.emf.cdo.protocol.id.CDOID; import org.eclipse.emf.cdo.tests.model1.Category; import org.eclipse.emf.cdo.tests.model1.Model1Factory; import org.eclipse.emf.cdo.tests.model1.Product; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ViewTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ViewTest.java index 54b8d6415c..61838ef228 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ViewTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ViewTest.java @@ -13,9 +13,17 @@ package org.eclipse.emf.cdo.tests; import org.eclipse.emf.cdo.CDOSession; import org.eclipse.emf.cdo.CDOTransaction; import org.eclipse.emf.cdo.CDOView; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.model.resource.CDOContentsFeature; +import org.eclipse.emf.cdo.common.model.resource.CDOResourcePackage; +import org.eclipse.emf.cdo.common.revision.CDOReferenceProxy; +import org.eclipse.emf.cdo.common.revision.CDORevisionData; import org.eclipse.emf.cdo.eresource.CDOResource; -import org.eclipse.emf.cdo.protocol.id.CDOID; +import org.eclipse.emf.cdo.tests.model1.Company; +import org.eclipse.emf.cdo.tests.model1.Model1Factory; +import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; @@ -60,6 +68,94 @@ public class ViewTest extends AbstractCDOTest session.close(); } + public void testUniqueResourceContents() throws Exception + { + { + CDOSession session = openModel1Session(); + CDOTransaction transaction = session.openTransaction(); + CDOResource resource = transaction.createResource("/test1"); + EList<EObject> contents = resource.getContents(); + for (int i = 0; i < 100; i++) + { + Company company = Model1Factory.eINSTANCE.createCompany(); + company.setName("Company " + i); + contents.add(company); + } + + transaction.commit(); + session.close(); + } + + CDOSession session = openModel1Session(); + session.setReferenceChunkSize(2); + + CDOTransaction transaction = session.openTransaction(); + transaction.setUniqueResourceContents(true); + + CDOResource resource = transaction.getResource("/test1"); + EList<EObject> contents = resource.getContents(); + for (int i = 100; i < 110; i++) + { + Company company = Model1Factory.eINSTANCE.createCompany(); + company.setName("Company " + i); + contents.add(company); + } + + CDORevisionData revision = resource.cdoRevision().getData(); + CDOResourcePackage resourcePackage = session.getPackageManager().getCDOResourcePackage(); + CDOContentsFeature contentsFeature = resourcePackage.getCDOResourceClass().getCDOContentsFeature(); + assertEquals(false, revision.get(contentsFeature, 0) instanceof CDOReferenceProxy); + assertEquals(false, revision.get(contentsFeature, 1) instanceof CDOReferenceProxy); + assertEquals(false, revision.get(contentsFeature, 2) instanceof CDOReferenceProxy); + assertEquals(false, revision.get(contentsFeature, 99) instanceof CDOReferenceProxy); + assertEquals(false, revision.get(contentsFeature, 100) instanceof CDOReferenceProxy); + session.close(); + } + + public void testNonUniqueResourceContents() throws Exception + { + { + CDOSession session = openModel1Session(); + CDOTransaction transaction = session.openTransaction(); + CDOResource resource = transaction.createResource("/test1"); + EList<EObject> contents = resource.getContents(); + for (int i = 0; i < 100; i++) + { + Company company = Model1Factory.eINSTANCE.createCompany(); + company.setName("Company " + i); + contents.add(company); + } + + transaction.commit(); + session.close(); + } + + CDOSession session = openModel1Session(); + session.setReferenceChunkSize(2); + + CDOTransaction transaction = session.openTransaction(); + transaction.setUniqueResourceContents(false); + + CDOResource resource = transaction.getResource("/test1"); + EList<EObject> contents = resource.getContents(); + for (int i = 100; i < 110; i++) + { + Company company = Model1Factory.eINSTANCE.createCompany(); + company.setName("Company " + i); + contents.add(company); + } + + CDORevisionData revision = resource.cdoRevision().getData(); + CDOResourcePackage resourcePackage = session.getPackageManager().getCDOResourcePackage(); + CDOContentsFeature contentsFeature = resourcePackage.getCDOResourceClass().getCDOContentsFeature(); + assertEquals(false, revision.get(contentsFeature, 0) instanceof CDOReferenceProxy); + assertEquals(false, revision.get(contentsFeature, 1) instanceof CDOReferenceProxy); + assertEquals(true, revision.get(contentsFeature, 2) instanceof CDOReferenceProxy); + assertEquals(true, revision.get(contentsFeature, 99) instanceof CDOReferenceProxy); + assertEquals(false, revision.get(contentsFeature, 100) instanceof CDOReferenceProxy); + session.close(); + } + public void testExternalResourceSet() throws Exception { { diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/store/logic/TestLogic.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/store/logic/TestLogic.java index 3c5b684ef0..6ff3df60ca 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/store/logic/TestLogic.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/store/logic/TestLogic.java @@ -10,24 +10,24 @@ **************************************************************************/ package org.eclipse.emf.cdo.tests.store.logic; -import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDMetaRange; +import org.eclipse.emf.cdo.common.id.CDOIDTemp; +import org.eclipse.emf.cdo.common.id.CDOIDUtil; +import org.eclipse.emf.cdo.common.model.CDOClass; +import org.eclipse.emf.cdo.common.model.CDOFeature; +import org.eclipse.emf.cdo.common.model.CDOModelUtil; +import org.eclipse.emf.cdo.common.model.CDOPackage; +import org.eclipse.emf.cdo.common.model.resource.CDOResourceClass; +import org.eclipse.emf.cdo.common.model.resource.CDOResourcePackage; +import org.eclipse.emf.cdo.common.revision.CDORevision; +import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; +import org.eclipse.emf.cdo.internal.common.revision.CDORevisionImpl; import org.eclipse.emf.cdo.internal.server.Repository; import org.eclipse.emf.cdo.internal.server.Session; import org.eclipse.emf.cdo.internal.server.Transaction; import org.eclipse.emf.cdo.internal.server.Transaction.TransactionPackageManager; import org.eclipse.emf.cdo.internal.server.protocol.CDOServerProtocol; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDMetaRange; -import org.eclipse.emf.cdo.protocol.id.CDOIDTemp; -import org.eclipse.emf.cdo.protocol.id.CDOIDUtil; -import org.eclipse.emf.cdo.protocol.model.CDOClass; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; -import org.eclipse.emf.cdo.protocol.model.CDOModelUtil; -import org.eclipse.emf.cdo.protocol.model.CDOPackage; -import org.eclipse.emf.cdo.protocol.model.resource.CDOResourceClass; -import org.eclipse.emf.cdo.protocol.model.resource.CDOResourcePackage; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; -import org.eclipse.emf.cdo.protocol.revision.delta.CDORevisionDelta; import org.eclipse.emf.cdo.server.IStore; import org.eclipse.emf.cdo.server.IRepository.Props; import org.eclipse.emf.cdo.tests.mango.MangoPackage; @@ -272,7 +272,7 @@ public abstract class TestLogic extends AbstractOMTest private Revision addRevision(int id, CDOClass cdoClass) { - CDOIDTemp tempID = CDOIDUtil.createCDOIDTempObject(id); + CDOIDTemp tempID = CDOIDUtil.createTempObject(id); Revision newObject = new Revision(cdoClass, tempID); newObjects.add(newObject); return newObject; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOConstants.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOConstants.java index 242ee17f74..876e4fb15a 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOConstants.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOConstants.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOObject.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOObject.java index 63a81788a6..fa4957c349 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOObject.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOObject.java @@ -10,10 +10,10 @@ **************************************************************************/ package org.eclipse.emf.cdo; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.model.CDOClass; +import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.eresource.CDOResource; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.model.CDOClass; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; import org.eclipse.emf.ecore.EObject; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDORevisionManager.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDORevisionManager.java index 751bfd7300..c3b4d8a0b2 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDORevisionManager.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDORevisionManager.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo; -import org.eclipse.emf.cdo.protocol.revision.CDORevisionResolver; +import org.eclipse.emf.cdo.common.revision.CDORevisionResolver; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java index c640715784..7626c5ef1e 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo; -import org.eclipse.emf.cdo.protocol.CDOProtocolSession; +import org.eclipse.emf.cdo.common.CDOProtocolSession; import org.eclipse.emf.cdo.util.CDOPackageRegistry; import org.eclipse.net4j.channel.IChannel; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionInvalidationEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionInvalidationEvent.java index 1a9e817d90..57c0cea688 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionInvalidationEvent.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionInvalidationEvent.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo; -import org.eclipse.emf.cdo.protocol.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOID; import java.util.Set; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionPackageManager.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionPackageManager.java index 3f2032bfdb..8e8c92c847 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionPackageManager.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionPackageManager.java @@ -10,10 +10,10 @@ **************************************************************************/ package org.eclipse.emf.cdo; -import org.eclipse.emf.cdo.protocol.model.CDOClass; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; -import org.eclipse.emf.cdo.protocol.model.CDOPackage; -import org.eclipse.emf.cdo.protocol.model.CDOPackageManager; +import org.eclipse.emf.cdo.common.model.CDOClass; +import org.eclipse.emf.cdo.common.model.CDOFeature; +import org.eclipse.emf.cdo.common.model.CDOPackage; +import org.eclipse.emf.cdo.common.model.CDOPackageManager; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransaction.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransaction.java index f545aa4659..c27a9a9311 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransaction.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransaction.java @@ -12,11 +12,11 @@ **************************************************************************/ package org.eclipse.emf.cdo; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.model.CDOClass; +import org.eclipse.emf.cdo.common.model.CDOPackage; +import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; import org.eclipse.emf.cdo.eresource.CDOResource; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.model.CDOClass; -import org.eclipse.emf.cdo.protocol.model.CDOPackage; -import org.eclipse.emf.cdo.protocol.revision.delta.CDORevisionDelta; import org.eclipse.net4j.util.transaction.TransactionException; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionFinishedEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionFinishedEvent.java index 535f158304..6240ff80b0 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionFinishedEvent.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionFinishedEvent.java @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.emf.cdo; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDTemp; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDTemp; import java.util.Map; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionHandler.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionHandler.java index eea24b159e..3cd598887e 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionHandler.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionHandler.java @@ -12,7 +12,7 @@ **************************************************************************/ package org.eclipse.emf.cdo; -import org.eclipse.emf.cdo.protocol.revision.delta.CDOFeatureDelta; +import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta; /** * TODO Enhance API: Return exceptions instead of letting them be thrown diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java index e81c106d7e..5ad0494686 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java @@ -12,10 +12,10 @@ **************************************************************************/ package org.eclipse.emf.cdo; +import org.eclipse.emf.cdo.common.CDOProtocolView; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.eresource.CDOResource; -import org.eclipse.emf.cdo.protocol.CDOProtocolView; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; import org.eclipse.net4j.util.event.INotifier; @@ -39,9 +39,25 @@ public interface CDOView extends CDOProtocolView, INotifier public boolean hasConflict(); - public boolean isEnableInvalidationNotifications(); + public boolean hasUniqueResourceContents(); - public void setEnableInvalidationNotifications(boolean on); + /** + * Specifies whether the contents list of resources will be unique or not. + * <p> + * This property is transient in that it does not stick with resources outside of the scope of this view. Especially + * it will not be persisted with resources in the repository. Each new view will start with <code>true</code> as a + * default value. Changing to <code>false</code> will subsequently apply to all resources being loaded or created. + * <p> + * Notice that the resource contents is a containment list and as such <b>must be</b> unique. Setting this property to + * <code>false</code> is only recommended for performance optimization when uniqueness is granted by other means. + * Violating the uniqueness constraint will result in unpredictable behaviour and possible corruption of the + * repository! + */ + public void setUniqueResourceContents(boolean uniqueResourceContents); + + public boolean isInvalidationNotificationsEnabled(); + + public void setInvalidationNotificationsEnabled(boolean invalidationNotificationsEnabled); public int getLoadRevisionCollectionChunkSize(); diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/analyzer/CDOFeatureAnalyzer.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/analyzer/CDOFeatureAnalyzer.java index be8b76c643..1fbcc8b8b2 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/analyzer/CDOFeatureAnalyzer.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/analyzer/CDOFeatureAnalyzer.java @@ -11,7 +11,7 @@ **************************************************************************/ package org.eclipse.emf.cdo.analyzer; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; +import org.eclipse.emf.cdo.common.model.CDOFeature; import org.eclipse.emf.internal.cdo.InternalCDOObject; import org.eclipse.emf.internal.cdo.analyzer.NOOPFeatureAnalyzer; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/analyzer/CDOFetchRuleManager.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/analyzer/CDOFetchRuleManager.java index ecd38ae2f7..0e6dd05f5e 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/analyzer/CDOFetchRuleManager.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/analyzer/CDOFetchRuleManager.java @@ -11,8 +11,8 @@ **************************************************************************/ package org.eclipse.emf.cdo.analyzer; -import org.eclipse.emf.cdo.protocol.analyzer.CDOFetchRule; -import org.eclipse.emf.cdo.protocol.id.CDOID; +import org.eclipse.emf.cdo.common.analyzer.CDOFetchRule; +import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.internal.cdo.analyzer.NOOPFetchRuleManager; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResource.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResource.java index 12844850ee..9c73db5f2d 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResource.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResource.java @@ -28,6 +28,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet; * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#isTrackingModification <em>Tracking Modification</em>}</li> * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getErrors <em>Errors</em>}</li> * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getWarnings <em>Warnings</em>}</li> + * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getTimeStamp <em>Time Stamp</em>}</li> * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getPath <em>Path</em>}</li> * </ul> * </p> diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourcePackage.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourcePackage.java index b7f0011260..5863888173 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourcePackage.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourcePackage.java @@ -299,8 +299,8 @@ public interface EresourcePackage extends EPackage EAttribute getCDOResource_TimeStamp(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#getPath <em>Path</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#getPath <em>Path</em>} + * '. <!-- begin-user-doc --> <!-- end-user-doc --> * * @return the meta object for the attribute '<em>Path</em>'. * @see org.eclipse.emf.cdo.eresource.CDOResource#getPath() diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java index 55c1c2a9be..eb91658a72 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java @@ -13,21 +13,19 @@ package org.eclipse.emf.cdo.eresource.impl; import org.eclipse.emf.cdo.CDOState; import org.eclipse.emf.cdo.CDOTransaction; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDUtil; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.eresource.EresourcePackage; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDUtil; import org.eclipse.emf.cdo.util.CDOUtil; -import org.eclipse.emf.internal.cdo.CDOLegacyImpl; import org.eclipse.emf.internal.cdo.CDOObjectImpl; import org.eclipse.emf.internal.cdo.CDOViewImpl; import org.eclipse.emf.internal.cdo.InternalCDOObject; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.emf.internal.cdo.util.FSMUtil; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; -import org.eclipse.net4j.util.ImplementationError; +import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; @@ -40,6 +38,7 @@ import org.eclipse.emf.common.util.TreeIterator; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; @@ -68,6 +67,7 @@ import java.util.Map; * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#isTrackingModification <em>Tracking Modification</em>}</li> * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getErrors <em>Errors</em>}</li> * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getWarnings <em>Warnings</em>}</li> + * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getTimeStamp <em>Time Stamp</em>}</li> * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getPath <em>Path</em>}</li> * </ul> * </p> @@ -423,11 +423,12 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource */ public void attached(EObject object) { - /* - * InternalCDOObject legacy = getLegacyWrapper(object); if (legacy.cdoState() != CDOState.CLEAN) { - * CDOStateMachine.INSTANCE.attach(legacy, this, view); // if (legacy.eContainer() == this) // { // - * legacy.eBasicSetContainer(null, 0, null); // legacy.eSetResource(this, null); // } } - */ + // InternalCDOObject legacy = getLegacyWrapper(object); + // if (legacy.cdoState() != CDOState.CLEAN) + // { + // CDOStateMachine.INSTANCE.attach(legacy, this, view); + // } + } /** @@ -435,9 +436,8 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource */ public void detached(EObject object) { - /* - * InternalCDOObject legacy = getLegacyWrapper(object); CDOStateMachine.INSTANCE.detach(legacy); - */ + // InternalCDOObject legacy = getLegacyWrapper(object); + // CDOStateMachine.INSTANCE.detach(legacy); } /** @@ -541,15 +541,18 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource this.existing = existing; } - private InternalCDOObject getLegacyWrapper(EObject object) throws ImplementationError + /** + * @ADDED + */ + @Override + protected EList<?> createList(EStructuralFeature eStructuralFeature) { - InternalCDOObject legacy = FSMUtil.adapt(object, view); - if (!(legacy instanceof CDOLegacyImpl)) + if (eStructuralFeature == EresourcePackage.eINSTANCE.getCDOResource_Contents()) { - throw new ImplementationError("Should be legacy wrapper: " + object); + return new PersistentContents(eStructuralFeature); } - return legacy; + return super.createList(eStructuralFeature); } /** @@ -561,6 +564,24 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource } /** + * @ADDED + * @author Eike Stepper + */ + protected class PersistentContents extends CDOStoreEList<Object> + { + private static final long serialVersionUID = 1L; + + public PersistentContents(EStructuralFeature eStructuralFeature) + { + super(eStructuralFeature); + if (!cdoView().hasUniqueResourceContents()) + { + kind &= ~IS_UNIQUE; + } + } + } + + /** * TODO Change superclass to NotifyingInternalEListImpl when EMF 2.3 is out of maintenance * * @ADDED diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOAutoAttacher.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOAutoAttacher.java index 5174dc35eb..09891d44f1 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOAutoAttacher.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOAutoAttacher.java @@ -13,17 +13,17 @@ package org.eclipse.emf.cdo.util; import org.eclipse.emf.cdo.CDOObject; import org.eclipse.emf.cdo.CDOTransaction; import org.eclipse.emf.cdo.CDOTransactionHandler; +import org.eclipse.emf.cdo.common.revision.delta.CDOAddFeatureDelta; +import org.eclipse.emf.cdo.common.revision.delta.CDOClearFeatureDelta; +import org.eclipse.emf.cdo.common.revision.delta.CDOContainerFeatureDelta; +import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta; +import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDeltaVisitor; +import org.eclipse.emf.cdo.common.revision.delta.CDOListFeatureDelta; +import org.eclipse.emf.cdo.common.revision.delta.CDOMoveFeatureDelta; +import org.eclipse.emf.cdo.common.revision.delta.CDORemoveFeatureDelta; +import org.eclipse.emf.cdo.common.revision.delta.CDOSetFeatureDelta; +import org.eclipse.emf.cdo.common.revision.delta.CDOUnsetFeatureDelta; import org.eclipse.emf.cdo.eresource.CDOResource; -import org.eclipse.emf.cdo.protocol.revision.delta.CDOAddFeatureDelta; -import org.eclipse.emf.cdo.protocol.revision.delta.CDOClearFeatureDelta; -import org.eclipse.emf.cdo.protocol.revision.delta.CDOContainerFeatureDelta; -import org.eclipse.emf.cdo.protocol.revision.delta.CDOFeatureDelta; -import org.eclipse.emf.cdo.protocol.revision.delta.CDOFeatureDeltaVisitor; -import org.eclipse.emf.cdo.protocol.revision.delta.CDOListFeatureDelta; -import org.eclipse.emf.cdo.protocol.revision.delta.CDOMoveFeatureDelta; -import org.eclipse.emf.cdo.protocol.revision.delta.CDORemoveFeatureDelta; -import org.eclipse.emf.cdo.protocol.revision.delta.CDOSetFeatureDelta; -import org.eclipse.emf.cdo.protocol.revision.delta.CDOUnsetFeatureDelta; import org.eclipse.emf.internal.cdo.InternalCDOObject; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOPackageRegistry.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOPackageRegistry.java index b3cdcb07d0..6323183571 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOPackageRegistry.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOPackageRegistry.java @@ -11,7 +11,7 @@ package org.eclipse.emf.cdo.util; import org.eclipse.emf.cdo.CDOSession; -import org.eclipse.emf.cdo.protocol.model.CDOPackage; +import org.eclipse.emf.cdo.common.model.CDOPackage; import org.eclipse.emf.ecore.EPackage; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java index f482fdd257..294d9d903f 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java @@ -12,14 +12,14 @@ package org.eclipse.emf.cdo.util; import org.eclipse.emf.cdo.CDOSessionConfiguration; import org.eclipse.emf.cdo.CDOView; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; import org.eclipse.emf.cdo.eresource.CDOResourceFactory; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; import org.eclipse.emf.internal.cdo.CDOSessionConfigurationImpl; import org.eclipse.emf.internal.cdo.CDOStateMachine; import org.eclipse.emf.internal.cdo.CDOViewImpl; import org.eclipse.emf.internal.cdo.InternalCDOObject; -import org.eclipse.emf.internal.cdo.LegacyObjectDisabler; +import org.eclipse.emf.internal.cdo.LegacySupportEnabler; import org.eclipse.emf.internal.cdo.protocol.CDOClientProtocolFactory; import org.eclipse.emf.internal.cdo.util.CDOPackageRegistryImpl; import org.eclipse.emf.internal.cdo.util.FSMUtil; @@ -91,10 +91,10 @@ public final class CDOUtil map.put(CDOProtocolConstants.PROTOCOL_NAME, factory); } - public static void prepareContainer(IManagedContainer container, boolean disableLegacyObjects) + public static void prepareContainer(IManagedContainer container, boolean legacySupportEnabled) { container.registerFactory(new CDOClientProtocolFactory()); - container.addPostProcessor(new LegacyObjectDisabler(disableLegacyObjects)); + container.addPostProcessor(new LegacySupportEnabler(legacySupportEnabled)); } public static String extractResourcePath(URI uri) diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAuditImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAuditImpl.java index 1d7268f0bc..178c217fde 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAuditImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAuditImpl.java @@ -11,9 +11,9 @@ package org.eclipse.emf.internal.cdo; import org.eclipse.emf.cdo.CDOAudit; -import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.revision.CDORevisionResolver; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.revision.CDORevisionResolver; +import org.eclipse.emf.cdo.spi.common.InternalCDORevision; import java.text.MessageFormat; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java index 79b7fb0b9c..1f82ad89a6 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java @@ -12,24 +12,24 @@ package org.eclipse.emf.internal.cdo; import org.eclipse.emf.cdo.CDOState; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.model.CDOClass; +import org.eclipse.emf.cdo.common.model.CDOFeature; +import org.eclipse.emf.cdo.common.model.CDOType; +import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl; -import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.model.CDOClass; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; -import org.eclipse.emf.cdo.protocol.model.CDOType; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; +import org.eclipse.emf.cdo.spi.common.InternalCDORevision; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.emf.internal.cdo.util.GenUtil; import org.eclipse.emf.internal.cdo.util.ModelUtil; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.ImplementationError; import org.eclipse.net4j.util.ReflectUtil; import org.eclipse.net4j.util.WrappedException; +import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOMetaImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOMetaImpl.java index d0e70ef689..4cef61cd57 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOMetaImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOMetaImpl.java @@ -11,10 +11,10 @@ package org.eclipse.emf.internal.cdo; import org.eclipse.emf.cdo.CDOState; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.model.CDOClass; +import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.eresource.CDOResource; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.model.CDOClass; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; import org.eclipse.emf.ecore.InternalEObject; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java index 333ffd666d..cc76599b02 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java @@ -12,22 +12,22 @@ package org.eclipse.emf.internal.cdo; import org.eclipse.emf.cdo.CDOState; import org.eclipse.emf.cdo.CDOView; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.model.CDOClass; +import org.eclipse.emf.cdo.common.model.CDOFeature; +import org.eclipse.emf.cdo.common.model.CDOType; +import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl; -import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.model.CDOClass; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; -import org.eclipse.emf.cdo.protocol.model.CDOType; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; +import org.eclipse.emf.cdo.spi.common.InternalCDORevision; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.emf.internal.cdo.util.FSMUtil; import org.eclipse.emf.internal.cdo.util.GenUtil; import org.eclipse.emf.internal.cdo.util.ModelUtil; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.ImplementationError; +import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.emf.common.util.BasicEMap; import org.eclipse.emf.common.util.ECollections; @@ -562,14 +562,12 @@ public class CDOObjectImpl extends EStoreEObjectImpl implements InternalCDOObjec if (FSMUtil.isTransient(this)) { - eContainer = newContainer; - eContainerFeatureID = newContainerFeatureID; + super.eBasicSetContainer(newContainer, newContainerFeatureID); } else { // Delegate to CDOStore getStore().setContainer(this, newContainer, newContainerFeatureID); - if (newContainer instanceof Resource.Internal) { eSetDirectResource((Resource.Internal)newContainer); diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectMerger.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectMerger.java index dec00c2f02..0fdc8f7976 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectMerger.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectMerger.java @@ -12,10 +12,10 @@ package org.eclipse.emf.internal.cdo; import org.eclipse.emf.cdo.CDOState; -import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; -import org.eclipse.emf.cdo.internal.protocol.revision.delta.CDORevisionMerger; -import org.eclipse.emf.cdo.protocol.revision.CDORevisionUtil; -import org.eclipse.emf.cdo.protocol.revision.delta.CDORevisionDelta; +import org.eclipse.emf.cdo.common.revision.CDORevisionUtil; +import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; +import org.eclipse.emf.cdo.internal.common.revision.delta.CDORevisionMerger; +import org.eclipse.emf.cdo.spi.common.InternalCDORevision; /** * @author Simon McDuff diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionManagerImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionManagerImpl.java index 9d0ec88699..b469c6eab2 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionManagerImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionManagerImpl.java @@ -12,14 +12,14 @@ package org.eclipse.emf.internal.cdo; import org.eclipse.emf.cdo.CDORevisionManager; import org.eclipse.emf.cdo.analyzer.CDOFetchRuleManager; -import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionResolverImpl; -import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDObjectFactory; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; -import org.eclipse.emf.cdo.protocol.revision.CDOReferenceProxy; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; -import org.eclipse.emf.cdo.protocol.util.TransportException; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDObjectFactory; +import org.eclipse.emf.cdo.common.model.CDOFeature; +import org.eclipse.emf.cdo.common.revision.CDOReferenceProxy; +import org.eclipse.emf.cdo.common.revision.CDORevision; +import org.eclipse.emf.cdo.common.util.TransportException; +import org.eclipse.emf.cdo.internal.common.revision.CDORevisionResolverImpl; +import org.eclipse.emf.cdo.spi.common.InternalCDORevision; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.emf.internal.cdo.protocol.LoadChunkRequest; @@ -28,12 +28,13 @@ import org.eclipse.emf.internal.cdo.protocol.LoadRevisionByVersionRequest; import org.eclipse.emf.internal.cdo.protocol.LoadRevisionRequest; import org.eclipse.net4j.channel.IChannel; -import org.eclipse.net4j.internal.util.om.trace.PerfTracer; import org.eclipse.net4j.signal.failover.IFailOverStrategy; import org.eclipse.net4j.util.collection.MoveableList; +import org.eclipse.net4j.util.om.trace.PerfTracer; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.List; /** @@ -218,13 +219,15 @@ public class CDORevisionManagerImpl extends CDORevisionResolverImpl implements C @Override protected InternalCDORevision loadRevision(CDOID id, int referenceChunk) { - return send(new LoadRevisionRequest(session.getChannel(), id, referenceChunk)).get(0); + return send(new LoadRevisionRequest(session.getChannel(), Collections.singleton(id), referenceChunk)).get(0); } @Override protected InternalCDORevision loadRevisionByTime(CDOID id, int referenceChunk, long timeStamp) { - return send(new LoadRevisionByTimeRequest(session.getChannel(), id, referenceChunk, timeStamp)).get(0); + return send( + new LoadRevisionByTimeRequest(session.getChannel(), Collections.singleton(id), referenceChunk, timeStamp)).get( + 0); } @Override diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSavePointImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSavePointImpl.java index 26f33cf0c3..15dbe48a68 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSavePointImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSavePointImpl.java @@ -14,10 +14,10 @@ package org.eclipse.emf.internal.cdo; import org.eclipse.emf.cdo.CDOObject; import org.eclipse.emf.cdo.CDOSavePoint; import org.eclipse.emf.cdo.CDOTransaction; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; import org.eclipse.emf.cdo.eresource.CDOResource; -import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.revision.delta.CDORevisionDelta; +import org.eclipse.emf.cdo.internal.common.revision.CDORevisionImpl; import java.util.HashMap; import java.util.Map; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionConfigurationImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionConfigurationImpl.java index fb43580311..e662974c17 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionConfigurationImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionConfigurationImpl.java @@ -125,7 +125,7 @@ public class CDOSessionConfigurationImpl implements CDOSessionConfiguration session = new CDOSessionImpl(); session.setConnector(connector); session.setRepositoryName(repositoryName); - session.setDisableLegacyObjects(!legacySupportEnabled); + session.setLegacySupportEnabled(legacySupportEnabled); session.setFailOverStrategy(failOverStrategy); session.setPackageRegistry(packageRegistry); diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionFactory.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionFactory.java index 93b7f6f849..ca4198821e 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionFactory.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionFactory.java @@ -14,14 +14,16 @@ import org.eclipse.emf.cdo.CDOSession; import org.eclipse.emf.internal.cdo.util.CDOPackageRegistryImpl; -import org.eclipse.net4j.internal.util.factory.Factory; import org.eclipse.net4j.signal.failover.IFailOverStrategy; +import org.eclipse.net4j.util.StringUtil; import org.eclipse.net4j.util.container.IManagedContainer; +import org.eclipse.net4j.util.factory.Factory; -import org.eclipse.emf.common.util.URI; - -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.HashMap; +import java.util.Map; +import java.util.StringTokenizer; /** * @author Eike Stepper @@ -32,6 +34,8 @@ public class CDOSessionFactory extends Factory public static final String TYPE = "cdo"; + private static final String TRUE = Boolean.TRUE.toString(); + public CDOSessionFactory() { super(PRODUCT_GROUP, TYPE); @@ -39,25 +43,46 @@ public class CDOSessionFactory extends Factory public CDOSession create(String description) { - return createSession(getRepositoryName(description), isDisableLegacyObjects(description), - isAutomaticPackageRegistry(description), null); - } + try + { + URI uri = new URI(description); + String query = uri.getQuery(); + if (StringUtil.isEmpty(query)) + { + throw new IllegalArgumentException("Query is empty: " + description); + } - public static String getRepositoryName(String description) - { - URI uri = URI.createURI(description); - IPath path = new Path(uri.path()); - return path.segment(0); - } + Map<String, String> result = new HashMap<String, String>(); + StringTokenizer tokenizer = new StringTokenizer(query, "&"); + while (tokenizer.hasMoreTokens()) + { + String parameter = tokenizer.nextToken(); + if (!StringUtil.isEmpty(parameter)) + { + int pos = parameter.indexOf('='); + if (pos == -1) + { + String key = parameter.trim(); + result.put(key, ""); + } + else + { + String key = parameter.substring(0, pos).trim(); + String value = parameter.substring(pos + 1); + result.put(key, value); + } + } + } - public boolean isDisableLegacyObjects(String description) - { - return description.contains("disableLegacyObjects=true"); - } - - public boolean isAutomaticPackageRegistry(String description) - { - return description.contains("automaticPackageRegistry=true"); + String repositoryName = result.get("repositoryName"); + boolean legacySupportEnabled = TRUE.equals(result.get("legacySupportEnabled")); + boolean automaticPackageRegistry = TRUE.equals(result.get("automaticPackageRegistry")); + return createSession(repositoryName, legacySupportEnabled, automaticPackageRegistry, null); + } + catch (URISyntaxException ex) + { + throw new IllegalArgumentException(ex); + } } public static CDOSession get(IManagedContainer container, String description) @@ -65,7 +90,7 @@ public class CDOSessionFactory extends Factory return (CDOSession)container.getElement(PRODUCT_GROUP, TYPE, description); } - public static CDOSessionImpl createSession(String repositoryName, boolean disableLegacyObjects, + public static CDOSessionImpl createSession(String repositoryName, boolean legacySupportEnabled, boolean automaticPackageRegistry, IFailOverStrategy failOverStrategy) { CDOSessionImpl session = new CDOSessionImpl(); @@ -77,7 +102,7 @@ public class CDOSessionFactory extends Factory } session.setRepositoryName(repositoryName); - session.setDisableLegacyObjects(disableLegacyObjects); + session.setLegacySupportEnabled(legacySupportEnabled); session.setFailOverStrategy(failOverStrategy); return session; } diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java index 40aa6a8128..fcdb5f30c9 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java @@ -14,26 +14,26 @@ package org.eclipse.emf.internal.cdo; import org.eclipse.emf.cdo.CDOSession; import org.eclipse.emf.cdo.CDOSessionInvalidationEvent; import org.eclipse.emf.cdo.CDOView; -import org.eclipse.emf.cdo.internal.protocol.id.CDOIDTempMetaImpl; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDLibraryDescriptor; -import org.eclipse.emf.cdo.protocol.id.CDOIDMetaRange; -import org.eclipse.emf.cdo.protocol.id.CDOIDObject; -import org.eclipse.emf.cdo.protocol.id.CDOIDObjectFactory; -import org.eclipse.emf.cdo.protocol.id.CDOIDTemp; -import org.eclipse.emf.cdo.protocol.id.CDOIDUtil; -import org.eclipse.emf.cdo.protocol.model.CDOClass; -import org.eclipse.emf.cdo.protocol.model.CDOClassRef; -import org.eclipse.emf.cdo.protocol.model.CDOPackage; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; -import org.eclipse.emf.cdo.protocol.util.TransportException; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDLibraryDescriptor; +import org.eclipse.emf.cdo.common.id.CDOIDMetaRange; +import org.eclipse.emf.cdo.common.id.CDOIDObject; +import org.eclipse.emf.cdo.common.id.CDOIDObjectFactory; +import org.eclipse.emf.cdo.common.id.CDOIDTemp; +import org.eclipse.emf.cdo.common.id.CDOIDUtil; +import org.eclipse.emf.cdo.common.model.CDOClass; +import org.eclipse.emf.cdo.common.model.CDOClassRef; +import org.eclipse.emf.cdo.common.model.CDOPackage; +import org.eclipse.emf.cdo.common.revision.CDORevision; +import org.eclipse.emf.cdo.common.util.TransportException; import org.eclipse.emf.cdo.util.CDOPackageRegistry; import org.eclipse.emf.cdo.util.CDOUtil; import org.eclipse.emf.cdo.util.LegacySystemNotAvailableException; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.emf.internal.cdo.protocol.CDOClientProtocol; +import org.eclipse.emf.internal.cdo.protocol.CDOFacade; import org.eclipse.emf.internal.cdo.protocol.LoadLibrariesRequest; import org.eclipse.emf.internal.cdo.protocol.OpenSessionRequest; import org.eclipse.emf.internal.cdo.protocol.OpenSessionResult; @@ -46,20 +46,20 @@ import org.eclipse.emf.internal.cdo.util.ProxyResolverURIResourceMap; import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.connector.IConnector; -import org.eclipse.net4j.internal.util.container.Container; -import org.eclipse.net4j.internal.util.event.Event; -import org.eclipse.net4j.internal.util.lifecycle.LifecycleEventAdapter; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.signal.failover.IFailOverEvent; import org.eclipse.net4j.signal.failover.IFailOverStrategy; import org.eclipse.net4j.util.ImplementationError; import org.eclipse.net4j.util.WrappedException; +import org.eclipse.net4j.util.container.Container; +import org.eclipse.net4j.util.event.Event; import org.eclipse.net4j.util.event.EventUtil; import org.eclipse.net4j.util.event.IEvent; import org.eclipse.net4j.util.event.IListener; import org.eclipse.net4j.util.io.ExtendedDataInput; import org.eclipse.net4j.util.io.IOUtil; import org.eclipse.net4j.util.lifecycle.ILifecycle; +import org.eclipse.net4j.util.lifecycle.LifecycleEventAdapter; +import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; @@ -92,10 +92,12 @@ public class CDOSessionImpl extends Container<CDOView> implements CDOSession, CD private int sessionID; - private boolean disableLegacyObjects; + private boolean legacySupportEnabled; private int referenceChunkSize; + private CDOFacade facade; + private IFailOverStrategy failOverStrategy; private IListener failOverStrategyListener = new IListener() @@ -166,25 +168,26 @@ public class CDOSessionImpl extends Container<CDOView> implements CDOSession, CD return cdoidObjectFactory.createCDOIDObject(in); } + public CDOIDObject createCDOIDObject(String in) { return cdoidObjectFactory.createCDOIDObject(in); } - public boolean isDisableLegacyObjects() + public boolean isLegacySupportEnabled() { - return disableLegacyObjects; + return legacySupportEnabled; } - public void setDisableLegacyObjects(boolean disableLegacyObjects) + public void setLegacySupportEnabled(boolean legacySupportEnabled) { checkInactive(); - if (!disableLegacyObjects && !FSMUtil.isLegacySystemAvailable()) + if (legacySupportEnabled && !FSMUtil.isLegacySystemAvailable()) { throw new LegacySystemNotAvailableException(); } - this.disableLegacyObjects = disableLegacyObjects; + this.legacySupportEnabled = legacySupportEnabled; } public int getReferenceChunkSize() @@ -202,6 +205,16 @@ public class CDOSessionImpl extends Container<CDOView> implements CDOSession, CD this.referenceChunkSize = referenceChunkSize; } + public CDOFacade getFacade() + { + return facade; + } + + public void setFacade(CDOFacade facade) + { + this.facade = facade; + } + public IFailOverStrategy getFailOverStrategy() { return failOverStrategy == null ? IFailOverStrategy.NOOP : failOverStrategy; @@ -397,7 +410,7 @@ public class CDOSessionImpl extends Container<CDOView> implements CDOSession, CD public synchronized CDOIDMetaRange getTempMetaIDRange(int count) { - CDOIDTemp lowerBound = new CDOIDTempMetaImpl(lastTempMetaID + 1); + CDOIDTemp lowerBound = CDOIDUtil.createTempMeta(lastTempMetaID + 1); lastTempMetaID += count; return CDOIDUtil.createMetaRange(lowerBound, count); } @@ -454,7 +467,7 @@ public class CDOSessionImpl extends Container<CDOView> implements CDOSession, CD public static CDOIDMetaRange registerEPackage(EPackage ePackage, int firstMetaID, Map<CDOID, InternalEObject> idToMetaInstances, Map<InternalEObject, CDOID> metaInstanceToIDs) { - CDOIDTemp lowerBound = new CDOIDTempMetaImpl(firstMetaID); + CDOIDTemp lowerBound = CDOIDUtil.createTempMeta(firstMetaID); CDOIDMetaRange range = CDOIDUtil.createMetaRange(lowerBound, 0); range = registerMetaInstance((InternalEObject)ePackage, range, idToMetaInstances, metaInstanceToIDs); return range; @@ -635,6 +648,11 @@ public class CDOSessionImpl extends Container<CDOView> implements CDOSession, CD protected void doBeforeActivate() throws Exception { super.doBeforeActivate(); + if (legacySupportEnabled && !FSMUtil.isLegacySystemAvailable()) + { + throw new LegacySystemNotAvailableException(); + } + if (channel == null && connector == null) { throw new IllegalStateException("channel == null && connector == null"); @@ -662,7 +680,7 @@ public class CDOSessionImpl extends Container<CDOView> implements CDOSession, CD channel = connector.openChannel(CDOProtocolConstants.PROTOCOL_NAME, this); } - OpenSessionRequest request = new OpenSessionRequest(channel, repositoryName, disableLegacyObjects); + OpenSessionRequest request = new OpenSessionRequest(channel, repositoryName, legacySupportEnabled); OpenSessionResult result = request.send(); sessionID = result.getSessionID(); diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionPackageManagerImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionPackageManagerImpl.java index a3021a2196..aabf68eeba 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionPackageManagerImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionPackageManagerImpl.java @@ -11,15 +11,15 @@ package org.eclipse.emf.internal.cdo; import org.eclipse.emf.cdo.CDOSessionPackageManager; -import org.eclipse.emf.cdo.internal.protocol.model.CDOPackageManagerImpl; -import org.eclipse.emf.cdo.protocol.id.CDOIDMetaRange; -import org.eclipse.emf.cdo.protocol.id.CDOIDObjectFactory; -import org.eclipse.emf.cdo.protocol.model.CDOClass; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; -import org.eclipse.emf.cdo.protocol.model.CDOModelUtil; -import org.eclipse.emf.cdo.protocol.model.CDOPackage; -import org.eclipse.emf.cdo.protocol.model.CDOPackageInfo; -import org.eclipse.emf.cdo.protocol.util.TransportException; +import org.eclipse.emf.cdo.common.id.CDOIDMetaRange; +import org.eclipse.emf.cdo.common.id.CDOIDObjectFactory; +import org.eclipse.emf.cdo.common.model.CDOClass; +import org.eclipse.emf.cdo.common.model.CDOFeature; +import org.eclipse.emf.cdo.common.model.CDOModelUtil; +import org.eclipse.emf.cdo.common.model.CDOPackage; +import org.eclipse.emf.cdo.common.model.CDOPackageInfo; +import org.eclipse.emf.cdo.common.util.TransportException; +import org.eclipse.emf.cdo.internal.common.model.CDOPackageManagerImpl; import org.eclipse.emf.cdo.util.EMFUtil; import org.eclipse.emf.internal.cdo.bundle.OM; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java index 9e48cd4928..19a332a812 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java @@ -16,15 +16,15 @@ import org.eclipse.emf.cdo.CDORevisionManager; import org.eclipse.emf.cdo.CDOSession; import org.eclipse.emf.cdo.CDOState; import org.eclipse.emf.cdo.CDOView; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDTemp; +import org.eclipse.emf.cdo.common.model.CDOClass; +import org.eclipse.emf.cdo.common.revision.CDORevision; +import org.eclipse.emf.cdo.common.revision.CDORevisionUtil; +import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta; +import org.eclipse.emf.cdo.common.util.TransportException; import org.eclipse.emf.cdo.eresource.CDOResource; -import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDTemp; -import org.eclipse.emf.cdo.protocol.model.CDOClass; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; -import org.eclipse.emf.cdo.protocol.revision.CDORevisionUtil; -import org.eclipse.emf.cdo.protocol.revision.delta.CDOFeatureDelta; -import org.eclipse.emf.cdo.protocol.util.TransportException; +import org.eclipse.emf.cdo.spi.common.InternalCDORevision; import org.eclipse.emf.cdo.util.CDOUtil; import org.eclipse.emf.cdo.util.ServerException; @@ -35,10 +35,10 @@ import org.eclipse.emf.internal.cdo.protocol.VerifyRevisionRequest; import org.eclipse.emf.internal.cdo.util.FSMUtil; import org.eclipse.net4j.channel.IChannel; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.signal.failover.IFailOverStrategy; import org.eclipse.net4j.util.fsm.FiniteStateMachine; import org.eclipse.net4j.util.fsm.ITransition; +import org.eclipse.net4j.util.om.trace.ContextTracer; import java.text.MessageFormat; import java.util.ArrayList; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java index 38473288f7..440e04c515 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java @@ -11,27 +11,27 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo; -import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; -import org.eclipse.emf.cdo.internal.protocol.revision.delta.CDOAddFeatureDeltaImpl; -import org.eclipse.emf.cdo.internal.protocol.revision.delta.CDOClearFeatureDeltaImpl; -import org.eclipse.emf.cdo.internal.protocol.revision.delta.CDOContainerFeatureDeltaImpl; -import org.eclipse.emf.cdo.internal.protocol.revision.delta.CDOMoveFeatureDeltaImpl; -import org.eclipse.emf.cdo.internal.protocol.revision.delta.CDORemoveFeatureDeltaImpl; -import org.eclipse.emf.cdo.internal.protocol.revision.delta.CDOSetFeatureDeltaImpl; -import org.eclipse.emf.cdo.internal.protocol.revision.delta.CDOUnsetFeatureDeltaImpl; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; -import org.eclipse.emf.cdo.protocol.model.CDOType; -import org.eclipse.emf.cdo.protocol.revision.CDOReferenceProxy; -import org.eclipse.emf.cdo.protocol.revision.delta.CDOFeatureDelta; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.model.CDOFeature; +import org.eclipse.emf.cdo.common.model.CDOType; +import org.eclipse.emf.cdo.common.revision.CDOReferenceProxy; +import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta; +import org.eclipse.emf.cdo.internal.common.revision.delta.CDOAddFeatureDeltaImpl; +import org.eclipse.emf.cdo.internal.common.revision.delta.CDOClearFeatureDeltaImpl; +import org.eclipse.emf.cdo.internal.common.revision.delta.CDOContainerFeatureDeltaImpl; +import org.eclipse.emf.cdo.internal.common.revision.delta.CDOMoveFeatureDeltaImpl; +import org.eclipse.emf.cdo.internal.common.revision.delta.CDORemoveFeatureDeltaImpl; +import org.eclipse.emf.cdo.internal.common.revision.delta.CDOSetFeatureDeltaImpl; +import org.eclipse.emf.cdo.internal.common.revision.delta.CDOUnsetFeatureDeltaImpl; +import org.eclipse.emf.cdo.spi.common.InternalCDORevision; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.emf.internal.cdo.util.FSMUtil; import org.eclipse.emf.internal.cdo.util.GenUtil; import org.eclipse.emf.internal.cdo.util.ModelUtil; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.collection.MoveableList; +import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java index b498c60cb9..6e1cff523f 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java @@ -21,20 +21,20 @@ import org.eclipse.emf.cdo.CDOTransactionConflictEvent; import org.eclipse.emf.cdo.CDOTransactionFinishedEvent; import org.eclipse.emf.cdo.CDOTransactionHandler; import org.eclipse.emf.cdo.CDOTransactionStartedEvent; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDTemp; +import org.eclipse.emf.cdo.common.id.CDOIDUtil; +import org.eclipse.emf.cdo.common.model.CDOPackage; +import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta; +import org.eclipse.emf.cdo.common.revision.delta.CDOListFeatureDelta; +import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; +import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDeltaUtil; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl; -import org.eclipse.emf.cdo.internal.protocol.model.InternalCDOPackage; -import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl; -import org.eclipse.emf.cdo.internal.protocol.revision.delta.CDORevisionDeltaImpl; -import org.eclipse.emf.cdo.internal.protocol.revision.delta.InternalCDORevisionDelta; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDTemp; -import org.eclipse.emf.cdo.protocol.id.CDOIDUtil; -import org.eclipse.emf.cdo.protocol.model.CDOPackage; -import org.eclipse.emf.cdo.protocol.revision.delta.CDOFeatureDelta; -import org.eclipse.emf.cdo.protocol.revision.delta.CDOListFeatureDelta; -import org.eclipse.emf.cdo.protocol.revision.delta.CDORevisionDelta; -import org.eclipse.emf.cdo.protocol.revision.delta.CDORevisionDeltaUtil; +import org.eclipse.emf.cdo.internal.common.revision.CDORevisionImpl; +import org.eclipse.emf.cdo.internal.common.revision.delta.CDORevisionDeltaImpl; +import org.eclipse.emf.cdo.spi.common.InternalCDOPackage; +import org.eclipse.emf.cdo.spi.common.InternalCDORevisionDelta; import org.eclipse.emf.cdo.util.CDOUtil; import org.eclipse.emf.internal.cdo.bundle.OM; @@ -43,11 +43,11 @@ import org.eclipse.emf.internal.cdo.protocol.CommitTransactionResult; import org.eclipse.emf.internal.cdo.util.ModelUtil; import org.eclipse.net4j.channel.IChannel; -import org.eclipse.net4j.internal.util.event.Notifier; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.signal.failover.IFailOverStrategy; import org.eclipse.net4j.util.ImplementationError; import org.eclipse.net4j.util.collection.MultiMap; +import org.eclipse.net4j.util.event.Notifier; +import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.net4j.util.transaction.TransactionException; import org.eclipse.emf.common.util.URI; @@ -163,7 +163,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements CDOTransaction public CDOIDTemp getNextTemporaryID() { - return CDOIDUtil.createCDOIDTempObject(++lastTemporaryID); + return CDOIDUtil.createTempObject(++lastTemporaryID); } public CDOResource createResource(String path) diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java index 86e3e13010..3b7e97209b 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java @@ -20,18 +20,18 @@ import org.eclipse.emf.cdo.CDOView; import org.eclipse.emf.cdo.CDOViewEvent; import org.eclipse.emf.cdo.CDOViewResourcesEvent; import org.eclipse.emf.cdo.analyzer.CDOFeatureAnalyzer; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDMeta; +import org.eclipse.emf.cdo.common.id.CDOIDObject; +import org.eclipse.emf.cdo.common.id.CDOIDProvider; +import org.eclipse.emf.cdo.common.model.CDOClass; +import org.eclipse.emf.cdo.common.model.CDOClassRef; +import org.eclipse.emf.cdo.common.revision.CDORevisionResolver; +import org.eclipse.emf.cdo.common.util.TransportException; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.eresource.EresourceFactory; import org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl; -import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDMeta; -import org.eclipse.emf.cdo.protocol.id.CDOIDObject; -import org.eclipse.emf.cdo.protocol.id.CDOIDProvider; -import org.eclipse.emf.cdo.protocol.model.CDOClass; -import org.eclipse.emf.cdo.protocol.model.CDOClassRef; -import org.eclipse.emf.cdo.protocol.revision.CDORevisionResolver; -import org.eclipse.emf.cdo.protocol.util.TransportException; +import org.eclipse.emf.cdo.spi.common.InternalCDORevision; import org.eclipse.emf.cdo.util.CDOUtil; import org.eclipse.emf.cdo.util.ReadOnlyException; @@ -41,9 +41,9 @@ import org.eclipse.emf.internal.cdo.protocol.ResourcePathRequest; import org.eclipse.emf.internal.cdo.util.FSMUtil; import org.eclipse.emf.internal.cdo.util.ModelUtil; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.signal.failover.IFailOverStrategy; import org.eclipse.net4j.util.ImplementationError; +import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.net4j.util.ref.ReferenceValueMap; import org.eclipse.net4j.util.transaction.TransactionException; @@ -69,7 +69,7 @@ import java.util.concurrent.ConcurrentMap; /** * @author Eike Stepper */ -public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier implements CDOView, CDOIDProvider, +public class CDOViewImpl extends org.eclipse.net4j.util.event.Notifier implements CDOView, CDOIDProvider, Adapter.Internal { private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_VIEW, CDOViewImpl.class); @@ -80,7 +80,9 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier private ResourceSet resourceSet; - private boolean enableInvalidationNotifications; + private boolean uniqueResourceContents = true; + + private boolean invalidationNotificationsEnabled; private int loadRevisionCollectionChunkSize; @@ -98,7 +100,7 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier { viewID = id; this.session = session; - enableInvalidationNotifications = OM.PREF_ENABLE_INVALIDATION_NOTIFICATIONS.getValue(); + invalidationNotificationsEnabled = OM.PREF_ENABLE_INVALIDATION_NOTIFICATIONS.getValue(); loadRevisionCollectionChunkSize = OM.PREF_LOAD_REVISION_COLLECTION_CHUNK_SIZE.getValue(); objects = createObjectsMap(); } @@ -143,14 +145,24 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier return false; } - public boolean isEnableInvalidationNotifications() + public boolean hasUniqueResourceContents() + { + return uniqueResourceContents; + } + + public void setUniqueResourceContents(boolean uniqueResourceContents) + { + this.uniqueResourceContents = uniqueResourceContents; + } + + public boolean isInvalidationNotificationsEnabled() { - return enableInvalidationNotifications; + return invalidationNotificationsEnabled; } - public void setEnableInvalidationNotifications(boolean on) + public void setInvalidationNotificationsEnabled(boolean invalidationNotificationsEnabled) { - enableInvalidationNotifications = on; + this.invalidationNotificationsEnabled = invalidationNotificationsEnabled; } public int getLoadRevisionCollectionChunkSize() @@ -575,7 +587,7 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier */ public void notifyInvalidation(long timeStamp, Set<CDOID> dirtyOIDs) { - List<InternalCDOObject> dirtyObjects = enableInvalidationNotifications ? new ArrayList<InternalCDOObject>() : null; + List<InternalCDOObject> dirtyObjects = invalidationNotificationsEnabled ? new ArrayList<InternalCDOObject>() : null; for (CDOID dirtyOID : dirtyOIDs) { InternalCDOObject dirtyObject; @@ -811,7 +823,7 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier /** * @author Eike Stepper */ - protected abstract class Event extends org.eclipse.net4j.internal.util.event.Event implements CDOViewEvent + protected abstract class Event extends org.eclipse.net4j.util.event.Event implements CDOViewEvent { private static final long serialVersionUID = 1L; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOWrapperImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOWrapperImpl.java index 9700ea4ed7..3c324a14e0 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOWrapperImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOWrapperImpl.java @@ -11,11 +11,11 @@ package org.eclipse.emf.internal.cdo; import org.eclipse.emf.cdo.CDOView; -import org.eclipse.emf.cdo.protocol.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.internal.cdo.bundle.OM; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; +import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notification; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOObject.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOObject.java index b9fb47d7d9..2f979f8283 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOObject.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOObject.java @@ -13,9 +13,9 @@ package org.eclipse.emf.internal.cdo; import org.eclipse.emf.cdo.CDOObject; import org.eclipse.emf.cdo.CDOState; import org.eclipse.emf.cdo.CDOView; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.eresource.CDOResource; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/LegacyObjectDisabler.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/LegacySupportEnabler.java index e4f2258484..1a6dd32c85 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/LegacyObjectDisabler.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/LegacySupportEnabler.java @@ -16,16 +16,16 @@ import org.eclipse.net4j.util.container.IManagedContainer; /** * @author Eike Stepper */ -public class LegacyObjectDisabler implements IElementProcessor +public class LegacySupportEnabler implements IElementProcessor { - private boolean disableLegacyObjects; + private boolean legacySupportEnabled; - public LegacyObjectDisabler(boolean disableLegacyObjects) + public LegacySupportEnabler(boolean legacySupportEnabled) { - this.disableLegacyObjects = disableLegacyObjects; + this.legacySupportEnabled = legacySupportEnabled; } - public LegacyObjectDisabler() + public LegacySupportEnabler() { this(true); } @@ -36,7 +36,7 @@ public class LegacyObjectDisabler implements IElementProcessor if (element instanceof CDOSessionImpl) { CDOSessionImpl session = (CDOSessionImpl)element; - session.setDisableLegacyObjects(disableLegacyObjects); + session.setLegacySupportEnabled(legacySupportEnabled); } return element; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOAbstractFeatureRuleAnalyzer.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOAbstractFeatureRuleAnalyzer.java index 88193d0d84..01dc7c8721 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOAbstractFeatureRuleAnalyzer.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOAbstractFeatureRuleAnalyzer.java @@ -13,12 +13,12 @@ package org.eclipse.emf.internal.cdo.analyzer; import org.eclipse.emf.cdo.analyzer.CDOFeatureAnalyzer; import org.eclipse.emf.cdo.analyzer.CDOFetchRuleManager; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; +import org.eclipse.emf.cdo.common.model.CDOFeature; import org.eclipse.emf.internal.cdo.InternalCDOObject; import org.eclipse.emf.internal.cdo.bundle.OM; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; +import org.eclipse.net4j.util.om.trace.ContextTracer; /** * @author Simon McDuff diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOAnalyzerFeatureInfo.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOAnalyzerFeatureInfo.java index b26115a214..f662e84468 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOAnalyzerFeatureInfo.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOAnalyzerFeatureInfo.java @@ -12,13 +12,13 @@ package org.eclipse.emf.internal.cdo.analyzer; -import org.eclipse.emf.cdo.protocol.analyzer.CDOFetchRule; -import org.eclipse.emf.cdo.protocol.model.CDOClass; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; +import org.eclipse.emf.cdo.common.analyzer.CDOFetchRule; +import org.eclipse.emf.cdo.common.model.CDOClass; +import org.eclipse.emf.cdo.common.model.CDOFeature; import org.eclipse.emf.internal.cdo.bundle.OM; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; +import org.eclipse.net4j.util.om.trace.ContextTracer; import java.util.Collection; import java.util.HashMap; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOClusterOfFetchRule.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOClusterOfFetchRule.java index 9011e09acf..59462a6cd7 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOClusterOfFetchRule.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOClusterOfFetchRule.java @@ -11,8 +11,8 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.analyzer; -import org.eclipse.emf.cdo.protocol.model.CDOClass; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; +import org.eclipse.emf.cdo.common.model.CDOClass; +import org.eclipse.emf.cdo.common.model.CDOFeature; /** * @author Simon McDuff diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerModelBased.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerModelBased.java index 1fe8659866..bc7a2e7e47 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerModelBased.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerModelBased.java @@ -11,9 +11,9 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.analyzer; -import org.eclipse.emf.cdo.protocol.analyzer.CDOFetchRule; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; +import org.eclipse.emf.cdo.common.analyzer.CDOFetchRule; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.model.CDOFeature; import org.eclipse.emf.internal.cdo.InternalCDOObject; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerUI.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerUI.java index 42b9dfa78e..60c748b74a 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerUI.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerUI.java @@ -11,10 +11,10 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.analyzer; -import org.eclipse.emf.cdo.protocol.analyzer.CDOFetchRule; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.model.CDOClass; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; +import org.eclipse.emf.cdo.common.analyzer.CDOFetchRule; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.model.CDOClass; +import org.eclipse.emf.cdo.common.model.CDOFeature; import org.eclipse.emf.internal.cdo.InternalCDOObject; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFetchFeatureInfo.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFetchFeatureInfo.java index 783d057bf4..5baab026a6 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFetchFeatureInfo.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFetchFeatureInfo.java @@ -11,8 +11,8 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.analyzer; -import org.eclipse.emf.cdo.protocol.model.CDOClass; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; +import org.eclipse.emf.cdo.common.model.CDOClass; +import org.eclipse.emf.cdo.common.model.CDOFeature; /** * @author Simon McDuff diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFetchRuleManagerThreadLocal.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFetchRuleManagerThreadLocal.java index 620e2dfac6..ffa27a5840 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFetchRuleManagerThreadLocal.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFetchRuleManagerThreadLocal.java @@ -12,8 +12,8 @@ package org.eclipse.emf.internal.cdo.analyzer; import org.eclipse.emf.cdo.analyzer.CDOFetchRuleManager; -import org.eclipse.emf.cdo.protocol.analyzer.CDOFetchRule; -import org.eclipse.emf.cdo.protocol.id.CDOID; +import org.eclipse.emf.cdo.common.analyzer.CDOFetchRule; +import org.eclipse.emf.cdo.common.id.CDOID; import java.util.Collection; import java.util.List; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/NOOPFeatureAnalyzer.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/NOOPFeatureAnalyzer.java index 9a8b33255e..9cc4dc9829 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/NOOPFeatureAnalyzer.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/NOOPFeatureAnalyzer.java @@ -12,7 +12,7 @@ package org.eclipse.emf.internal.cdo.analyzer; import org.eclipse.emf.cdo.analyzer.CDOFeatureAnalyzer; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; +import org.eclipse.emf.cdo.common.model.CDOFeature; import org.eclipse.emf.internal.cdo.InternalCDOObject; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/NOOPFetchRuleManager.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/NOOPFetchRuleManager.java index f2865304c4..2a6cf7e882 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/NOOPFetchRuleManager.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/NOOPFetchRuleManager.java @@ -12,8 +12,8 @@ package org.eclipse.emf.internal.cdo.analyzer; import org.eclipse.emf.cdo.analyzer.CDOFetchRuleManager; -import org.eclipse.emf.cdo.protocol.analyzer.CDOFetchRule; -import org.eclipse.emf.cdo.protocol.id.CDOID; +import org.eclipse.emf.cdo.common.analyzer.CDOFetchRule; +import org.eclipse.emf.cdo.common.id.CDOID; import java.util.Collection; import java.util.List; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/Activator.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/Activator.java index f5e80c4cab..2e7bcb590c 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/Activator.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/Activator.java @@ -10,7 +10,6 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.bundle; -import org.eclipse.net4j.internal.util.om.OSGiBundle; import org.eclipse.net4j.util.om.OSGiActivator; import org.eclipse.emf.common.EMFPlugin; @@ -58,14 +57,14 @@ public final class Activator extends EMFPlugin public void start(BundleContext context) throws Exception { super.start(context); - OSGiActivator.startBundle(context, (OSGiBundle)OM.BUNDLE); + OSGiActivator.startBundle(context, OM.BUNDLE); } @Override public void stop(BundleContext context) throws Exception { plugin = null; - OSGiActivator.stopBundle(context, (OSGiBundle)OM.BUNDLE); + OSGiActivator.stopBundle(context, OM.BUNDLE); super.stop(context); } } diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/OM.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/OM.java index 84350c3390..25a4215669 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/OM.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/OM.java @@ -12,7 +12,7 @@ package org.eclipse.emf.internal.cdo.bundle; import org.eclipse.emf.cdo.CDOTransaction; import org.eclipse.emf.cdo.CDOView; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; +import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.net4j.util.om.OMBundle; import org.eclipse.net4j.util.om.OMPlatform; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientProtocol.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientProtocol.java index 7ac5690400..d74712702e 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientProtocol.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientProtocol.java @@ -11,8 +11,8 @@ package org.eclipse.emf.internal.cdo.protocol; import org.eclipse.emf.cdo.CDOSession; -import org.eclipse.emf.cdo.internal.protocol.CDOProtocolImpl; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.emf.cdo.internal.common.CDOProtocolImpl; import org.eclipse.net4j.signal.SignalReactor; @@ -32,7 +32,7 @@ public class CDOClientProtocol extends CDOProtocolImpl } @Override - protected SignalReactor doCreateSignalReactor(short signalID) + protected SignalReactor createSignalReactor(short signalID) { switch (signalID) { diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientProtocolFactory.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientProtocolFactory.java index ff79bfbc3a..1ecf69f19c 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientProtocolFactory.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientProtocolFactory.java @@ -10,12 +10,11 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.protocol; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.net4j.protocol.ClientProtocolFactory; import org.eclipse.net4j.util.container.IManagedContainer; -import org.eclipse.internal.net4j.protocol.ClientProtocolFactory; - /** * @author Eike Stepper */ diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientRequest.java index 18ab382e7e..c48ce26244 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientRequest.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.protocol; -import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionResolverImpl; +import org.eclipse.emf.cdo.internal.common.revision.CDORevisionResolverImpl; import org.eclipse.emf.internal.cdo.CDOSessionImpl; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOFacade.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOFacade.java new file mode 100644 index 0000000000..3d4bf56813 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOFacade.java @@ -0,0 +1,69 @@ +/*************************************************************************** + * Copyright (c) 2004 - 2008 Eike Stepper, Germany. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation + **************************************************************************/ +package org.eclipse.emf.internal.cdo.protocol; + +import org.eclipse.emf.cdo.CDOSession; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.model.CDOClassRef; +import org.eclipse.emf.cdo.common.model.CDOFeature; +import org.eclipse.emf.cdo.common.model.CDOPackage; +import org.eclipse.emf.cdo.spi.common.InternalCDORevision; + +import org.eclipse.emf.internal.cdo.CDOTransactionImpl; + +import java.io.File; +import java.util.Collection; +import java.util.List; + +/** + * Provisional in preparation for 2.0.0 + * + * @author Eike Stepper + */ +public interface CDOFacade +{ + public OpenSessionResult openSession(String repositoryName, boolean legacySupportEnabled, + RemoteInvalidationHandler remoteInvalidationHandler); + + public int loadLibraries(Collection<String> libraryNames, File cacheFolder); + + public boolean viewsChanged(int viewID, byte kind); + + public CDOID resourceID(String path); + + public String resourcePath(CDOID id); + + public void loadPackage(CDOPackage cdoPackage); + + public List<InternalCDORevision> loadRevision(Collection<CDOID> ids, int referenceChunk); + + public List<InternalCDORevision> loadRevisionByTime(Collection<CDOID> ids, int referenceChunk, long timeStamp); + + public List<InternalCDORevision> loadRevisionByVersion(); + + public List<InternalCDORevision> verifyRevision(Collection<InternalCDORevision> revisions); + + public CDOID loadChunk(InternalCDORevision revision, CDOFeature feature, int accessIndex, int fromIndex, int toIndex); + + public CDOClassRef[] queryObjectTypes(List<CDOID> ids); + + public CommitTransactionResult commitTransaction(CDOTransactionImpl transaction); + + public void closeSession(CDOSession session); + + /** + * @author Eike Stepper + */ + public interface RemoteInvalidationHandler + { + public void handleRemoteInvalidation(); + } +} diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java index d58c75dc9a..41bdc81af8 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java @@ -13,18 +13,18 @@ package org.eclipse.emf.internal.cdo.protocol; import org.eclipse.emf.cdo.CDOObject; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDMetaRange; +import org.eclipse.emf.cdo.common.id.CDOIDTemp; +import org.eclipse.emf.cdo.common.id.CDOIDUtil; +import org.eclipse.emf.cdo.common.model.CDOModelUtil; +import org.eclipse.emf.cdo.common.model.CDOPackage; +import org.eclipse.emf.cdo.common.revision.CDORevision; +import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; import org.eclipse.emf.cdo.eresource.CDOResource; -import org.eclipse.emf.cdo.internal.protocol.model.InternalCDOPackage; -import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDMetaRange; -import org.eclipse.emf.cdo.protocol.id.CDOIDTemp; -import org.eclipse.emf.cdo.protocol.id.CDOIDUtil; -import org.eclipse.emf.cdo.protocol.model.CDOModelUtil; -import org.eclipse.emf.cdo.protocol.model.CDOPackage; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; -import org.eclipse.emf.cdo.protocol.revision.delta.CDORevisionDelta; +import org.eclipse.emf.cdo.spi.common.InternalCDOPackage; +import org.eclipse.emf.cdo.spi.common.InternalCDORevision; import org.eclipse.emf.internal.cdo.CDOSessionImpl; import org.eclipse.emf.internal.cdo.CDOTransactionImpl; @@ -32,9 +32,9 @@ import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.emf.internal.cdo.util.RevisionAdjuster; import org.eclipse.net4j.channel.IChannel; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; +import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; import java.util.Collection; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionResult.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionResult.java index fe75980cd2..eeea6bf8e1 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionResult.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionResult.java @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.protocol; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDTemp; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDTemp; import java.util.HashMap; import java.util.Map; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/InvalidationIndication.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/InvalidationIndication.java index 209597524f..a44290171d 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/InvalidationIndication.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/InvalidationIndication.java @@ -10,16 +10,16 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.protocol; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDUtil; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDUtil; import org.eclipse.emf.internal.cdo.CDOSessionImpl; import org.eclipse.emf.internal.cdo.bundle.OM; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.signal.Indication; import org.eclipse.net4j.util.io.ExtendedDataInputStream; +import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; import java.util.HashSet; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadChunkRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadChunkRequest.java index 6d26121f26..ded1c4104c 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadChunkRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadChunkRequest.java @@ -10,22 +10,22 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.protocol; -import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDUtil; -import org.eclipse.emf.cdo.protocol.model.CDOClassRef; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; -import org.eclipse.emf.cdo.protocol.model.CDOModelUtil; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDUtil; +import org.eclipse.emf.cdo.common.model.CDOClassRef; +import org.eclipse.emf.cdo.common.model.CDOFeature; +import org.eclipse.emf.cdo.common.model.CDOModelUtil; +import org.eclipse.emf.cdo.spi.common.InternalCDORevision; import org.eclipse.emf.internal.cdo.CDOSessionImpl; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.net4j.channel.IChannel; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.collection.MoveableList; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; +import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadLibrariesRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadLibrariesRequest.java index 320d3fc1ee..58ff8009d2 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadLibrariesRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadLibrariesRequest.java @@ -10,16 +10,16 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.protocol; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.net4j.channel.IChannel; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; import org.eclipse.net4j.util.io.IOUtil; +import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.File; import java.io.FileOutputStream; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadPackageRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadPackageRequest.java index 2dbb00e051..6270d2796b 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadPackageRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadPackageRequest.java @@ -10,9 +10,9 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.protocol; -import org.eclipse.emf.cdo.internal.protocol.model.InternalCDOPackage; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.protocol.model.CDOPackage; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.model.CDOPackage; +import org.eclipse.emf.cdo.spi.common.InternalCDOPackage; import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.util.io.ExtendedDataInputStream; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionByTimeRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionByTimeRequest.java index 95b45cd321..7f43a63b7f 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionByTimeRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionByTimeRequest.java @@ -10,19 +10,18 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.protocol; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.protocol.id.CDOID; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.net4j.channel.IChannel; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; +import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; import java.text.MessageFormat; import java.util.Collection; -import java.util.Collections; /** * @author Eike Stepper @@ -39,11 +38,6 @@ public class LoadRevisionByTimeRequest extends LoadRevisionRequest this.timeStamp = timeStamp; } - public LoadRevisionByTimeRequest(IChannel channel, CDOID id, int referenceChunk, long timeStamp) - { - this(channel, Collections.singleton(id), referenceChunk, timeStamp); - } - @Override protected short getSignalID() { diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionByVersionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionByVersionRequest.java index f6ac5f0c95..5749378949 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionByVersionRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionByVersionRequest.java @@ -10,17 +10,18 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.protocol; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.protocol.id.CDOID; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.net4j.channel.IChannel; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; +import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; import java.text.MessageFormat; +import java.util.Collections; /** * @author Eike Stepper @@ -33,7 +34,7 @@ public class LoadRevisionByVersionRequest extends LoadRevisionRequest public LoadRevisionByVersionRequest(IChannel channel, CDOID id, int referenceChunk, int version) { - super(channel, id, referenceChunk); + super(channel, Collections.singleton(id), referenceChunk); this.version = version; } diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionRequest.java index b92a89ceed..c2ba7d938e 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionRequest.java @@ -11,12 +11,12 @@ package org.eclipse.emf.internal.cdo.protocol; import org.eclipse.emf.cdo.analyzer.CDOFetchRuleManager; -import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.protocol.analyzer.CDOFetchRule; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDUtil; -import org.eclipse.emf.cdo.protocol.revision.CDORevisionUtil; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.analyzer.CDOFetchRule; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDUtil; +import org.eclipse.emf.cdo.common.revision.CDORevisionUtil; +import org.eclipse.emf.cdo.spi.common.InternalCDORevision; import org.eclipse.emf.internal.cdo.CDORevisionManagerImpl; import org.eclipse.emf.internal.cdo.CDOSessionImpl; @@ -24,15 +24,14 @@ import org.eclipse.emf.internal.cdo.CDOSessionPackageManagerImpl; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.net4j.channel.IChannel; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; +import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; import java.text.MessageFormat; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.List; /** @@ -53,11 +52,6 @@ public class LoadRevisionRequest extends CDOClientRequest<List<InternalCDORevisi this.referenceChunk = referenceChunk; } - public LoadRevisionRequest(IChannel channel, CDOID id, int referenceChunk) - { - this(channel, Collections.singleton(id), referenceChunk); - } - @Override protected short getSignalID() { diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionRequest.java index c8c5c24765..a980178055 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionRequest.java @@ -10,19 +10,19 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.protocol; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.protocol.id.CDOIDLibraryDescriptor; -import org.eclipse.emf.cdo.protocol.id.CDOIDMetaRange; -import org.eclipse.emf.cdo.protocol.id.CDOIDUtil; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.id.CDOIDLibraryDescriptor; +import org.eclipse.emf.cdo.common.id.CDOIDMetaRange; +import org.eclipse.emf.cdo.common.id.CDOIDUtil; import org.eclipse.emf.cdo.util.ServerException; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.net4j.channel.IChannel; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; +import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; import java.text.MessageFormat; @@ -36,13 +36,13 @@ public class OpenSessionRequest extends RequestWithConfirmation<OpenSessionResul private String repositoryName; - private boolean disableLegacyObjects; + private boolean legacySupportEnabled; - public OpenSessionRequest(IChannel channel, String repositoryName, boolean disableLegacyObjects) + public OpenSessionRequest(IChannel channel, String repositoryName, boolean legacySupportEnabled) { super(channel); this.repositoryName = repositoryName; - this.disableLegacyObjects = disableLegacyObjects; + this.legacySupportEnabled = legacySupportEnabled; } @Override @@ -62,9 +62,9 @@ public class OpenSessionRequest extends RequestWithConfirmation<OpenSessionResul if (PROTOCOL.isEnabled()) { - PROTOCOL.format("Writing disableLegacyObjects: {0}", disableLegacyObjects); + PROTOCOL.format("Writing legacySupportEnabled: {0}", legacySupportEnabled); } - out.writeBoolean(disableLegacyObjects); + out.writeBoolean(legacySupportEnabled); } @Override diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionResult.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionResult.java index 4f5a48b010..cafe3a25d7 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionResult.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionResult.java @@ -10,9 +10,9 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.protocol; -import org.eclipse.emf.cdo.protocol.id.CDOIDLibraryDescriptor; -import org.eclipse.emf.cdo.protocol.id.CDOIDMetaRange; -import org.eclipse.emf.cdo.protocol.model.CDOPackageInfo; +import org.eclipse.emf.cdo.common.id.CDOIDLibraryDescriptor; +import org.eclipse.emf.cdo.common.id.CDOIDMetaRange; +import org.eclipse.emf.cdo.common.model.CDOPackageInfo; import java.util.ArrayList; import java.util.List; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/QueryObjectTypesRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/QueryObjectTypesRequest.java index aeb14508fd..6f6c7ad65e 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/QueryObjectTypesRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/QueryObjectTypesRequest.java @@ -10,18 +10,18 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.protocol; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDUtil; -import org.eclipse.emf.cdo.protocol.model.CDOClassRef; -import org.eclipse.emf.cdo.protocol.model.CDOModelUtil; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDUtil; +import org.eclipse.emf.cdo.common.model.CDOClassRef; +import org.eclipse.emf.cdo.common.model.CDOModelUtil; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.net4j.channel.IChannel; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; +import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; import java.util.List; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourceIDRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourceIDRequest.java index ae7b6b4e4e..ac56cfa44b 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourceIDRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourceIDRequest.java @@ -10,16 +10,16 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.protocol; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDUtil; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDUtil; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.net4j.channel.IChannel; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; +import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourcePathRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourcePathRequest.java index 589d7db139..8813bc3c64 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourcePathRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourcePathRequest.java @@ -10,16 +10,16 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.protocol; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDUtil; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDUtil; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.net4j.channel.IChannel; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; +import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/VerifyRevisionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/VerifyRevisionRequest.java index 7506fe2fc1..fce5fd983d 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/VerifyRevisionRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/VerifyRevisionRequest.java @@ -10,18 +10,18 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.protocol; -import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDUtil; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDUtil; +import org.eclipse.emf.cdo.common.revision.CDORevision; +import org.eclipse.emf.cdo.spi.common.InternalCDORevision; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.net4j.channel.IChannel; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; +import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; import java.util.ArrayList; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ViewsChangedRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ViewsChangedRequest.java index 61de48e582..c193fb713e 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ViewsChangedRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ViewsChangedRequest.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.protocol; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.util.io.ExtendedDataInputStream; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageRegistryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageRegistryImpl.java index 0c68ca6afc..026fc663e7 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageRegistryImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageRegistryImpl.java @@ -15,10 +15,10 @@ import org.eclipse.emf.cdo.CDOSession; import org.eclipse.emf.cdo.CDOTransaction; import org.eclipse.emf.cdo.CDOTransactionHandler; import org.eclipse.emf.cdo.CDOView; -import org.eclipse.emf.cdo.internal.protocol.model.InternalCDOPackage; -import org.eclipse.emf.cdo.protocol.id.CDOIDMetaRange; -import org.eclipse.emf.cdo.protocol.model.CDOPackage; -import org.eclipse.emf.cdo.protocol.revision.delta.CDOFeatureDelta; +import org.eclipse.emf.cdo.common.id.CDOIDMetaRange; +import org.eclipse.emf.cdo.common.model.CDOPackage; +import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta; +import org.eclipse.emf.cdo.spi.common.InternalCDOPackage; import org.eclipse.emf.cdo.util.CDOPackageRegistry; import org.eclipse.emf.cdo.util.CDOPackageType; import org.eclipse.emf.cdo.util.CDOPackageTypeRegistry; @@ -27,12 +27,12 @@ import org.eclipse.emf.cdo.util.EMFUtil; import org.eclipse.emf.internal.cdo.CDOSessionImpl; import org.eclipse.emf.internal.cdo.bundle.OM; -import org.eclipse.net4j.internal.util.container.ContainerEventAdapter; -import org.eclipse.net4j.internal.util.lifecycle.LifecycleEventAdapter; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; +import org.eclipse.net4j.util.container.ContainerEventAdapter; import org.eclipse.net4j.util.container.IContainer; import org.eclipse.net4j.util.event.IListener; import org.eclipse.net4j.util.lifecycle.ILifecycle; +import org.eclipse.net4j.util.lifecycle.LifecycleEventAdapter; +import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EFactory; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageTypeRegistryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageTypeRegistryImpl.java index cce0af503f..ebf97c3f1e 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageTypeRegistryImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageTypeRegistryImpl.java @@ -18,9 +18,9 @@ import org.eclipse.emf.cdo.util.CDOUtil; import org.eclipse.emf.internal.cdo.bundle.OM; -import org.eclipse.net4j.internal.util.registry.HashMapRegistry; import org.eclipse.net4j.util.StringUtil; import org.eclipse.net4j.util.om.OMPlatform; +import org.eclipse.net4j.util.registry.HashMapRegistry; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EClassifier; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ChannelInjector.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ChannelInjector.java index f958675102..c5b8c154b6 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ChannelInjector.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ChannelInjector.java @@ -17,15 +17,15 @@ import org.eclipse.net4j.util.StringUtil; import org.eclipse.net4j.util.container.IElementProcessor; import org.eclipse.net4j.util.container.IManagedContainer; -import org.eclipse.internal.net4j.connector.ConnectorFactory; - -import org.eclipse.emf.common.util.URI; +import org.eclipse.spi.net4j.ConnectorFactory; /** * @author Eike Stepper */ public class ChannelInjector implements IElementProcessor { + private static final String SCHEME_SEPARATOR = "://"; + public ChannelInjector() { } @@ -47,17 +47,28 @@ public class ChannelInjector implements IElementProcessor protected IConnector getConnector(IManagedContainer container, String description) { - URI uri = URI.createURI(description); - String factoryType = uri.scheme(); + int pos = description.indexOf(SCHEME_SEPARATOR); + if (pos == -1) + { + throw new IllegalArgumentException("Invalid URI: " + description); + } + + String factoryType = description.substring(0, pos); if (StringUtil.isEmpty(factoryType)) { - throw new IllegalArgumentException("Connector type (scheme) missing: " + description); + throw new IllegalArgumentException("Invalid URI: " + description); } - String connectorDescription = uri.authority(); + String connectorDescription = description.substring(pos + SCHEME_SEPARATOR.length()); if (StringUtil.isEmpty(connectorDescription)) { - throw new IllegalArgumentException("Illegal connector description: " + description); + throw new IllegalArgumentException("Invalid URI: " + description); + } + + pos = connectorDescription.indexOf('?'); + if (pos != -1) + { + connectorDescription = connectorDescription.substring(0, pos); } return (IConnector)container.getElement(ConnectorFactory.PRODUCT_GROUP, factoryType, connectorDescription); diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CompletePackageClosure.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CompletePackageClosure.java index 91de910eeb..865f0be639 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CompletePackageClosure.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CompletePackageClosure.java @@ -12,7 +12,7 @@ package org.eclipse.emf.internal.cdo.util; import org.eclipse.emf.internal.cdo.bundle.OM; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; +import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java index e3f5d2ec08..176da03369 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java @@ -14,7 +14,7 @@ import org.eclipse.emf.cdo.CDOObject; import org.eclipse.emf.cdo.CDOSession; import org.eclipse.emf.cdo.CDOState; import org.eclipse.emf.cdo.CDOView; -import org.eclipse.emf.cdo.protocol.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.util.LegacySystemNotAvailableException; import org.eclipse.emf.internal.cdo.CDOAdapterImpl; @@ -77,7 +77,7 @@ public final class FSMUtil public static void checkLegacySystemAvailability(CDOSession session, CDOObject object) throws LegacySystemNotAvailableException { - if (session.isDisableLegacyObjects() && object instanceof CDOLegacyImpl) + if (!session.isLegacySupportEnabled() && object instanceof CDOLegacyImpl) { throw new LegacySystemNotAvailableException(); } diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/InstancePackageClosure.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/InstancePackageClosure.java index 5b3aa893db..2f3fc74809 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/InstancePackageClosure.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/InstancePackageClosure.java @@ -12,7 +12,7 @@ package org.eclipse.emf.internal.cdo.util; import org.eclipse.emf.internal.cdo.bundle.OM; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; +import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java index fd6b77a32a..ebada1b8e7 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java @@ -10,22 +10,22 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.util; +import org.eclipse.emf.cdo.common.id.CDOIDMetaRange; +import org.eclipse.emf.cdo.common.model.CDOClass; +import org.eclipse.emf.cdo.common.model.CDOClassProxy; +import org.eclipse.emf.cdo.common.model.CDOClassRef; +import org.eclipse.emf.cdo.common.model.CDOFeature; +import org.eclipse.emf.cdo.common.model.CDOModelUtil; +import org.eclipse.emf.cdo.common.model.CDOPackage; +import org.eclipse.emf.cdo.common.model.CDOPackageManager; +import org.eclipse.emf.cdo.common.model.CDOType; +import org.eclipse.emf.cdo.common.model.core.CDOCorePackage; +import org.eclipse.emf.cdo.common.model.resource.CDOResourceClass; +import org.eclipse.emf.cdo.common.model.resource.CDOResourcePackage; import org.eclipse.emf.cdo.eresource.EresourcePackage; -import org.eclipse.emf.cdo.internal.protocol.model.CDOClassProxy; -import org.eclipse.emf.cdo.internal.protocol.model.InternalCDOClass; -import org.eclipse.emf.cdo.internal.protocol.model.InternalCDOFeature; -import org.eclipse.emf.cdo.internal.protocol.model.InternalCDOPackage; -import org.eclipse.emf.cdo.protocol.id.CDOIDMetaRange; -import org.eclipse.emf.cdo.protocol.model.CDOClass; -import org.eclipse.emf.cdo.protocol.model.CDOClassRef; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; -import org.eclipse.emf.cdo.protocol.model.CDOModelUtil; -import org.eclipse.emf.cdo.protocol.model.CDOPackage; -import org.eclipse.emf.cdo.protocol.model.CDOPackageManager; -import org.eclipse.emf.cdo.protocol.model.CDOType; -import org.eclipse.emf.cdo.protocol.model.core.CDOCorePackage; -import org.eclipse.emf.cdo.protocol.model.resource.CDOResourceClass; -import org.eclipse.emf.cdo.protocol.model.resource.CDOResourcePackage; +import org.eclipse.emf.cdo.spi.common.InternalCDOClass; +import org.eclipse.emf.cdo.spi.common.InternalCDOFeature; +import org.eclipse.emf.cdo.spi.common.InternalCDOPackage; import org.eclipse.emf.cdo.util.CDOPackageRegistry; import org.eclipse.emf.cdo.util.EMFUtil; @@ -34,8 +34,8 @@ import org.eclipse.emf.internal.cdo.CDOSessionImpl; import org.eclipse.emf.internal.cdo.CDOSessionPackageManagerImpl; import org.eclipse.emf.internal.cdo.bundle.OM; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.ImplementationError; +import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/PackageClosure.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/PackageClosure.java index 95e815b084..2def0aadc8 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/PackageClosure.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/PackageClosure.java @@ -12,7 +12,7 @@ package org.eclipse.emf.internal.cdo.util; import org.eclipse.emf.internal.cdo.bundle.OM; -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; +import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.emf.ecore.EPackage; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ProxyResolverResource.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ProxyResolverResource.java index 813fb20309..1e4f98d4f1 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ProxyResolverResource.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ProxyResolverResource.java @@ -31,6 +31,7 @@ import java.util.Map; */ final class ProxyResolverResource implements Resource { + @SuppressWarnings("unused") private CDOViewImpl view; public ProxyResolverResource(CDOViewImpl view) diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/RevisionAdjuster.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/RevisionAdjuster.java index c260ad2dca..48eb6b7b7c 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/RevisionAdjuster.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/RevisionAdjuster.java @@ -11,16 +11,16 @@ package org.eclipse.emf.internal.cdo.util; -import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; -import org.eclipse.emf.cdo.internal.protocol.revision.delta.CDOFeatureDeltaVisitorImpl; -import org.eclipse.emf.cdo.internal.protocol.revision.delta.CDOListFeatureDeltaImpl; -import org.eclipse.emf.cdo.protocol.id.CDOIDProvider; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; -import org.eclipse.emf.cdo.protocol.revision.CDOReferenceProxy; -import org.eclipse.emf.cdo.protocol.revision.delta.CDOAddFeatureDelta; -import org.eclipse.emf.cdo.protocol.revision.delta.CDOListFeatureDelta; -import org.eclipse.emf.cdo.protocol.revision.delta.CDORevisionDelta; -import org.eclipse.emf.cdo.protocol.revision.delta.CDOSetFeatureDelta; +import org.eclipse.emf.cdo.common.id.CDOIDProvider; +import org.eclipse.emf.cdo.common.model.CDOFeature; +import org.eclipse.emf.cdo.common.revision.CDOReferenceProxy; +import org.eclipse.emf.cdo.common.revision.delta.CDOAddFeatureDelta; +import org.eclipse.emf.cdo.common.revision.delta.CDOListFeatureDelta; +import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; +import org.eclipse.emf.cdo.common.revision.delta.CDOSetFeatureDelta; +import org.eclipse.emf.cdo.internal.common.revision.delta.CDOFeatureDeltaVisitorImpl; +import org.eclipse.emf.cdo.internal.common.revision.delta.CDOListFeatureDeltaImpl; +import org.eclipse.emf.cdo.spi.common.InternalCDORevision; import java.util.List; |