Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2014-03-09 06:44:30 +0000
committerEike Stepper2014-03-09 06:44:30 +0000
commite1b30b69c529224d8dfb537876911426e1d85a46 (patch)
treec3b3a317fb106581d439e1561f42213f23402cfd /plugins/org.eclipse.emf.cdo.server
parent339f42ac5c2d5cd52cd54d340c8557d99daabb4c (diff)
downloadcdo-e1b30b69c529224d8dfb537876911426e1d85a46.tar.gz
cdo-e1b30b69c529224d8dfb537876911426e1d85a46.tar.xz
cdo-e1b30b69c529224d8dfb537876911426e1d85a46.zip
[345431] Make it possible to preregister epackages
https://bugs.eclipse.org/bugs/show_bug.cgi?id=345431
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server')
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java26
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalRepository.java7
2 files changed, 23 insertions, 10 deletions
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 f90b37fe27..e99a19d4ff 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
@@ -480,7 +480,7 @@ public class Repository extends Container<Object> implements InternalRepository
public List<InternalCDORevision> loadRevisions(List<RevisionInfo> infos, CDOBranchPoint branchPoint,
int referenceChunk, int prefetchDepth)
- {
+ {
for (RevisionInfo info : infos)
{
CDOID id = info.getID();
@@ -578,7 +578,7 @@ public class Repository extends Container<Object> implements InternalRepository
}
return null;
- }
+ }
private InternalCDORevision loadRevisionTarget(CDOID id, CDOBranchPoint branchPoint, int referenceChunk,
IStoreAccessor accessor)
@@ -1198,8 +1198,8 @@ public class Repository extends Container<Object> implements InternalRepository
{
throw new IllegalArgumentException(
MessageFormat
- .format(
- "timeStamp ({0}) < repository creation time ({1})", CDOCommonUtil.formatTimeStamp(timeStamp), CDOCommonUtil.formatTimeStamp(creationTimeStamp))); //$NON-NLS-1$
+ .format(
+ "timeStamp ({0}) < repository creation time ({1})", CDOCommonUtil.formatTimeStamp(timeStamp), CDOCommonUtil.formatTimeStamp(creationTimeStamp))); //$NON-NLS-1$
}
long currentTimeStamp = getTimeStamp();
@@ -1207,8 +1207,8 @@ public class Repository extends Container<Object> implements InternalRepository
{
throw new IllegalArgumentException(
MessageFormat
- .format(
- "timeStamp ({0}) > current time ({1})", CDOCommonUtil.formatTimeStamp(timeStamp), CDOCommonUtil.formatTimeStamp(currentTimeStamp))); //$NON-NLS-1$
+ .format(
+ "timeStamp ({0}) > current time ({1})", CDOCommonUtil.formatTimeStamp(timeStamp), CDOCommonUtil.formatTimeStamp(currentTimeStamp))); //$NON-NLS-1$
}
}
@@ -1423,7 +1423,7 @@ public class Repository extends Container<Object> implements InternalRepository
public Set<CDOID> getMergeData(CDORevisionAvailabilityInfo targetInfo, CDORevisionAvailabilityInfo sourceInfo,
CDORevisionAvailabilityInfo targetBaseInfo, CDORevisionAvailabilityInfo sourceBaseInfo, OMMonitor monitor)
- {
+ {
CDOBranchPoint target = targetInfo.getBranchPoint();
CDOBranchPoint source = sourceInfo.getBranchPoint();
@@ -1481,7 +1481,7 @@ public class Repository extends Container<Object> implements InternalRepository
{
monitor.done();
}
- }
+ }
private void loadMergeData(Set<CDOID> ids, CDORevisionAvailabilityInfo info, OMMonitor monitor)
{
@@ -1587,7 +1587,7 @@ public class Repository extends Container<Object> implements InternalRepository
public static List<Object> revisionKeysToObjects(List<CDORevisionKey> revisionKeys, CDOBranch viewedBranch,
boolean isSupportingBranches)
- {
+ {
List<Object> lockables = new ArrayList<Object>();
for (CDORevisionKey revKey : revisionKeys)
{
@@ -1603,7 +1603,7 @@ public class Repository extends Container<Object> implements InternalRepository
}
return lockables;
- }
+ }
public LockObjectsResult lock(InternalView view, LockType lockType, List<CDORevisionKey> revKeys, boolean recursive,
long timeout)
@@ -1837,6 +1837,12 @@ public class Repository extends Container<Object> implements InternalRepository
}
}
+ @Deprecated
+ public void initSystemPackages()
+ {
+ initSystemPackages(true);
+ }
+
public void initSystemPackages(boolean firstStart)
{
IStoreAccessor writer = store.getWriter(null);
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalRepository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalRepository.java
index d998289829..57760c7647 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalRepository.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalRepository.java
@@ -258,6 +258,13 @@ public interface InternalRepository extends IRepository, PackageProcessor, Packa
/**
* @since 4.0
+ * @deprecated As of 4.3 use {@link #initSystemPackages()}.
+ */
+ @Deprecated
+ public void initSystemPackages();
+
+ /**
+ * @since 4.3
*/
public void initSystemPackages(boolean firstStart);

Back to the top