diff options
author | Eike Stepper | 2011-07-20 11:50:52 +0000 |
---|---|---|
committer | Eike Stepper | 2011-07-20 11:50:52 +0000 |
commit | af719ba16912427971a462cf41f6245cde962ab6 (patch) | |
tree | 8ea61c606d79b36652b1fdbcc7299aeac7ea0b9b /plugins/org.eclipse.emf.cdo.server.net4j | |
parent | ad46e775fa0f070dcb43eaea4e8b260e3e9bf443 (diff) | |
download | cdo-af719ba16912427971a462cf41f6245cde962ab6.tar.gz cdo-af719ba16912427971a462cf41f6245cde962ab6.tar.xz cdo-af719ba16912427971a462cf41f6245cde962ab6.zip |
[352561] Support client assigned CDOIDs (UUIDs)
https://bugs.eclipse.org/bugs/show_bug.cgi?id=352561
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server.net4j')
2 files changed, 5 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.net4j/META-INF/MANIFEST.MF index 97b482a578..0edf40d5a5 100644 --- a/plugins/org.eclipse.emf.cdo.server.net4j/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.server.net4j/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.server.net4j;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 4.0.100.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -12,6 +12,6 @@ Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional, org.eclipse.emf.cdo.server;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport -Export-Package: org.eclipse.emf.cdo.server.internal.net4j.bundle;version="4.0.0";x-internal:=true, - org.eclipse.emf.cdo.server.internal.net4j.protocol;version="4.0.0";x-friends:="org.eclipse.emf.cdo.tests", - org.eclipse.emf.cdo.server.net4j;version="4.0.0" +Export-Package: org.eclipse.emf.cdo.server.internal.net4j.bundle;version="4.0.100";x-internal:=true, + org.eclipse.emf.cdo.server.internal.net4j.protocol;version="4.0.100";x-friends:="org.eclipse.emf.cdo.tests", + org.eclipse.emf.cdo.server.net4j;version="4.0.100" diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/OpenSessionIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/OpenSessionIndication.java index 179c6a89b6..7d8a9962d4 100644 --- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/OpenSessionIndication.java +++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/OpenSessionIndication.java @@ -144,6 +144,7 @@ public class OpenSessionIndication extends CDOServerIndicationWithMonitoring out.writeBoolean(repository.isSupportingBranches()); out.writeBoolean(repository.isSupportingEcore()); out.writeBoolean(repository.isEnsuringReferentialIntegrity()); + out.writeEnum(repository.getIDGenerationLocation()); CDOPackageUnit[] packageUnits = repository.getPackageRegistry().getPackageUnits(); out.writeCDOPackageUnits(packageUnits); |