Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2013-09-03 10:47:13 +0000
committerEike Stepper2013-09-03 10:47:13 +0000
commitd08eff6b4a3a7098771aad62bd83db082fc8c830 (patch)
tree22069d8d26eebacb227fe1ac328ac4e2817f915c /plugins/org.eclipse.emf.cdo.server
parent351f8c20e71c944e9b279ebe0159030616dfe137 (diff)
downloadcdo-d08eff6b4a3a7098771aad62bd83db082fc8c830.tar.gz
cdo-d08eff6b4a3a7098771aad62bd83db082fc8c830.tar.xz
cdo-d08eff6b4a3a7098771aad62bd83db082fc8c830.zip
[416418] [Releng] Eliminate IContainerConfig from the config test
framework https://bugs.eclipse.org/bugs/show_bug.cgi?id=416418
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server')
-rw-r--r--plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF22
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java20
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalRepository.java11
3 files changed, 41 insertions, 12 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF
index d1e26edec8..47206da095 100644
--- a/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.server;singleton:=true
-Bundle-Version: 4.2.100.qualifier
+Bundle-Version: 4.3.0.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -10,18 +10,18 @@ Bundle-Activator: org.eclipse.emf.cdo.internal.server.bundle.OM$Activator
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .
Require-Bundle: org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.internal.server;version="4.2.100";
+Export-Package: org.eclipse.emf.cdo.internal.server;version="4.3.0";
x-friends:="org.eclipse.emf.cdo.server.db,
org.eclipse.emf.cdo.server.net4j,
org.eclipse.emf.cdo.tests,
org.eclipse.emf.cdo.workspace,
org.eclipse.emf.cdo.server.hibernate",
- org.eclipse.emf.cdo.internal.server.bundle;version="4.2.100";x-internal:=true,
- org.eclipse.emf.cdo.internal.server.embedded;version="4.2.100";x-friends:="org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.internal.server.mem;version="4.2.100";x-friends:="org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.internal.server.messages;version="4.2.100";x-internal:=true,
- org.eclipse.emf.cdo.internal.server.syncing;version="4.2.100";x-friends:="org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.server;version="4.2.100",
- org.eclipse.emf.cdo.server.embedded;version="4.2.100",
- org.eclipse.emf.cdo.server.mem;version="4.2.100",
- org.eclipse.emf.cdo.spi.server;version="4.2.100"
+ org.eclipse.emf.cdo.internal.server.bundle;version="4.3.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.server.embedded;version="4.3.0";x-friends:="org.eclipse.emf.cdo.tests",
+ org.eclipse.emf.cdo.internal.server.mem;version="4.3.0";x-friends:="org.eclipse.emf.cdo.tests",
+ org.eclipse.emf.cdo.internal.server.messages;version="4.3.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.server.syncing;version="4.3.0";x-friends:="org.eclipse.emf.cdo.tests",
+ org.eclipse.emf.cdo.server;version="4.3.0",
+ org.eclipse.emf.cdo.server.embedded;version="4.3.0",
+ org.eclipse.emf.cdo.server.mem;version="4.3.0",
+ org.eclipse.emf.cdo.spi.server;version="4.3.0"
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 07b05504a6..c158d62b59 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
@@ -103,6 +103,7 @@ import org.eclipse.net4j.util.concurrent.IRWLockManager.LockType;
import org.eclipse.net4j.util.concurrent.RWOLockManager.LockState;
import org.eclipse.net4j.util.concurrent.TimeoutRuntimeException;
import org.eclipse.net4j.util.container.Container;
+import org.eclipse.net4j.util.container.IManagedContainer;
import org.eclipse.net4j.util.container.IPluginContainer;
import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
import org.eclipse.net4j.util.om.monitor.Monitor;
@@ -187,6 +188,8 @@ public class Repository extends Container<Object> implements InternalRepository
private IQueryHandlerProvider queryHandlerProvider;
+ private IManagedContainer container;
+
private List<ReadAccessHandler> readAccessHandlers = new ArrayList<ReadAccessHandler>();
private List<WriteAccessHandler> writeAccessHandlers = new ArrayList<WriteAccessHandler>();
@@ -1088,7 +1091,7 @@ public class Repository extends Container<Object> implements InternalRepository
if (queryHandlerProvider == null)
{
- queryHandlerProvider = new ContainerQueryHandlerProvider(IPluginContainer.INSTANCE);
+ queryHandlerProvider = new ContainerQueryHandlerProvider(getContainer());
}
IQueryHandler handler = queryHandlerProvider.getQueryHandler(info);
@@ -1100,6 +1103,21 @@ public class Repository extends Container<Object> implements InternalRepository
return null;
}
+ public IManagedContainer getContainer()
+ {
+ if (container == null)
+ {
+ return IPluginContainer.INSTANCE;
+ }
+
+ return container;
+ }
+
+ public void setContainer(IManagedContainer container)
+ {
+ this.container = container;
+ }
+
public Object[] getElements()
{
final Object[] elements = { packageRegistry, branchManager, revisionManager, sessionManager, queryManager,
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 2cb71a3f82..7131f09b81 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
@@ -40,6 +40,7 @@ import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager.RevisionLoader;
import org.eclipse.net4j.util.concurrent.IRWLockManager.LockType;
+import org.eclipse.net4j.util.container.IManagedContainer;
import org.eclipse.net4j.util.om.monitor.OMMonitor;
import org.eclipse.emf.ecore.EClass;
@@ -118,6 +119,16 @@ public interface InternalRepository extends IRepository, PackageProcessor, Packa
public void setQueryHandlerProvider(IQueryHandlerProvider queryHandlerProvider);
+ /**
+ * @since 4.3
+ */
+ public IManagedContainer getContainer();
+
+ /**
+ * @since 4.3
+ */
+ public void setContainer(IManagedContainer container);
+
public InternalCommitManager getCommitManager();
public InternalCommitContext createCommitContext(InternalTransaction transaction);

Back to the top