[215688] Create save points

https://bugs.eclipse.org/bugs/show_bug.cgi?id=215688

6 files changed, 34 insertions, 26 deletions

diff --git a/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml b/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml
index 70f338e361..26c67798c5 100644
--- a/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml
+++ b/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml
@@ -11,7 +11,6 @@
 		<property name="overrideUUID" value="1ff5d226-b1f0-40fb-aba2-0c31b38c764f"/>
 		<property name="supportingAudits" value="true"/>
 		<property name="verifyingRevisions" value="false"/>
-		<property name="rememberingKnownTypes" value="false"/>
 		<property name="currentLRUCapacity" value="10000"/>
 		<property name="revisedLRUCapacity" value="100"/>
 		
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 2175602201..3295cc25a7 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
@@ -16,6 +16,7 @@ import org.eclipse.emf.cdo.protocol.CDOIDRange;
 import org.eclipse.emf.cdo.server.IRepository;
 import org.eclipse.emf.cdo.server.IRepositoryElement;
 import org.eclipse.emf.cdo.server.IStore;
+import org.eclipse.emf.cdo.server.IRepository.Props;
 
 import org.eclipse.net4j.internal.util.container.Container;
 import org.eclipse.net4j.util.StringUtil;
@@ -87,7 +88,7 @@ public class Repository extends Container<IRepositoryElement> implements IReposi
   {
     if (uuid == null)
     {
-      String value = getProperties().get(IRepository.PROP_OVERRIDE_UUID);
+      String value = getProperties().get(Props.PROP_OVERRIDE_UUID);
       uuid = StringUtil.isEmpty(value) ? UUID.randomUUID().toString() : value;
     }
 
@@ -113,7 +114,7 @@ public class Repository extends Container<IRepositoryElement> implements IReposi
   {
     if (supportingRevisionDeltas == null)
     {
-      String value = getProperties().get(IRepository.PROP_SUPPORTING_REVISION_DELTAS);
+      String value = getProperties().get(Props.PROP_SUPPORTING_REVISION_DELTAS);
       supportingRevisionDeltas = value == null ? false : Boolean.valueOf(value);
     }
 
@@ -124,7 +125,7 @@ public class Repository extends Container<IRepositoryElement> implements IReposi
   {
     if (supportingAudits == null)
     {
-      String value = getProperties().get(IRepository.PROP_SUPPORTING_AUDITS);
+      String value = getProperties().get(Props.PROP_SUPPORTING_AUDITS);
       supportingAudits = value == null ? false : Boolean.valueOf(value);
     }
 
@@ -135,7 +136,7 @@ public class Repository extends Container<IRepositoryElement> implements IReposi
   {
     if (verifyingRevisions == null)
     {
-      String value = getProperties().get(IRepository.PROP_VERIFYING_REVISIONS);
+      String value = getProperties().get(Props.PROP_VERIFYING_REVISIONS);
       verifyingRevisions = value == null ? false : Boolean.valueOf(value);
     }
 
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 136f3b21fe..cd9133380b 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
@@ -23,12 +23,12 @@ 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.revision.CDORevisionUtil;
-import org.eclipse.emf.cdo.server.IRepository;
 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.IStoreWriter;
 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.net4j.util.collection.MoveableList;
@@ -255,8 +255,8 @@ public class RevisionManager extends CDORevisionResolverImpl implements IRevisio
   protected void doBeforeActivate() throws Exception
   {
     super.doBeforeActivate();
-    setCurrentLRUCapacity(getLRUCapacity(IRepository.PROP_CURRENT_LRU_CAPACITY));
-    setRevisedLRUCapacity(getLRUCapacity(IRepository.PROP_REVISED_LRU_CAPACITY));
+    setCurrentLRUCapacity(getLRUCapacity(Props.PROP_CURRENT_LRU_CAPACITY));
+    setRevisedLRUCapacity(getLRUCapacity(Props.PROP_REVISED_LRU_CAPACITY));
   }
 
   protected int getLRUCapacity(String prop)
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 9f88c2f340..6c40628327 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
@@ -19,18 +19,6 @@ import java.util.Map;
  */
 public interface IRepository extends IContainer<IRepositoryElement>
 {
-  public static final String PROP_OVERRIDE_UUID = "overrideUUID";
-
-  public static final String PROP_SUPPORTING_REVISION_DELTAS = "supportingRevisionDeltas";
-
-  public static final String PROP_SUPPORTING_AUDITS = "supportingAudits";
-
-  public static final String PROP_VERIFYING_REVISIONS = "verifyingRevisions";
-
-  public static final String PROP_CURRENT_LRU_CAPACITY = "currentLRUCapacity";
-
-  public static final String PROP_REVISED_LRU_CAPACITY = "revisedLRUCapacity";
-
   public String getName();
 
   public void setName(String name);
@@ -56,4 +44,22 @@ public interface IRepository extends IContainer<IRepositoryElement>
   public IResourceManager getResourceManager();
 
   public IRevisionManager getRevisionManager();
+
+  /**
+   * @author Eike Stepper
+   */
+  public interface Props
+  {
+    public static final String PROP_OVERRIDE_UUID = "overrideUUID";
+
+    public static final String PROP_SUPPORTING_REVISION_DELTAS = "supportingRevisionDeltas";
+
+    public static final String PROP_SUPPORTING_AUDITS = "supportingAudits";
+
+    public static final String PROP_VERIFYING_REVISIONS = "verifyingRevisions";
+
+    public static final String PROP_CURRENT_LRU_CAPACITY = "currentLRUCapacity";
+
+    public static final String PROP_REVISED_LRU_CAPACITY = "revisedLRUCapacity";
+  }
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractCDOTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractCDOTest.java
index 1947429402..045069b345 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractCDOTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractCDOTest.java
@@ -18,6 +18,7 @@ import org.eclipse.emf.cdo.server.CDOServerUtil;
 import org.eclipse.emf.cdo.server.IRepository;
 import org.eclipse.emf.cdo.server.IStore;
 import org.eclipse.emf.cdo.server.StoreUtil;
+import org.eclipse.emf.cdo.server.IRepository.Props;
 import org.eclipse.emf.cdo.tests.model1.Model1Package;
 import org.eclipse.emf.cdo.util.CDOUtil;
 
@@ -57,9 +58,9 @@ public abstract class AbstractCDOTest extends AbstractTransportTest
   protected IRepository createRepository()
   {
     Map<String, String> props = new HashMap<String, String>();
-    props.put(IRepository.PROP_SUPPORTING_REVISION_DELTAS, "true");
-    props.put(IRepository.PROP_CURRENT_LRU_CAPACITY, "10000");
-    props.put(IRepository.PROP_REVISED_LRU_CAPACITY, "10000");
+    props.put(Props.PROP_SUPPORTING_REVISION_DELTAS, "true");
+    props.put(Props.PROP_CURRENT_LRU_CAPACITY, "10000");
+    props.put(Props.PROP_REVISED_LRU_CAPACITY, "10000");
     return CDOServerUtil.createRepository(REPOSITORY_NAME, createStore(), props);
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ImportXML.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ImportXML.java
index 14876a033b..4b696c56db 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ImportXML.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ImportXML.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.cdo.server.CDOServerUtil;
 import org.eclipse.emf.cdo.server.IRepository;
 import org.eclipse.emf.cdo.server.IStore;
 import org.eclipse.emf.cdo.server.StoreUtil;
+import org.eclipse.emf.cdo.server.IRepository.Props;
 import org.eclipse.emf.cdo.util.CDOUtil;
 
 import org.eclipse.net4j.Net4jUtil;
@@ -70,9 +71,9 @@ public class ImportXML
   private static IRepository createRepository()
   {
     Map<String, String> props = new HashMap<String, String>();
-    props.put(IRepository.PROP_SUPPORTING_REVISION_DELTAS, "true");
-    props.put(IRepository.PROP_CURRENT_LRU_CAPACITY, "10000");
-    props.put(IRepository.PROP_REVISED_LRU_CAPACITY, "10000");
+    props.put(Props.PROP_SUPPORTING_REVISION_DELTAS, "true");
+    props.put(Props.PROP_CURRENT_LRU_CAPACITY, "10000");
+    props.put(Props.PROP_REVISED_LRU_CAPACITY, "10000");
     return CDOServerUtil.createRepository(REPOSITORY_NAME, createStore(), props);
   }