Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2010-09-22 08:25:08 +0000
committerEike Stepper2010-09-22 08:25:08 +0000
commitf73a8b2e09b9556eff21af084a5cf63b77ad6efa (patch)
tree50b86fd906f727c0cf04f65c730405aace34a40b
parent5dbb47549b1e46b1a49e35d242d6d847b0e48139 (diff)
downloadcdo-f73a8b2e09b9556eff21af084a5cf63b77ad6efa.tar.gz
cdo-f73a8b2e09b9556eff21af084a5cf63b77ad6efa.tar.xz
cdo-f73a8b2e09b9556eff21af084a5cf63b77ad6efa.zip
[325928] Provide FailoverMonitor server and FailoverAgents to coordinate fail-over scenarios
https://bugs.eclipse.org/bugs/show_bug.cgi?id=325928
-rw-r--r--plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/FailoverExample.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/plugin.xml8
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/net4j/FailoverMonitor.java4
3 files changed, 14 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/FailoverExample.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/FailoverExample.java
index 6875cd129f..c46c7d366d 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/FailoverExample.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/FailoverExample.java
@@ -24,10 +24,10 @@ import org.eclipse.emf.cdo.server.IStore;
import org.eclipse.emf.cdo.server.ISynchronizableRepository;
import org.eclipse.emf.cdo.server.db.CDODBUtil;
import org.eclipse.emf.cdo.server.db.mapping.IMappingStrategy;
-import org.eclipse.emf.cdo.server.internal.net4j.syncing.FailoverAgent;
-import org.eclipse.emf.cdo.server.internal.net4j.syncing.FailoverMonitor;
-import org.eclipse.emf.cdo.server.internal.net4j.syncing.FailoverMonitor.Protocol;
import org.eclipse.emf.cdo.server.net4j.CDONet4jServerUtil;
+import org.eclipse.emf.cdo.server.net4j.FailoverAgent;
+import org.eclipse.emf.cdo.server.net4j.FailoverMonitor;
+import org.eclipse.emf.cdo.server.net4j.FailoverMonitor.Protocol;
import org.eclipse.emf.cdo.session.CDOSessionConfigurationFactory;
import org.eclipse.emf.cdo.spi.server.InternalRepository;
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/plugin.xml b/plugins/org.eclipse.emf.cdo.server.net4j/plugin.xml
index 3a56e0f5bd..5a88a22341 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/plugin.xml
@@ -19,6 +19,14 @@
productGroup="org.eclipse.net4j.serverProtocols"
type="cdo"
class="org.eclipse.emf.cdo.server.internal.net4j.protocol.CDOPluginProtocolFactory"/>
+ <factory
+ productGroup="org.eclipse.net4j.serverProtocols"
+ type="failover"
+ class="org.eclipse.emf.cdo.server.net4j.FailoverMonitor$Protocol$Factory"/>
+ <factory
+ productGroup="org.eclipse.emf.cdo.server.net4j.failoverMonitors"
+ type="net4j"
+ class="org.eclipse.emf.cdo.server.net4j.FailoverMonitor$Factory"/>
</extension>
<extension
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/net4j/FailoverMonitor.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/net4j/FailoverMonitor.java
index 033185678a..319ddccf9c 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/net4j/FailoverMonitor.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/net4j/FailoverMonitor.java
@@ -187,9 +187,11 @@ public class FailoverMonitor extends Container<Pair<String, String>>
*/
public static class Factory extends org.eclipse.net4j.util.factory.Factory
{
+ public static final String TYPE = "net4j";
+
public Factory()
{
- super(PRODUCT_GROUP, "net4j");
+ super(PRODUCT_GROUP, TYPE);
}
public FailoverMonitor create(String description) throws ProductCreationException

Back to the top