summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-08-24 04:52:34 (EDT)
committerEike Stepper2007-08-24 04:52:34 (EDT)
commitbb93efe6893275353dd15a4a0e784b40e112a3ba (patch)
tree4c6100a6bf68ab531a885d5b24bf2b3888bbd9d7
parent527ea600787729a420a2628316bb2150fdf5fe0f (diff)
downloadcdo-bb93efe6893275353dd15a4a0e784b40e112a3ba.zip
cdo-bb93efe6893275353dd15a4a0e784b40e112a3ba.tar.gz
cdo-bb93efe6893275353dd15a4a0e784b40e112a3ba.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/Mapping.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStore.java13
3 files changed, 17 insertions, 5 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
index 21e7235..b46316a 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
@@ -89,11 +89,16 @@ public class DBStore extends Store implements IDBStore
return schema;
}
- public boolean hasAuditSupport()
+ public boolean hasAuditingSupport()
{
return true;
}
+ public boolean hasBranchingSupport()
+ {
+ return false;
+ }
+
public DBStoreAccessor getReader(ISession session) throws DBException
{
return new DBStoreAccessor(this, session);
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/Mapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/Mapping.java
index cab57d0..a2f9cbc 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/Mapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/Mapping.java
@@ -148,7 +148,7 @@ public abstract class Mapping implements IMapping
{
if (TRACER.isEnabled())
{
- TRACER.format("{0}. attempt to add table: {1} ({2})", attempt, tableName, ignore.getMessage());
+ TRACER.format("{0}. attempt to add table: {1} ({2})", attempt + 1, tableName, ignore.getMessage());
}
}
}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStore.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStore.java
index 0ded996..6a4b8e8 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStore.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStore.java
@@ -22,10 +22,17 @@ public interface IStore extends IRepositoryElement
public String getStoreType();
/**
- * @return <code>true</code> if this store supports audit views,
- * <code>false</code> otherwise.
+ * @return <code>true</code> if this store supports the retrieval of
+ * historical revisions, <code>false</code> otherwise.
*/
- public boolean hasAuditSupport();
+ public boolean hasAuditingSupport();
+
+ /**
+ * @return <code>true</code> if this store supports the storage of
+ * concurrent revisions in separate branches, <code>false</code>
+ * otherwise.
+ */
+ public boolean hasBranchingSupport();
/**
* Returns a reader that can be used to read from this store in the context of