[580888] Introduce CDOProtocolConstants.SIGNAL_USER_OFFSET for protocol extenders

11 files changed, 50 insertions, 45 deletions

diff --git a/features/org.eclipse.emf.cdo-feature/feature.xml b/features/org.eclipse.emf.cdo-feature/feature.xml
index acff8d526e..4d60068f50 100644
--- a/features/org.eclipse.emf.cdo-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.emf.cdo"
       label="%featureName"
-      version="4.20.1.qualifier"
+      version="4.21.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.cdo.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.cdo-feature/pom.xml b/features/org.eclipse.emf.cdo-feature/pom.xml
index 9acfe602cd..fc2e94f6b9 100644
--- a/features/org.eclipse.emf.cdo-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo-feature/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo.features</groupId>
   <artifactId>org.eclipse.emf.cdo</artifactId>
-  <version>4.20.1-SNAPSHOT</version>
+  <version>4.21.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.emf.cdo.sdk-feature/feature.xml b/features/org.eclipse.emf.cdo.sdk-feature/feature.xml
index 2777f37111..2b0109a17e 100644
--- a/features/org.eclipse.emf.cdo.sdk-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.sdk-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.emf.cdo.sdk"
       label="%featureName"
-      version="5.13.1.qualifier"
+      version="5.14.0.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.emf.cdo.sdk-feature/pom.xml b/features/org.eclipse.emf.cdo.sdk-feature/pom.xml
index 5c28e6f84a..54bbac02c3 100644
--- a/features/org.eclipse.emf.cdo.sdk-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.sdk-feature/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo.features</groupId>
   <artifactId>org.eclipse.emf.cdo.sdk</artifactId>
-  <version>5.13.1-SNAPSHOT</version>
+  <version>5.14.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.emf.cdo.server-feature/feature.xml b/features/org.eclipse.emf.cdo.server-feature/feature.xml
index c82dcb6414..93352d5dd5 100644
--- a/features/org.eclipse.emf.cdo.server-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.server-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.emf.cdo.server"
       label="%featureName"
-      version="4.20.1.qualifier"
+      version="4.21.0.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.emf.cdo.server-feature/pom.xml b/features/org.eclipse.emf.cdo.server-feature/pom.xml
index 6cd80fa16e..d9c1cdef2e 100644
--- a/features/org.eclipse.emf.cdo.server-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.server-feature/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo.features</groupId>
   <artifactId>org.eclipse.emf.cdo.server</artifactId>
-  <version>4.20.1-SNAPSHOT</version>
+  <version>4.21.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.emf.cdo.server.embedded-feature/feature.xml b/features/org.eclipse.emf.cdo.server.embedded-feature/feature.xml
index 4997746a62..88485fe60e 100644
--- a/features/org.eclipse.emf.cdo.server.embedded-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.server.embedded-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.emf.cdo.server.embedded"
       label="%featureName"
-      version="4.20.1.qualifier"
+      version="4.21.0.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.emf.cdo.server.embedded-feature/pom.xml b/features/org.eclipse.emf.cdo.server.embedded-feature/pom.xml
index 777254c7f7..da1a5a34b1 100644
--- a/features/org.eclipse.emf.cdo.server.embedded-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.server.embedded-feature/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo.features</groupId>
   <artifactId>org.eclipse.emf.cdo.server.embedded</artifactId>
-  <version>4.20.1-SNAPSHOT</version>
+  <version>4.21.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
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 dcf2bc39a4..f4f02c9806 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;singleton:=true
-Bundle-Version: 4.19.0.qualifier
+Bundle-Version: 4.20.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -15,21 +15,21 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";visibili
  org.eclipse.emf.ecore.change;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.common;version="4.19.0",
- org.eclipse.emf.cdo.common.admin;version="4.19.0",
- org.eclipse.emf.cdo.common.branch;version="4.19.0",
- org.eclipse.emf.cdo.common.commit;version="4.19.0",
- org.eclipse.emf.cdo.common.commit.handler;version="4.19.0",
- org.eclipse.emf.cdo.common.id;version="4.19.0",
- org.eclipse.emf.cdo.common.lob;version="4.19.0",
- org.eclipse.emf.cdo.common.lock;version="4.19.0",
- org.eclipse.emf.cdo.common.model;version="4.19.0",
- org.eclipse.emf.cdo.common.protocol;version="4.19.0",
- org.eclipse.emf.cdo.common.revision;version="4.19.0",
- org.eclipse.emf.cdo.common.revision.delta;version="4.19.0",
- org.eclipse.emf.cdo.common.security;version="4.19.0",
- org.eclipse.emf.cdo.common.util;version="4.19.0",
- org.eclipse.emf.cdo.internal.common;version="4.19.0";
+Export-Package: org.eclipse.emf.cdo.common;version="4.20.0",
+ org.eclipse.emf.cdo.common.admin;version="4.20.0",
+ org.eclipse.emf.cdo.common.branch;version="4.20.0",
+ org.eclipse.emf.cdo.common.commit;version="4.20.0",
+ org.eclipse.emf.cdo.common.commit.handler;version="4.20.0",
+ org.eclipse.emf.cdo.common.id;version="4.20.0",
+ org.eclipse.emf.cdo.common.lob;version="4.20.0",
+ org.eclipse.emf.cdo.common.lock;version="4.20.0",
+ org.eclipse.emf.cdo.common.model;version="4.20.0",
+ org.eclipse.emf.cdo.common.protocol;version="4.20.0",
+ org.eclipse.emf.cdo.common.revision;version="4.20.0",
+ org.eclipse.emf.cdo.common.revision.delta;version="4.20.0",
+ org.eclipse.emf.cdo.common.security;version="4.20.0",
+ org.eclipse.emf.cdo.common.util;version="4.20.0",
+ org.eclipse.emf.cdo.internal.common;version="4.20.0";
   x-friends:="org.eclipse.emf.cdo.common,
    org.eclipse.emf.cdo.common.db,
    org.eclipse.emf.cdo,
@@ -38,9 +38,9 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.19.0",
    org.eclipse.emf.cdo.server.net4j,
    org.eclipse.emf.cdo.ui,
    org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.internal.common.branch;version="4.19.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.ui",
- org.eclipse.emf.cdo.internal.common.bundle;version="4.19.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.common.commit;version="4.19.0";
+ org.eclipse.emf.cdo.internal.common.branch;version="4.20.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.ui",
+ org.eclipse.emf.cdo.internal.common.bundle;version="4.20.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.common.commit;version="4.20.0";
   x-friends:="org.eclipse.emf.cdo.common,
    org.eclipse.emf.cdo.common.db,
    org.eclipse.emf.cdo,
@@ -49,7 +49,7 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.19.0",
    org.eclipse.emf.cdo.server.net4j,
    org.eclipse.emf.cdo.ui,
    org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.internal.common.id;version="4.19.0";
+ org.eclipse.emf.cdo.internal.common.id;version="4.20.0";
   x-friends:="org.eclipse.emf.cdo.common,
    org.eclipse.emf.cdo.common.db,
    org.eclipse.emf.cdo,
@@ -60,9 +60,9 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.19.0",
    org.eclipse.emf.cdo.tests,
    org.eclipse.emf.cdo.admin,
    org.eclipse.emf.cdo.server.admin",
- org.eclipse.emf.cdo.internal.common.lock;version="4.19.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.common.messages;version="4.19.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.common.model;version="4.19.0";
+ org.eclipse.emf.cdo.internal.common.lock;version="4.20.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.common.messages;version="4.20.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.common.model;version="4.20.0";
   x-friends:="org.eclipse.emf.cdo.common,
    org.eclipse.emf.cdo.common.db,
    org.eclipse.emf.cdo,
@@ -71,7 +71,7 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.19.0",
    org.eclipse.emf.cdo.server.net4j,
    org.eclipse.emf.cdo.ui,
    org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.internal.common.revision;version="4.19.0";
+ org.eclipse.emf.cdo.internal.common.revision;version="4.20.0";
   x-friends:="org.eclipse.emf.cdo.common,
    org.eclipse.emf.cdo.common.db,
    org.eclipse.emf.cdo,
@@ -80,7 +80,7 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.19.0",
    org.eclipse.emf.cdo.server.net4j,
    org.eclipse.emf.cdo.ui,
    org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.internal.common.revision.delta;version="4.19.0";
+ org.eclipse.emf.cdo.internal.common.revision.delta;version="4.20.0";
   x-friends:="org.eclipse.emf.cdo.common,
    org.eclipse.emf.cdo.common.db,
    org.eclipse.emf.cdo,
@@ -89,7 +89,7 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.19.0",
    org.eclipse.emf.cdo.server.net4j,
    org.eclipse.emf.cdo.ui,
    org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.internal.common.util;version="4.19.0";
+ org.eclipse.emf.cdo.internal.common.util;version="4.20.0";
   x-friends:="org.eclipse.emf.cdo.common,
    org.eclipse.emf.cdo.common.db,
    org.eclipse.emf.cdo,
@@ -98,15 +98,15 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.19.0",
    org.eclipse.emf.cdo.server.net4j,
    org.eclipse.emf.cdo.ui,
    org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.spi.common;version="4.19.0",
- org.eclipse.emf.cdo.spi.common.admin;version="4.19.0",
- org.eclipse.emf.cdo.spi.common.branch;version="4.19.0",
- org.eclipse.emf.cdo.spi.common.commit;version="4.19.0",
- org.eclipse.emf.cdo.spi.common.id;version="4.19.0",
- org.eclipse.emf.cdo.spi.common.lock;version="4.19.0",
- org.eclipse.emf.cdo.spi.common.model;version="4.19.0",
- org.eclipse.emf.cdo.spi.common.protocol;version="4.19.0",
- org.eclipse.emf.cdo.spi.common.revision;version="4.19.0",
- org.eclipse.emf.cdo.spi.common.util;version="4.19.0"
+ org.eclipse.emf.cdo.spi.common;version="4.20.0",
+ org.eclipse.emf.cdo.spi.common.admin;version="4.20.0",
+ org.eclipse.emf.cdo.spi.common.branch;version="4.20.0",
+ org.eclipse.emf.cdo.spi.common.commit;version="4.20.0",
+ org.eclipse.emf.cdo.spi.common.id;version="4.20.0",
+ org.eclipse.emf.cdo.spi.common.lock;version="4.20.0",
+ org.eclipse.emf.cdo.spi.common.model;version="4.20.0",
+ org.eclipse.emf.cdo.spi.common.protocol;version="4.20.0",
+ org.eclipse.emf.cdo.spi.common.revision;version="4.20.0",
+ org.eclipse.emf.cdo.spi.common.util;version="4.20.0"
 Automatic-Module-Name: org.eclipse.emf.cdo.common
 Eclipse-RegisterBuddy: org.eclipse.net4j.util
diff --git a/plugins/org.eclipse.emf.cdo.common/pom.xml b/plugins/org.eclipse.emf.cdo.common/pom.xml
index dc86790a48..6a8747aad9 100644
--- a/plugins/org.eclipse.emf.cdo.common/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.common/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.eclipse.emf.cdo.common</artifactId>
-  <version>4.19.0-SNAPSHOT</version>
+  <version>4.20.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java
index ffcff1f169..a90768ca9a 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java
@@ -343,6 +343,11 @@ public interface CDOProtocolConstants
    */
   public static final short SIGNAL_REMOTE_TOPIC = 69;
 
+  /**
+   * @since 4.20
+   */
+  public static final short SIGNAL_USER_OFFSET = 1000;
+
   // //////////////////////////////////////////////////////////////////////
   // Session Refresh