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
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
-rw-r--r--features/org.eclipse.emf.cdo.tests.hibernate-feature/feature.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawn.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUI.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBot.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/TCPConfigStarter.java2
-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
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.all/src/org/eclipse/emf/cdo/tests/all/GerritTests.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/AllTestsDBDB2NonAudit.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBDerby.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Audit.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2BranchingUUIDs.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2NonAudit.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBHsqldb.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBHsqldbNonAudit.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBMysql.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBPsql.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/AllTestsDBH2Offline.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/AllTestsDBMysqlOffline.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/performance/AllPerformanceTestsH2NonAudit.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db4o/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/AllTestsDB4O.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/AllTestsDB4OMem.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF10
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lissome/src/org/eclipse/emf/cdo/tests/lissome/AllTestsLissome.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mongodb/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/AllTestsMongoDB.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.objectivity/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyAudit.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyBranching.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/SampleTestsObjy.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.ui/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.ui/src/org/eclipse/emf/cdo/tests/ui/AllTestsCDOUISWTBot.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.uml/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.uml/src/org/eclipse/emf/cdo/tests/uml/AllUMLTests.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTests.java16
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMAudit.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranches.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesSSL.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesTCP.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesUUIDs.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMEmbedded.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMLegacy.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMNonAudit.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMOffline.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_381472_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_414949_Test.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IConstants.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IContainerConfig.java31
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IRepositoryConfig.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IScenario.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/ISessionConfig.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java88
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTestSuite.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ContainerConfig.java169
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java39
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/Scenario.java58
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/SessionConfig.java115
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/AllTestsCDODefs.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/AllPerformanceTestsMemStore.java16
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PrintStreamPerformanceRecordAnalyzer.java3
66 files changed, 317 insertions, 458 deletions
diff --git a/features/org.eclipse.emf.cdo.tests.hibernate-feature/feature.xml b/features/org.eclipse.emf.cdo.tests.hibernate-feature/feature.xml
index a6b3492a33..f4bb8d22cb 100644
--- a/features/org.eclipse.emf.cdo.tests.hibernate-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.tests.hibernate-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.tests.hibernate"
label="%featureName"
- version="4.2.0.qualifier"
+ version="4.2.100.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawn.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawn.java
index fdef62befe..8a664cf874 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawn.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawn.java
@@ -38,7 +38,7 @@ public class AllTestsDawn extends AllTests
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, MEM, JVM, NATIVE);
+ addScenario(parent, MEM, JVM, NATIVE);
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUI.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUI.java
index 3d6fc4039e..8387ccf55a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUI.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUI.java
@@ -37,7 +37,7 @@ public class AllTestsDawnUI extends AllTests
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, MEM, TCP, NATIVE);
+ addScenario(parent, MEM, TCP, NATIVE);
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBot.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBot.java
index 477a6cfc40..a391288f7d 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBot.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBot.java
@@ -48,8 +48,8 @@ public class AllTestsDawnUISWTBot extends ConfigTestSuite
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, MEM, TCP, NATIVE);
- addScenario(parent, COMBINED, MEM_BRANCHES, TCP, NATIVE);
+ addScenario(parent, MEM, TCP, NATIVE);
+ addScenario(parent, MEM_BRANCHES, TCP, NATIVE);
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/TCPConfigStarter.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/TCPConfigStarter.java
index c35ef5aac1..5471d79ac7 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/TCPConfigStarter.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/TCPConfigStarter.java
@@ -39,6 +39,6 @@ public class TCPConfigStarter extends AllConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, MEM_BRANCHES, TCP, NATIVE);
+ addScenario(parent, MEM_BRANCHES, TCP, NATIVE);
}
}
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);
diff --git a/plugins/org.eclipse.emf.cdo.tests.all/src/org/eclipse/emf/cdo/tests/all/GerritTests.java b/plugins/org.eclipse.emf.cdo.tests.all/src/org/eclipse/emf/cdo/tests/all/GerritTests.java
index e2fc7e5800..e8fbbd9094 100644
--- a/plugins/org.eclipse.emf.cdo.tests.all/src/org/eclipse/emf/cdo/tests/all/GerritTests.java
+++ b/plugins/org.eclipse.emf.cdo.tests.all/src/org/eclipse/emf/cdo/tests/all/GerritTests.java
@@ -31,6 +31,6 @@ public class GerritTests extends DBConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, new H2Config(true, true, true, false, IDGenerationLocation.STORE), JVM, NATIVE);
+ addScenario(parent, new H2Config(true, true, true, false, IDGenerationLocation.STORE), JVM, NATIVE);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/AllTestsDBDB2NonAudit.java b/plugins/org.eclipse.emf.cdo.tests.db/AllTestsDBDB2NonAudit.java
index 1d29f38bb3..8653fdbdfd 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/AllTestsDBDB2NonAudit.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/AllTestsDBDB2NonAudit.java
@@ -49,7 +49,7 @@ public class AllTestsDBDB2NonAudit extends DBConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, AllTestsDBDB2NonAudit.DB2NonAudit.INSTANCE, JVM, NATIVE);
+ addScenario(parent, AllTestsDBDB2NonAudit.DB2NonAudit.INSTANCE, JVM, NATIVE);
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBDerby.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBDerby.java
index fa0ae333a7..66ab714fd4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBDerby.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBDerby.java
@@ -28,7 +28,7 @@ public class AllTestsDBDerby extends DBConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, new DerbyConfig(true, true, IDGenerationLocation.STORE), JVM, NATIVE);
- // addScenario(parent, COMBINED, AllTestsDBDerby.Derby.INSTANCE, TCP, NATIVE);
+ addScenario(parent, new DerbyConfig(true, true, IDGenerationLocation.STORE), JVM, NATIVE);
+ // addScenario(parent, AllTestsDBDerby.Derby.INSTANCE, TCP, NATIVE);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Audit.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Audit.java
index 0832fd142c..b544ab4db0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Audit.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Audit.java
@@ -30,10 +30,10 @@ public class AllTestsDBH2Audit extends DBConfigs
public static void initConfigSuites(ConfigTestSuite suite, TestSuite parent, IDGenerationLocation idGenerationLocation)
{
// Without ranges
- suite.addScenario(parent, COMBINED, new H2Config(true, false, false, false, idGenerationLocation), JVM, NATIVE);
+ suite.addScenario(parent, new H2Config(true, false, false, false, idGenerationLocation), JVM, NATIVE);
// With ranges
- suite.addScenario(parent, COMBINED, new H2Config(true, false, true, false, idGenerationLocation), JVM, NATIVE);
+ suite.addScenario(parent, new H2Config(true, false, true, false, idGenerationLocation), JVM, NATIVE);
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java
index 8fe0d9ba1f..38ea22dd55 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java
@@ -29,13 +29,13 @@ public class AllTestsDBH2Branching extends DBConfigs
public static void initConfigSuites(ConfigTestSuite suite, TestSuite parent, IDGenerationLocation idGenerationLocation)
{
// Without ranges
- suite.addScenario(parent, COMBINED, new H2Config(true, true, false, false, idGenerationLocation), JVM, NATIVE);
+ suite.addScenario(parent, new H2Config(true, true, false, false, idGenerationLocation), JVM, NATIVE);
// With ranges
- suite.addScenario(parent, COMBINED, new H2Config(true, true, true, false, idGenerationLocation), JVM, NATIVE);
+ suite.addScenario(parent, new H2Config(true, true, true, false, idGenerationLocation), JVM, NATIVE);
// With ranges and copy-on-branch
- // suite.addScenario(parent, COMBINED, new H2Config(true, true, true, true, idGenerationLocation), JVM, NATIVE);
+ // suite.addScenario(parent, new H2Config(true, true, true, true, idGenerationLocation), JVM, NATIVE);
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2BranchingUUIDs.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2BranchingUUIDs.java
index c53e23cd90..2c46aa7c37 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2BranchingUUIDs.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2BranchingUUIDs.java
@@ -28,6 +28,6 @@ public class AllTestsDBH2BranchingUUIDs extends DBConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, new H2Config(true, true, false, false, IDGenerationLocation.CLIENT), JVM, NATIVE);
+ addScenario(parent, new H2Config(true, true, false, false, IDGenerationLocation.CLIENT), JVM, NATIVE);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2NonAudit.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2NonAudit.java
index 155840af2f..6c3299973e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2NonAudit.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2NonAudit.java
@@ -28,7 +28,7 @@ public class AllTestsDBH2NonAudit extends DBConfigs
public static void initConfigSuites(ConfigTestSuite suite, TestSuite parent, IDGenerationLocation idGenerationLocation)
{
- suite.addScenario(parent, COMBINED, new H2Config(false, false, false, false, idGenerationLocation), JVM, NATIVE);
+ suite.addScenario(parent, new H2Config(false, false, false, false, idGenerationLocation), JVM, NATIVE);
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBHsqldb.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBHsqldb.java
index 30697405f0..6c3f5f1f05 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBHsqldb.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBHsqldb.java
@@ -33,7 +33,7 @@ public class AllTestsDBHsqldb extends DBConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, new HsqldbConfig(true, false, IDGenerationLocation.STORE), JVM, NATIVE);
+ addScenario(parent, new HsqldbConfig(true, false, IDGenerationLocation.STORE), JVM, NATIVE);
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBHsqldbNonAudit.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBHsqldbNonAudit.java
index bf8553b658..131b99ebae 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBHsqldbNonAudit.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBHsqldbNonAudit.java
@@ -33,7 +33,7 @@ public class AllTestsDBHsqldbNonAudit extends DBConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, new HsqldbConfig(false, false, IDGenerationLocation.STORE), TCP, NATIVE);
+ addScenario(parent, new HsqldbConfig(false, false, IDGenerationLocation.STORE), TCP, NATIVE);
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBMysql.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBMysql.java
index 319b108c6f..ec4500aa7a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBMysql.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBMysql.java
@@ -36,7 +36,7 @@ public class AllTestsDBMysql extends DBConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, new MysqlConfig(false, false, IDGenerationLocation.STORE), JVM, NATIVE);
+ addScenario(parent, new MysqlConfig(false, false, IDGenerationLocation.STORE), JVM, NATIVE);
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBPsql.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBPsql.java
index 00abaf36b5..5a3b14daee 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBPsql.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBPsql.java
@@ -37,8 +37,8 @@ public class AllTestsDBPsql extends DBConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, new PostgresqlConfig(false, false, IDGenerationLocation.STORE), JVM, NATIVE);
- addScenario(parent, COMBINED, new PostgresqlConfig(true, false, IDGenerationLocation.STORE), JVM, NATIVE);
- addScenario(parent, COMBINED, new PostgresqlConfig(true, true, IDGenerationLocation.STORE), JVM, NATIVE);
+ addScenario(parent, new PostgresqlConfig(false, false, IDGenerationLocation.STORE), JVM, NATIVE);
+ addScenario(parent, new PostgresqlConfig(true, false, IDGenerationLocation.STORE), JVM, NATIVE);
+ addScenario(parent, new PostgresqlConfig(true, true, IDGenerationLocation.STORE), JVM, NATIVE);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/AllTestsDBH2Offline.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/AllTestsDBH2Offline.java
index 4693f269d2..68e36e6e16 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/AllTestsDBH2Offline.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/AllTestsDBH2Offline.java
@@ -45,9 +45,9 @@ public class AllTestsDBH2Offline extends DBConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- // addScenario(parent, COMBINED, new H2OfflineConfig(false, false, IDGenerationLocation.STORE), JVM, NATIVE);
- addScenario(parent, COMBINED, new H2OfflineConfig(false, false, IDGenerationLocation.CLIENT), JVM, NATIVE);
- // addScenario(parent, COMBINED, new H2OfflineConfig(true, false, IDGenerationLocation.STORE), JVM, NATIVE);
+ // addScenario(parent, new H2OfflineConfig(false, false, IDGenerationLocation.STORE), JVM, NATIVE);
+ addScenario(parent, new H2OfflineConfig(false, false, IDGenerationLocation.CLIENT), JVM, NATIVE);
+ // addScenario(parent, new H2OfflineConfig(true, false, IDGenerationLocation.STORE), JVM, NATIVE);
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/AllTestsDBMysqlOffline.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/AllTestsDBMysqlOffline.java
index 1087264d50..412b3ebdac 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/AllTestsDBMysqlOffline.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/AllTestsDBMysqlOffline.java
@@ -45,9 +45,9 @@ public class AllTestsDBMysqlOffline extends DBConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- // addScenario(parent, COMBINED, new MysqlOfflineConfig(false, false, IDGenerationLocation.STORE), JVM, NATIVE);
- addScenario(parent, COMBINED, new MysqlOfflineConfig(false, false, IDGenerationLocation.CLIENT), JVM, NATIVE);
- // addScenario(parent, COMBINED, new MysqlOfflineConfig(true, false, IDGenerationLocation.STORE), JVM, NATIVE);
+ // addScenario(parent, new MysqlOfflineConfig(false, false, IDGenerationLocation.STORE), JVM, NATIVE);
+ addScenario(parent, new MysqlOfflineConfig(false, false, IDGenerationLocation.CLIENT), JVM, NATIVE);
+ // addScenario(parent, new MysqlOfflineConfig(true, false, IDGenerationLocation.STORE), JVM, NATIVE);
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/performance/AllPerformanceTestsH2NonAudit.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/performance/AllPerformanceTestsH2NonAudit.java
index 460484ae65..46714c0fe3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/performance/AllPerformanceTestsH2NonAudit.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/performance/AllPerformanceTestsH2NonAudit.java
@@ -30,6 +30,6 @@ public class AllPerformanceTestsH2NonAudit extends AllPerformanceTests
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, new H2Config(false, false, false, false, IDGenerationLocation.STORE), JVM, NATIVE);
+ addScenario(parent, new H2Config(false, false, false, false, IDGenerationLocation.STORE), JVM, NATIVE);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests.db4o/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.db4o/META-INF/MANIFEST.MF
index 7c556deaab..19ccca9ab4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db4o/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.db4o/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.tests.db4o
-Bundle-Version: 4.0.200.qualifier
+Bundle-Version: 4.0.300.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.emf.cdo.tests;bundle-version="[4.0.0,5.0.0)",
org.eclipse.emf.cdo.server.db4o;bundle-version="[4.0.0,5.0.0)"
Bundle-Vendor: %providerName
-Export-Package: org.eclipse.emf.cdo.tests.db4o;version="4.0.200";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.tests.db4o;version="4.0.300";x-internal:=true
Bundle-Localization: plugin
Import-Package: com.db4o;version="[7.4.0,8.0.0)",
com.db4o.ext;version="[7.4.0,8.0.0)"
diff --git a/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/AllTestsDB4O.java b/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/AllTestsDB4O.java
index ba1ab61c33..c47c190b67 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/AllTestsDB4O.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/AllTestsDB4O.java
@@ -37,7 +37,7 @@ public class AllTestsDB4O extends AllConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, new DB4OConfig(false), JVM, NATIVE);
+ addScenario(parent, new DB4OConfig(false), JVM, NATIVE);
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/AllTestsDB4OMem.java b/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/AllTestsDB4OMem.java
index 8e74df660a..3561038ee4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/AllTestsDB4OMem.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/AllTestsDB4OMem.java
@@ -26,6 +26,6 @@ public class AllTestsDB4OMem extends AllTestsDB4O
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, new DB4OConfig(true), JVM, NATIVE);
+ addScenario(parent, new DB4OConfig(true), JVM, NATIVE);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF
index ccea76679e..c35d114db6 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.tests.hibernate;singleton:=true
-Bundle-Version: 4.1.100.qualifier
+Bundle-Version: 4.1.200.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -21,10 +21,10 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.dom4j;bundle-version="[1.6.1,2.0.0)",
javax.persistence;bundle-version="[2.0.0,3.0.0)"
Export-Package: mappings;version="4.1.100";x-friends:="org.eclipse.emf.cdo.tests.hudson",
- org.eclipse.emf.cdo.tests.hibernate;version="4.1.100";x-friends:="org.eclipse.emf.cdo.tests.hudson",
- org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest;version="4.1.100",
- org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl;version="4.1.100",
- org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.util;version="4.1.100"
+ org.eclipse.emf.cdo.tests.hibernate;version="4.1.200";x-friends:="org.eclipse.emf.cdo.tests.hudson",
+ org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest;version="4.1.200",
+ org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl;version="4.1.200",
+ org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.util;version="4.1.200"
Import-Package: org.hibernate.cfg;version="[4.0.0,5.0.0)",
org.eclipse.emf.teneo;version="[2.0.1,3.0.0)",
org.eclipse.emf.cdo.server.hibernate;version="[4.0.0,5.0.0)",
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java
index 8068e16f5e..cbbec40141 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java
@@ -70,8 +70,8 @@ public class AllTestsHibernate extends AllConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, HibernateConfig.INSTANCE, JVM, NATIVE);
- addScenario(parent, COMBINED, HibernateConfig.AUDIT_INSTANCE, JVM, NATIVE);
+ addScenario(parent, HibernateConfig.INSTANCE, JVM, NATIVE);
+ addScenario(parent, HibernateConfig.AUDIT_INSTANCE, JVM, NATIVE);
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.lissome/src/org/eclipse/emf/cdo/tests/lissome/AllTestsLissome.java b/plugins/org.eclipse.emf.cdo.tests.lissome/src/org/eclipse/emf/cdo/tests/lissome/AllTestsLissome.java
index 1d31b9aed1..0eaa59d4f0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.lissome/src/org/eclipse/emf/cdo/tests/lissome/AllTestsLissome.java
+++ b/plugins/org.eclipse.emf.cdo.tests.lissome/src/org/eclipse/emf/cdo/tests/lissome/AllTestsLissome.java
@@ -28,6 +28,6 @@ public class AllTestsLissome extends AllConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, LissomeConfig.INSTANCE, JVM, NATIVE);
+ addScenario(parent, LissomeConfig.INSTANCE, JVM, NATIVE);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests.mongodb/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.mongodb/META-INF/MANIFEST.MF
index 6a60aed4cc..a5c6b136f4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mongodb/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.mongodb/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.tests.mongodb;singleton:=true
-Bundle-Version: 4.0.200.qualifier
+Bundle-Version: 4.0.300.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -20,5 +20,5 @@ Import-Package: com.mongodb;version="[2.0.0,3.0.0)",
org.bson.io;version="[2.0.0,3.0.0)",
org.bson.types;version="[2.0.0,3.0.0)",
org.bson.util;version="[2.0.0,3.0.0)"
-Export-Package: org.eclipse.emf.cdo.tests.mongodb;version="4.0.200";x-internal:=true,
- org.eclipse.emf.cdo.tests.mongodb.bundle;version="4.0.200";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.tests.mongodb;version="4.0.300";x-internal:=true,
+ org.eclipse.emf.cdo.tests.mongodb.bundle;version="4.0.300";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/AllTestsMongoDB.java b/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/AllTestsMongoDB.java
index 20bb698ea6..3983e0b68a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/AllTestsMongoDB.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/AllTestsMongoDB.java
@@ -35,9 +35,9 @@ public class AllTestsMongoDB extends AllConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, new MongoDBConfig(false, false, IDGenerationLocation.STORE), JVM, NATIVE);
- addScenario(parent, COMBINED, new MongoDBConfig(true, false, IDGenerationLocation.STORE), JVM, NATIVE);
- // addScenario(parent, COMBINED, MongoDBStoreRepositoryConfig.BRANCHING, JVM, NATIVE);
+ addScenario(parent, new MongoDBConfig(false, false, IDGenerationLocation.STORE), JVM, NATIVE);
+ addScenario(parent, new MongoDBConfig(true, false, IDGenerationLocation.STORE), JVM, NATIVE);
+ // addScenario(parent, MongoDBStoreRepositoryConfig.BRANCHING, JVM, NATIVE);
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.objectivity/META-INF/MANIFEST.MF
index 7d93626e6f..a97b4be7e8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.objectivity/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.tests.objectivity;singleton:=true
-Bundle-Version: 4.0.200.qualifier
+Bundle-Version: 4.0.300.qualifier
Require-Bundle: org.eclipse.emf.cdo.server.objectivity;bundle-version="[4.0.0,5.0.0)",
org.eclipse.emf.cdo.tests;bundle-version="[4.0.0,5.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -18,4 +18,4 @@ Import-Package: com.objy.as;version="[4.0.0,5.0.0)",
com.objy.pm.asapp;version="[4.0.0,5.0.0)",
com.objy.pm.asexcep;version="[4.0.0,5.0.0)",
com.objy.pm.tmi;version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.emf.cdo.tests.objectivity;version="4.0.200";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.tests.objectivity;version="4.0.300";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyAudit.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyAudit.java
index 1033e2a49a..61e5be9dfc 100644
--- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyAudit.java
+++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyAudit.java
@@ -27,6 +27,6 @@ public class AllTestsObjyAudit extends ObjyDBConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, new ObjyConfig(true, false), JVM, NATIVE);
+ addScenario(parent, new ObjyConfig(true, false), JVM, NATIVE);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyBranching.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyBranching.java
index 9e654b429c..6439067302 100644
--- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyBranching.java
+++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyBranching.java
@@ -27,6 +27,6 @@ public class AllTestsObjyBranching extends ObjyDBConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, new ObjyConfig(true, true), JVM, NATIVE);
+ addScenario(parent, new ObjyConfig(true, true), JVM, NATIVE);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java
index d744a3d352..314049a47f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java
+++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java
@@ -33,7 +33,7 @@ public class AllTestsObjyNonAudit extends ObjyDBConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, new ObjyConfig(false, false), JVM, NATIVE);
+ addScenario(parent, new ObjyConfig(false, false), JVM, NATIVE);
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/SampleTestsObjy.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/SampleTestsObjy.java
index 11e142bf6e..98df84415f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/SampleTestsObjy.java
+++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/SampleTestsObjy.java
@@ -39,7 +39,7 @@ public class SampleTestsObjy extends ObjyDBConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, new ObjyConfig(false, false), JVM, NATIVE);
+ addScenario(parent, new ObjyConfig(false, false), JVM, NATIVE);
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.ui/META-INF/MANIFEST.MF
index cd45041b29..2328937e20 100644
--- a/plugins/org.eclipse.emf.cdo.tests.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.ui/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.tests.ui;singleton:=true
-Bundle-Version: 4.0.200.qualifier
+Bundle-Version: 4.0.300.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -19,5 +19,5 @@ Require-Bundle: org.eclipse.emf.cdo.server.db;bundle-version="[4.0.0,5.0.0)";vis
org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)",
org.eclipse.emf.cdo.tests;bundle-version="[4.0.0,5.0.0)"
Eclipse-BuddyPolicy:
-Export-Package: org.eclipse.emf.cdo.tests.ui;version="4.0.200";x-friends:="org.eclipse.emf.cdo.dawn.tests",
- org.eclipse.emf.cdo.tests.ui.bundle;version="4.0.200";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.tests.ui;version="4.0.300";x-friends:="org.eclipse.emf.cdo.dawn.tests",
+ org.eclipse.emf.cdo.tests.ui.bundle;version="4.0.300";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.tests.ui/src/org/eclipse/emf/cdo/tests/ui/AllTestsCDOUISWTBot.java b/plugins/org.eclipse.emf.cdo.tests.ui/src/org/eclipse/emf/cdo/tests/ui/AllTestsCDOUISWTBot.java
index 7b079d1576..ed577a9910 100644
--- a/plugins/org.eclipse.emf.cdo.tests.ui/src/org/eclipse/emf/cdo/tests/ui/AllTestsCDOUISWTBot.java
+++ b/plugins/org.eclipse.emf.cdo.tests.ui/src/org/eclipse/emf/cdo/tests/ui/AllTestsCDOUISWTBot.java
@@ -34,10 +34,10 @@ public class AllTestsCDOUISWTBot extends ConfigTestSuite
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, MEM, TCP, NATIVE);
- addScenario(parent, COMBINED, MEM_BRANCHES, TCP, NATIVE);
- addScenario(parent, COMBINED, MEM_BRANCHES, TCP, LEGACY);
- addScenario(parent, COMBINED, MEM_BRANCHES, TCP, LEGACY);
+ addScenario(parent, MEM, TCP, NATIVE);
+ addScenario(parent, MEM_BRANCHES, TCP, NATIVE);
+ addScenario(parent, MEM_BRANCHES, TCP, LEGACY);
+ addScenario(parent, MEM_BRANCHES, TCP, LEGACY);
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.uml/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.uml/META-INF/MANIFEST.MF
index ecc1470692..3d06e52a11 100644
--- a/plugins/org.eclipse.emf.cdo.tests.uml/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.uml/META-INF/MANIFEST.MF
@@ -3,11 +3,11 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.emf.cdo.tests.uml;singleton:=true
-Bundle-Version: 4.2.0.qualifier
+Bundle-Version: 4.2.100.qualifier
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.emf.cdo.tests;bundle-version="[4.0.0,5.0.0)",
org.eclipse.emf.cdo;bundle-version="[4.2.0,5.0.0)",
org.eclipse.uml2.uml;bundle-version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.emf.cdo.tests.uml;version="4.2.0"
+Export-Package: org.eclipse.emf.cdo.tests.uml;version="4.2.100"
diff --git a/plugins/org.eclipse.emf.cdo.tests.uml/src/org/eclipse/emf/cdo/tests/uml/AllUMLTests.java b/plugins/org.eclipse.emf.cdo.tests.uml/src/org/eclipse/emf/cdo/tests/uml/AllUMLTests.java
index e25f0a7328..eea8d050dc 100644
--- a/plugins/org.eclipse.emf.cdo.tests.uml/src/org/eclipse/emf/cdo/tests/uml/AllUMLTests.java
+++ b/plugins/org.eclipse.emf.cdo.tests.uml/src/org/eclipse/emf/cdo/tests/uml/AllUMLTests.java
@@ -32,9 +32,9 @@ public class AllUMLTests extends ConfigTestSuite
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, MEM, JVM, LEGACY);
- addScenario(parent, COMBINED, MEM_AUDITS, JVM, LEGACY);
- addScenario(parent, COMBINED, MEM_BRANCHES, JVM, LEGACY);
+ addScenario(parent, MEM, JVM, LEGACY);
+ addScenario(parent, MEM_AUDITS, JVM, LEGACY);
+ addScenario(parent, MEM_BRANCHES, JVM, LEGACY);
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java
index f5a2357ea4..7d679e4a67 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java
@@ -126,6 +126,6 @@ public class AllConfigs extends ConfigTestSuite
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, MEM_BRANCHES, JVM, NATIVE);
+ addScenario(parent, MEM_BRANCHES, JVM, NATIVE);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTests.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTests.java
index 81b32da7ea..9f77ee8861 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTests.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTests.java
@@ -26,15 +26,15 @@ public class AllTests extends AllConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, MEM, JVM, NATIVE);
- addScenario(parent, COMBINED, MEM_AUDITS, JVM, NATIVE);
- addScenario(parent, COMBINED, MEM_BRANCHES, JVM, NATIVE);
- addScenario(parent, COMBINED, MEM_BRANCHES_UUIDS, JVM, NATIVE);
+ addScenario(parent, MEM, JVM, NATIVE);
+ addScenario(parent, MEM_AUDITS, JVM, NATIVE);
+ addScenario(parent, MEM_BRANCHES, JVM, NATIVE);
+ addScenario(parent, MEM_BRANCHES_UUIDS, JVM, NATIVE);
- addScenario(parent, COMBINED, MEM, JVM, LEGACY);
- addScenario(parent, COMBINED, MEM_AUDITS, JVM, LEGACY);
- addScenario(parent, COMBINED, MEM_BRANCHES, JVM, LEGACY);
+ addScenario(parent, MEM, JVM, LEGACY);
+ addScenario(parent, MEM_AUDITS, JVM, LEGACY);
+ addScenario(parent, MEM_BRANCHES, JVM, LEGACY);
- addScenario(parent, COMBINED, MEM_BRANCHES, TCP, NATIVE);
+ addScenario(parent, MEM_BRANCHES, TCP, NATIVE);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMAudit.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMAudit.java
index 1bfe9e9fd1..6b188fc9a6 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMAudit.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMAudit.java
@@ -26,6 +26,6 @@ public class AllTestsMEMAudit extends AllConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, MEM_AUDITS, JVM, NATIVE);
+ addScenario(parent, MEM_AUDITS, JVM, NATIVE);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranches.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranches.java
index 56d7cb40cc..08576d313c 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranches.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranches.java
@@ -26,6 +26,6 @@ public class AllTestsMEMBranches extends AllConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, MEM_BRANCHES, JVM, NATIVE);
+ addScenario(parent, MEM_BRANCHES, JVM, NATIVE);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesSSL.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesSSL.java
index 8632da1ef6..65d1dd7ae2 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesSSL.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesSSL.java
@@ -26,6 +26,6 @@ public class AllTestsMEMBranchesSSL extends AllConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, SEPARATED, MEM_BRANCHES, SSL, NATIVE);
+ addScenario(parent, MEM_BRANCHES, SSL, NATIVE);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesTCP.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesTCP.java
index c63a7405c0..5b16e680a3 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesTCP.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesTCP.java
@@ -26,6 +26,6 @@ public class AllTestsMEMBranchesTCP extends AllConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, MEM_BRANCHES, TCP, NATIVE);
+ addScenario(parent, MEM_BRANCHES, TCP, NATIVE);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesUUIDs.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesUUIDs.java
index 0085159336..5f8eea2fa9 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesUUIDs.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesUUIDs.java
@@ -26,6 +26,6 @@ public class AllTestsMEMBranchesUUIDs extends AllConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, MEM_BRANCHES_UUIDS, JVM, NATIVE);
+ addScenario(parent, MEM_BRANCHES_UUIDS, JVM, NATIVE);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMEmbedded.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMEmbedded.java
index a496fc9b36..609d634dfb 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMEmbedded.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMEmbedded.java
@@ -28,6 +28,6 @@ public class AllTestsMEMEmbedded extends AllConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, MEM, EMBEDDED, NATIVE);
+ addScenario(parent, MEM, EMBEDDED, NATIVE);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMLegacy.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMLegacy.java
index 5e88306ff7..1f01f63466 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMLegacy.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMLegacy.java
@@ -26,8 +26,8 @@ public class AllTestsMEMLegacy extends AllConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, MEM, JVM, LEGACY);
- addScenario(parent, COMBINED, MEM_AUDITS, JVM, LEGACY);
- addScenario(parent, COMBINED, MEM_BRANCHES, JVM, LEGACY);
+ addScenario(parent, MEM, JVM, LEGACY);
+ addScenario(parent, MEM_AUDITS, JVM, LEGACY);
+ addScenario(parent, MEM_BRANCHES, JVM, LEGACY);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMNonAudit.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMNonAudit.java
index 4f3be3fb43..74c87bc034 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMNonAudit.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMNonAudit.java
@@ -26,6 +26,6 @@ public class AllTestsMEMNonAudit extends AllConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, MEM, JVM, NATIVE);
+ addScenario(parent, MEM, JVM, NATIVE);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMOffline.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMOffline.java
index 5fdab672bf..a24ec710db 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMOffline.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMOffline.java
@@ -36,7 +36,7 @@ public class AllTestsMEMOffline extends AllConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, MEM_OFFLINE, JVM, NATIVE);
+ addScenario(parent, MEM_OFFLINE, JVM, NATIVE);
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_381472_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_381472_Test.java
index 66b14e30be..b6753b7e20 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_381472_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_381472_Test.java
@@ -63,7 +63,7 @@ public class Bugzilla_381472_Test extends AbstractCDOTest
{
getRepository();
- IManagedContainer serverContainer = getContainerConfig().getServerContainer();
+ IManagedContainer serverContainer = getServerContainer();
serverContainer.registerFactory(new CDOAdminHandler.Factory(ADMIN_HANDLER_TYPE)
{
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_414949_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_414949_Test.java
index 8d1b6f0e17..490cc71ff3 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_414949_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_414949_Test.java
@@ -41,7 +41,6 @@ import java.util.Collections;
@Requires(IModelConfig.CAPABILITY_LEGACY)
public class Bugzilla_414949_Test extends AbstractCDOTest
{
-
private static final String SHARED_RESOURCE_NAME = "sharedResource.aird";
private static final String LOCAL_RESOURCE_NAME = "localResource.xmi";
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IConstants.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IConstants.java
index 1dac697363..5a0db7faf6 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IConstants.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IConstants.java
@@ -11,7 +11,6 @@
package org.eclipse.emf.cdo.tests.config;
import org.eclipse.emf.cdo.common.CDOCommonRepository.IDGenerationLocation;
-import org.eclipse.emf.cdo.tests.config.impl.ContainerConfig;
import org.eclipse.emf.cdo.tests.config.impl.ModelConfig;
import org.eclipse.emf.cdo.tests.config.impl.RepositoryConfig;
import org.eclipse.emf.cdo.tests.config.impl.RepositoryConfig.MEMConfig;
@@ -24,10 +23,6 @@ import org.eclipse.emf.cdo.tests.config.impl.SessionConfig.Net4j;
*/
public interface IConstants
{
- public static final ContainerConfig COMBINED = ContainerConfig.Combined.INSTANCE;
-
- public static final ContainerConfig SEPARATED = ContainerConfig.Separated.INSTANCE;
-
public static final RepositoryConfig MEM = new MEMConfig(false, false, IDGenerationLocation.STORE);
public static final RepositoryConfig MEM_AUDITS = new MEMConfig(true, false, IDGenerationLocation.STORE);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IContainerConfig.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IContainerConfig.java
deleted file mode 100644
index 34604ab060..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IContainerConfig.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2008, 2011, 2012 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Eike Stepper - initial API and implementation
- */
-package org.eclipse.emf.cdo.tests.config;
-
-import org.eclipse.net4j.util.container.IManagedContainer;
-
-/**
- * @author Eike Stepper
- */
-public interface IContainerConfig extends IConfig
-{
- public static final String CAPABILITY_COMBINED = "containers.combined";
-
- public static final String CAPABILITY_SEPARATED = "containers.separated";
-
- public boolean hasClientContainer();
-
- public boolean hasServerContainer();
-
- public IManagedContainer getClientContainer();
-
- public IManagedContainer getServerContainer();
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IRepositoryConfig.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IRepositoryConfig.java
index 7a3cdff703..0f80b06485 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IRepositoryConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IRepositoryConfig.java
@@ -15,6 +15,8 @@ import org.eclipse.emf.cdo.server.IRepositoryProvider;
import org.eclipse.emf.cdo.server.IStore;
import org.eclipse.emf.cdo.spi.server.InternalRepository;
+import org.eclipse.net4j.util.container.IManagedContainer;
+
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
@@ -39,6 +41,10 @@ public interface IRepositoryConfig extends IConfig, IRepositoryProvider
public static final String CAPABILITY_RESTARTABLE = "repository.restartable";
+ public IManagedContainer getServerContainer();
+
+ public boolean hasServerContainer();
+
public boolean isSupportingAudits();
public boolean isSupportingBranches();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IScenario.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IScenario.java
index 24d7f8b5da..5333dcbdd1 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IScenario.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IScenario.java
@@ -18,10 +18,6 @@ import java.util.Set;
*/
public interface IScenario extends ITestLifecycle, Serializable
{
- public IContainerConfig getContainerConfig();
-
- public IScenario setContainerConfig(IContainerConfig containerConfig);
-
public IRepositoryConfig getRepositoryConfig();
public IScenario setRepositoryConfig(IRepositoryConfig repositoryConfig);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/ISessionConfig.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/ISessionConfig.java
index c8abc66e31..8ab7bdbb2f 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/ISessionConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/ISessionConfig.java
@@ -12,6 +12,8 @@ package org.eclipse.emf.cdo.tests.config;
import org.eclipse.emf.cdo.session.CDOSession;
+import org.eclipse.net4j.util.container.IManagedContainer;
+
/**
* @author Eike Stepper
*/
@@ -27,6 +29,10 @@ public interface ISessionConfig extends IConfig
public static final String CAPABILITY_NET4J_SSL = "session.net4j.ssl";
+ public IManagedContainer getClientContainer();
+
+ public boolean hasClientContainer();
+
public void startTransport() throws Exception;
public void stopTransport() throws Exception;
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java
index b703966ba6..3c8cbe923d 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java
@@ -25,7 +25,6 @@ import org.eclipse.emf.cdo.spi.server.InternalStore.NoLargeObjects;
import org.eclipse.emf.cdo.spi.server.InternalStore.NoQueryXRefs;
import org.eclipse.emf.cdo.spi.server.InternalStore.NoRawAccess;
import org.eclipse.emf.cdo.tests.config.IConstants;
-import org.eclipse.emf.cdo.tests.config.IContainerConfig;
import org.eclipse.emf.cdo.tests.config.IModelConfig;
import org.eclipse.emf.cdo.tests.config.IRepositoryConfig;
import org.eclipse.emf.cdo.tests.config.IScenario;
@@ -173,76 +172,46 @@ public abstract class ConfigTest extends AbstractOMTest implements IConstants
}
// /////////////////////////////////////////////////////////////////////////
- // //////////////////////// Container //////////////////////////////////////
+ // //////////////////////// Repository /////////////////////////////////////
/**
- * @category Container
+ * @category Repository
*/
- public IContainerConfig getContainerConfig()
+ public IRepositoryConfig getRepositoryConfig()
{
IScenario scenario = getScenario();
- return scenario.getContainerConfig();
+ return scenario.getRepositoryConfig();
}
/**
- * @category Container
+ * @category Repository
*/
- public boolean hasClientContainer()
+ public Map<String, String> getRepositoryProperties()
{
- IContainerConfig containerConfig = getContainerConfig();
- return containerConfig.hasClientContainer();
+ IRepositoryConfig repositoryConfig = getRepositoryConfig();
+ return repositoryConfig.getRepositoryProperties();
}
/**
- * @category Container
+ * @category repositoryConfig
*/
public boolean hasServerContainer()
{
- IContainerConfig containerConfig = getContainerConfig();
- return containerConfig.hasServerContainer();
- }
-
- /**
- * @category Container
- */
- public IManagedContainer getClientContainer()
- {
- IContainerConfig containerConfig = getContainerConfig();
- return containerConfig.getClientContainer();
+ IRepositoryConfig repositoryConfig = getRepositoryConfig();
+ return repositoryConfig.hasServerContainer();
}
/**
- * @category Container
+ * @category repositoryConfig
*/
public IManagedContainer getServerContainer()
{
- IContainerConfig containerConfig = getContainerConfig();
- return containerConfig.getServerContainer();
- }
-
- // /////////////////////////////////////////////////////////////////////////
- // //////////////////////// CDORepositoryInfo /////////////////////////////////////
-
- /**
- * @category CDORepositoryInfo
- */
- public IRepositoryConfig getRepositoryConfig()
- {
- IScenario scenario = getScenario();
- return scenario.getRepositoryConfig();
- }
-
- /**
- * @category CDORepositoryInfo
- */
- public Map<String, String> getRepositoryProperties()
- {
IRepositoryConfig repositoryConfig = getRepositoryConfig();
- return repositoryConfig.getRepositoryProperties();
+ return repositoryConfig.getServerContainer();
}
/**
- * @category CDORepositoryInfo
+ * @category Repository
*/
public InternalRepository getRepository(String name, boolean activate)
{
@@ -251,7 +220,7 @@ public abstract class ConfigTest extends AbstractOMTest implements IConstants
}
/**
- * @category CDORepositoryInfo
+ * @category Repository
*/
public InternalRepository getRepository(String name)
{
@@ -260,7 +229,7 @@ public abstract class ConfigTest extends AbstractOMTest implements IConstants
}
/**
- * @category CDORepositoryInfo
+ * @category Repository
*/
public InternalRepository getRepository()
{
@@ -311,6 +280,24 @@ public abstract class ConfigTest extends AbstractOMTest implements IConstants
/**
* @category Session
*/
+ public boolean hasClientContainer()
+ {
+ ISessionConfig sessionConfig = getSessionConfig();
+ return sessionConfig.hasClientContainer();
+ }
+
+ /**
+ * @category Session
+ */
+ public IManagedContainer getClientContainer()
+ {
+ ISessionConfig sessionConfig = getSessionConfig();
+ return sessionConfig.getClientContainer();
+ }
+
+ /**
+ * @category Session
+ */
public void startTransport() throws Exception
{
ISessionConfig sessionConfig = getSessionConfig();
@@ -565,8 +552,8 @@ public abstract class ConfigTest extends AbstractOMTest implements IConstants
@Override
public String toString()
{
- return MessageFormat.format("{0}.{1} [{2}, {3}, {4}, {5}]", getClass().getSimpleName(), getName(),
- getContainerConfig(), getRepositoryConfig(), getSessionConfig(), getModelConfig());
+ return MessageFormat.format("{0}.{1} [{2}, {3}, {4}]", getClass().getSimpleName(), getName(),
+ getRepositoryConfig(), getSessionConfig(), getModelConfig());
}
@Override
@@ -637,8 +624,7 @@ public abstract class ConfigTest extends AbstractOMTest implements IConstants
protected boolean isConfig(Config config)
{
- return ObjectUtil.equals(getContainerConfig(), config) //
- || ObjectUtil.equals(getRepositoryConfig(), config) //
+ return ObjectUtil.equals(getRepositoryConfig(), config) //
|| ObjectUtil.equals(getSessionConfig(), config) //
|| ObjectUtil.equals(getModelConfig(), config);
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTestSuite.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTestSuite.java
index 769a485a14..d69d5f5428 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTestSuite.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTestSuite.java
@@ -52,11 +52,10 @@ public abstract class ConfigTestSuite implements IConstants
return suite;
}
- public void addScenario(TestSuite parent, ContainerConfig containerConfig, RepositoryConfig repositoryConfig,
- SessionConfig sessionConfig, ModelConfig modelConfig)
+ public void addScenario(TestSuite parent, RepositoryConfig repositoryConfig, SessionConfig sessionConfig,
+ ModelConfig modelConfig)
{
IScenario scenario = new Scenario();
- scenario.setContainerConfig(containerConfig);
scenario.setRepositoryConfig(repositoryConfig);
scenario.setSessionConfig(sessionConfig);
scenario.setModelConfig(modelConfig);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ContainerConfig.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ContainerConfig.java
deleted file mode 100644
index 6656b257e9..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ContainerConfig.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011, 2012 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Eike Stepper - initial API and implementation
- */
-package org.eclipse.emf.cdo.tests.config.impl;
-
-import org.eclipse.emf.cdo.net4j.CDONet4jUtil;
-import org.eclipse.emf.cdo.server.net4j.CDONet4jServerUtil;
-import org.eclipse.emf.cdo.tests.config.IContainerConfig;
-
-import org.eclipse.net4j.Net4jUtil;
-import org.eclipse.net4j.util.container.ContainerUtil;
-import org.eclipse.net4j.util.container.IManagedContainer;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public abstract class ContainerConfig extends Config implements IContainerConfig
-{
- private static final long serialVersionUID = 1L;
-
- protected transient IManagedContainer clientContainer;
-
- protected transient IManagedContainer serverContainer;
-
- public ContainerConfig(String name)
- {
- super(name);
- }
-
- public boolean hasClientContainer()
- {
- return clientContainer != null;
- }
-
- public boolean hasServerContainer()
- {
- return serverContainer != null;
- }
-
- @Override
- public void tearDown() throws Exception
- {
- LifecycleUtil.deactivate(clientContainer);
- clientContainer = null;
-
- LifecycleUtil.deactivate(serverContainer);
- serverContainer = null;
-
- super.tearDown();
- }
-
- /**
- * @author Eike Stepper
- */
- public static final class Combined extends ContainerConfig
- {
- public static final String NAME = "Combined";
-
- public static final Combined INSTANCE = new Combined();
-
- private static final long serialVersionUID = 1L;
-
- public Combined()
- {
- super(NAME);
- }
-
- public void initCapabilities(Set<String> capabilities)
- {
- capabilities.add(CAPABILITY_COMBINED);
- }
-
- public synchronized IManagedContainer getClientContainer()
- {
- if (clientContainer == null)
- {
- clientContainer = createContainer();
- LifecycleUtil.activate(clientContainer);
- serverContainer = clientContainer;
- }
-
- return clientContainer;
- }
-
- public IManagedContainer getServerContainer()
- {
- return getClientContainer();
- }
-
- private IManagedContainer createContainer()
- {
- IManagedContainer container = ContainerUtil.createContainer();
- Net4jUtil.prepareContainer(container);
- CDONet4jUtil.prepareContainer(container);
- CDONet4jServerUtil.prepareContainer(container);
- return container;
- }
- }
-
- /**
- * @author Eike Stepper
- */
- public static final class Separated extends ContainerConfig
- {
- public static final String NAME = "Separated";
-
- public static final Separated INSTANCE = new Separated();
-
- private static final long serialVersionUID = 1L;
-
- public Separated()
- {
- super(NAME);
- }
-
- public void initCapabilities(Set<String> capabilities)
- {
- capabilities.add(CAPABILITY_SEPARATED);
- }
-
- public synchronized IManagedContainer getClientContainer()
- {
- if (clientContainer == null)
- {
- clientContainer = createClientContainer();
- LifecycleUtil.activate(clientContainer);
- }
-
- return clientContainer;
- }
-
- public synchronized IManagedContainer getServerContainer()
- {
- if (serverContainer == null)
- {
- serverContainer = createServerContainer();
- LifecycleUtil.activate(serverContainer);
- }
-
- return serverContainer;
- }
-
- private IManagedContainer createClientContainer()
- {
- IManagedContainer container = ContainerUtil.createContainer();
- Net4jUtil.prepareContainer(container);
- CDONet4jUtil.prepareContainer(container);
- return container;
- }
-
- private IManagedContainer createServerContainer()
- {
- IManagedContainer container = ContainerUtil.createContainer();
- Net4jUtil.prepareContainer(container);
- CDONet4jServerUtil.prepareContainer(container);
- return container;
- }
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java
index e33643bbc6..2cf683fdc9 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java
@@ -45,7 +45,6 @@ import org.eclipse.emf.cdo.server.spi.security.InternalSecurityManager;
import org.eclipse.emf.cdo.session.CDOSessionConfigurationFactory;
import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
-import org.eclipse.emf.cdo.spi.server.ContainerQueryHandlerProvider;
import org.eclipse.emf.cdo.spi.server.InternalRepository;
import org.eclipse.emf.cdo.spi.server.InternalRepositorySynchronizer;
import org.eclipse.emf.cdo.spi.server.InternalSessionManager;
@@ -65,6 +64,7 @@ import org.eclipse.net4j.jvm.JVMUtil;
import org.eclipse.net4j.util.ObjectUtil;
import org.eclipse.net4j.util.ReflectUtil;
import org.eclipse.net4j.util.concurrent.ConcurrencyUtil;
+import org.eclipse.net4j.util.container.ContainerUtil;
import org.eclipse.net4j.util.container.IManagedContainer;
import org.eclipse.net4j.util.event.IEvent;
import org.eclipse.net4j.util.event.IListener;
@@ -119,6 +119,8 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf
private static final long serialVersionUID = 1L;
+ protected static IManagedContainer serverContainer;
+
protected static Map<String, InternalRepository> repositories;
private static String lastRepoProps;
@@ -219,6 +221,30 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf
return restarting;
}
+ public boolean hasServerContainer()
+ {
+ return serverContainer != null;
+ }
+
+ public IManagedContainer getServerContainer()
+ {
+ if (serverContainer == null)
+ {
+ serverContainer = createServerContainer();
+ LifecycleUtil.activate(serverContainer);
+ }
+
+ return serverContainer;
+ }
+
+ protected IManagedContainer createServerContainer()
+ {
+ IManagedContainer container = ContainerUtil.createContainer();
+ Net4jUtil.prepareContainer(container);
+ CDONet4jServerUtil.prepareContainer(container);
+ return container;
+ }
+
public Map<String, String> getRepositoryProperties()
{
Map<String, String> repositoryProperties = new HashMap<String, String>();
@@ -309,8 +335,8 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf
}
}
- IManagedContainer serverContainer = getCurrentTest().getServerContainer();
- repository.setQueryHandlerProvider(new ContainerQueryHandlerProvider(serverContainer));
+ IManagedContainer serverContainer = getServerContainer();
+ repository.setContainer(serverContainer);
registerRepository(repository);
if (activate)
@@ -333,7 +359,6 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf
}
addResourcePathChecker(repository);
-
return repository;
}
@@ -473,6 +498,12 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf
repositories = null;
StoreThreadLocal.release();
+
+ if (serverContainer != null)
+ {
+ LifecycleUtil.deactivate(serverContainer);
+ serverContainer = null;
+ }
}
protected void resetRepositories()
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/Scenario.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/Scenario.java
index 4b0fd77b7e..09a96b7e7a 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/Scenario.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/Scenario.java
@@ -12,7 +12,6 @@ package org.eclipse.emf.cdo.tests.config.impl;
import org.eclipse.emf.cdo.tests.config.IConfig;
import org.eclipse.emf.cdo.tests.config.IConstants;
-import org.eclipse.emf.cdo.tests.config.IContainerConfig;
import org.eclipse.emf.cdo.tests.config.IModelConfig;
import org.eclipse.emf.cdo.tests.config.IRepositoryConfig;
import org.eclipse.emf.cdo.tests.config.IScenario;
@@ -40,8 +39,6 @@ public class Scenario implements IScenario
private static final long serialVersionUID = 1L;
- private IContainerConfig containerConfig;
-
private IRepositoryConfig repositoryConfig;
private ISessionConfig sessionConfig;
@@ -56,32 +53,13 @@ public class Scenario implements IScenario
{
}
- public Scenario(IContainerConfig containerConfig, IRepositoryConfig repositoryConfig, ISessionConfig sessionConfig,
- IModelConfig modelConfig)
+ public Scenario(IRepositoryConfig repositoryConfig, ISessionConfig sessionConfig, IModelConfig modelConfig)
{
- this.containerConfig = containerConfig;
this.repositoryConfig = repositoryConfig;
this.sessionConfig = sessionConfig;
this.modelConfig = modelConfig;
}
- public IContainerConfig getContainerConfig()
- {
- return containerConfig;
- }
-
- public Scenario setContainerConfig(IContainerConfig containerConfig)
- {
- configs = null;
- this.containerConfig = containerConfig;
- if (containerConfig != null)
- {
- containerConfig.setCurrentTest(currentTest);
- }
-
- return this;
- }
-
public IRepositoryConfig getRepositoryConfig()
{
return repositoryConfig;
@@ -136,8 +114,8 @@ public class Scenario implements IScenario
@Override
public String toString()
{
- return MessageFormat.format("Scenario[{0}, {1}, {2}, {3}]", //
- getContainerConfig(), getRepositoryConfig(), getSessionConfig(), getModelConfig());
+ return MessageFormat.format("Scenario[{0}, {1}, {2}]", //
+ getRepositoryConfig(), getSessionConfig(), getModelConfig());
}
public Set<IConfig> getConfigs()
@@ -145,7 +123,6 @@ public class Scenario implements IScenario
if (configs == null)
{
configs = new HashSet<IConfig>();
- configs.add(getContainerConfig());
configs.add(getRepositoryConfig());
configs.add(getSessionConfig());
configs.add(getModelConfig());
@@ -160,7 +137,6 @@ public class Scenario implements IScenario
capabilities.add(IConfig.CAPABILITY_ALL);
capabilities.add(IConfig.EFFORT_MERGING); // TODO Remove when effort merging done!
- containerConfig.initCapabilities(capabilities);
repositoryConfig.initCapabilities(capabilities);
sessionConfig.initCapabilities(capabilities);
modelConfig.initCapabilities(capabilities);
@@ -190,11 +166,6 @@ public class Scenario implements IScenario
public void setCurrentTest(ConfigTest currentTest)
{
this.currentTest = currentTest;
- if (containerConfig != null)
- {
- containerConfig.setCurrentTest(currentTest);
- }
-
if (repositoryConfig != null)
{
repositoryConfig.setCurrentTest(currentTest);
@@ -215,24 +186,17 @@ public class Scenario implements IScenario
{
try
{
- getContainerConfig().setUp();
+ getRepositoryConfig().setUp();
}
finally
{
try
{
- getRepositoryConfig().setUp();
+ getSessionConfig().setUp();
}
finally
{
- try
- {
- getSessionConfig().setUp();
- }
- finally
- {
- getModelConfig().setUp();
- }
+ getModelConfig().setUp();
}
}
}
@@ -265,15 +229,6 @@ public class Scenario implements IScenario
{
IOUtil.print(ex);
}
-
- try
- {
- getContainerConfig().tearDown();
- }
- catch (Exception ex)
- {
- IOUtil.print(ex);
- }
}
public void save()
@@ -347,7 +302,6 @@ public class Scenario implements IScenario
private Default()
{
- setContainerConfig(IConstants.COMBINED);
setRepositoryConfig(IConstants.MEM_BRANCHES);
setSessionConfig(IConstants.JVM);
setModelConfig(IConstants.NATIVE);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/SessionConfig.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/SessionConfig.java
index 8894d4de2b..dc3163a8d6 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/SessionConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/SessionConfig.java
@@ -19,7 +19,6 @@ import org.eclipse.emf.cdo.server.IRepository;
import org.eclipse.emf.cdo.session.CDOSession;
import org.eclipse.emf.cdo.session.CDOSessionConfiguration;
import org.eclipse.emf.cdo.spi.common.CDOLobStoreImpl;
-import org.eclipse.emf.cdo.tests.config.IConfig;
import org.eclipse.emf.cdo.tests.config.IRepositoryConfig;
import org.eclipse.emf.cdo.tests.config.ISessionConfig;
import org.eclipse.emf.cdo.tests.util.TestRevisionManager;
@@ -27,11 +26,13 @@ import org.eclipse.emf.cdo.view.CDOFetchRuleManager;
import org.eclipse.emf.cdo.view.CDOViewProvider;
import org.eclipse.emf.cdo.view.CDOViewProviderRegistry;
+import org.eclipse.net4j.Net4jUtil;
import org.eclipse.net4j.acceptor.IAcceptor;
import org.eclipse.net4j.connector.IConnector;
import org.eclipse.net4j.jvm.JVMUtil;
import org.eclipse.net4j.tcp.TCPUtil;
import org.eclipse.net4j.tcp.ssl.SSLUtil;
+import org.eclipse.net4j.util.container.ContainerUtil;
import org.eclipse.net4j.util.container.IManagedContainer;
import org.eclipse.net4j.util.event.IListener;
import org.eclipse.net4j.util.io.IOUtil;
@@ -64,6 +65,8 @@ public abstract class SessionConfig extends Config implements ISessionConfig
private static final long serialVersionUID = 1L;
+ private transient IManagedContainer clientContainer;
+
private transient Set<CDOSession> sessions;
private transient IListener sessionListener;
@@ -75,6 +78,53 @@ public abstract class SessionConfig extends Config implements ISessionConfig
super(name);
}
+ public IManagedContainer getServerContainer()
+ {
+ return getCurrentTest().getServerContainer();
+ }
+
+ public boolean hasServerContainer()
+ {
+ return getCurrentTest().hasServerContainer();
+ }
+
+ protected boolean usesServerContainer()
+ {
+ return false;
+ }
+
+ public boolean hasClientContainer()
+ {
+ if (usesServerContainer())
+ {
+ return hasServerContainer();
+ }
+
+ return clientContainer != null;
+ }
+
+ public IManagedContainer getClientContainer()
+ {
+ if (usesServerContainer())
+ {
+ return getServerContainer();
+ }
+
+ if (clientContainer == null)
+ {
+ clientContainer = createClientContainer();
+ }
+
+ return clientContainer;
+ }
+
+ protected IManagedContainer createClientContainer()
+ {
+ IManagedContainer container = ContainerUtil.createContainer();
+ Net4jUtil.prepareContainer(container);
+ return container;
+ }
+
public void startTransport() throws Exception
{
}
@@ -124,6 +174,7 @@ public abstract class SessionConfig extends Config implements ISessionConfig
public void setUp() throws Exception
{
super.setUp();
+
sessions = new HashSet<CDOSession>();
sessionListener = new LifecycleEventAdapter()
{
@@ -167,7 +218,15 @@ public abstract class SessionConfig extends Config implements ISessionConfig
sessions = null;
sessionListener = null;
+
stopTransport();
+
+ if (clientContainer != null)
+ {
+ LifecycleUtil.deactivate(clientContainer);
+ clientContainer = null;
+ }
+
super.tearDown();
}
finally
@@ -276,6 +335,12 @@ public abstract class SessionConfig extends Config implements ISessionConfig
configuration.setRepository(repository);
return configuration;
}
+
+ @Override
+ protected boolean usesServerContainer()
+ {
+ return true;
+ }
}
/**
@@ -315,11 +380,9 @@ public abstract class SessionConfig extends Config implements ISessionConfig
@Override
public void stopTransport() throws Exception
{
- ConfigTest currentTest = getCurrentTest();
-
try
{
- if (currentTest.hasClientContainer())
+ if (hasClientContainer())
{
IConnector connector = getConnector();
connector.close();
@@ -332,7 +395,7 @@ public abstract class SessionConfig extends Config implements ISessionConfig
try
{
- if (currentTest.hasServerContainer())
+ if (hasServerContainer())
{
IAcceptor acceptor = getAcceptor();
acceptor.close();
@@ -373,7 +436,10 @@ public abstract class SessionConfig extends Config implements ISessionConfig
{
super.setUp();
- viewProvider = createViewProvider(getCurrentTest().getClientContainer());
+ IManagedContainer clientContainer = getClientContainer();
+ CDONet4jUtil.prepareContainer(clientContainer);
+
+ viewProvider = createViewProvider(clientContainer);
if (viewProvider != null)
{
CDOViewProviderRegistry.INSTANCE.addViewProvider(viewProvider);
@@ -428,27 +494,24 @@ public abstract class SessionConfig extends Config implements ISessionConfig
@Override
public IAcceptor getAcceptor()
{
- return TCPUtil.getAcceptor(getCurrentTest().getServerContainer(), null);
+ return TCPUtil.getAcceptor(getServerContainer(), null);
}
@Override
public IConnector getConnector()
{
- return TCPUtil.getConnector(getCurrentTest().getClientContainer(), CONNECTOR_HOST);
+ return TCPUtil.getConnector(getClientContainer(), CONNECTOR_HOST);
}
@Override
public void setUp() throws Exception
{
super.setUp();
+ TCPUtil.prepareContainer(getClientContainer());
- IManagedContainer clientContainer = getCurrentTest().getClientContainer();
- TCPUtil.prepareContainer(clientContainer);
-
- IManagedContainer serverContainer = getCurrentTest().getServerContainer();
- if (serverContainer != clientContainer)
+ if (!usesServerContainer())
{
- TCPUtil.prepareContainer(serverContainer);
+ TCPUtil.prepareContainer(getServerContainer());
}
}
@@ -499,27 +562,24 @@ public abstract class SessionConfig extends Config implements ISessionConfig
@Override
public IAcceptor getAcceptor()
{
- return SSLUtil.getAcceptor(getCurrentTest().getServerContainer(), null);
+ return SSLUtil.getAcceptor(getServerContainer(), null);
}
@Override
public IConnector getConnector()
{
- return SSLUtil.getConnector(getCurrentTest().getClientContainer(), CONNECTOR_HOST);
+ return SSLUtil.getConnector(getClientContainer(), CONNECTOR_HOST);
}
@Override
public void setUp() throws Exception
{
super.setUp();
+ SSLUtil.prepareContainer(getClientContainer());
- IManagedContainer clientContainer = getCurrentTest().getClientContainer();
- SSLUtil.prepareContainer(clientContainer);
-
- IManagedContainer serverContainer = getCurrentTest().getServerContainer();
- if (serverContainer != clientContainer)
+ if (!usesServerContainer())
{
- SSLUtil.prepareContainer(serverContainer);
+ SSLUtil.prepareContainer(getServerContainer());
}
}
@@ -570,27 +630,26 @@ public abstract class SessionConfig extends Config implements ISessionConfig
@Override
public IAcceptor getAcceptor()
{
- return JVMUtil.getAcceptor(getCurrentTest().getServerContainer(), ACCEPTOR_NAME);
+ return JVMUtil.getAcceptor(getServerContainer(), ACCEPTOR_NAME);
}
@Override
public IConnector getConnector()
{
- return JVMUtil.getConnector(getCurrentTest().getClientContainer(), ACCEPTOR_NAME);
+ return JVMUtil.getConnector(getClientContainer(), ACCEPTOR_NAME);
}
@Override
public void setUp() throws Exception
{
super.setUp();
- JVMUtil.prepareContainer(getCurrentTest().getClientContainer());
- JVMUtil.prepareContainer(getCurrentTest().getServerContainer());
+ JVMUtil.prepareContainer(getClientContainer());
}
@Override
- public boolean isValid(Set<IConfig> configs)
+ protected boolean usesServerContainer()
{
- return !configs.contains(ContainerConfig.Separated.INSTANCE);
+ return true;
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/AllTestsCDODefs.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/AllTestsCDODefs.java
index 866054250b..f6d791c0c9 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/AllTestsCDODefs.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/AllTestsCDODefs.java
@@ -33,7 +33,7 @@ public class AllTestsCDODefs extends ConfigTestSuite
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, MEM, TCP, NATIVE);
+ addScenario(parent, MEM, TCP, NATIVE);
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/AllPerformanceTestsMemStore.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/AllPerformanceTestsMemStore.java
index ff3c2974de..a2a4ac9c6a 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/AllPerformanceTestsMemStore.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/AllPerformanceTestsMemStore.java
@@ -32,16 +32,16 @@ public class AllPerformanceTestsMemStore extends AllPerformanceTests
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, MEM, JVM, NATIVE);
- addScenario(parent, COMBINED, MEM_AUDITS, JVM, NATIVE);
- addScenario(parent, COMBINED, MEM_BRANCHES, JVM, NATIVE);
- addScenario(parent, COMBINED, MEM_BRANCHES_UUIDS, JVM, NATIVE);
+ addScenario(parent, MEM, JVM, NATIVE);
+ addScenario(parent, MEM_AUDITS, JVM, NATIVE);
+ addScenario(parent, MEM_BRANCHES, JVM, NATIVE);
+ addScenario(parent, MEM_BRANCHES_UUIDS, JVM, NATIVE);
- addScenario(parent, COMBINED, MEM, JVM, LEGACY);
- addScenario(parent, COMBINED, MEM_AUDITS, JVM, LEGACY);
- addScenario(parent, COMBINED, MEM_BRANCHES, JVM, LEGACY);
+ addScenario(parent, MEM, JVM, LEGACY);
+ addScenario(parent, MEM_AUDITS, JVM, LEGACY);
+ addScenario(parent, MEM_BRANCHES, JVM, LEGACY);
- addScenario(parent, COMBINED, MEM_BRANCHES, TCP, NATIVE);
+ addScenario(parent, MEM_BRANCHES, TCP, NATIVE);
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PrintStreamPerformanceRecordAnalyzer.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PrintStreamPerformanceRecordAnalyzer.java
index 75781fd3b9..f6dfd28f42 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PrintStreamPerformanceRecordAnalyzer.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PrintStreamPerformanceRecordAnalyzer.java
@@ -63,8 +63,7 @@ public class PrintStreamPerformanceRecordAnalyzer implements IPerformanceRecordA
{
IScenario scenario = performanceRecord.getScenario();
- String recordString = MessageFormat.format("{0};{1};{2};{3};{4};{5};{6};{7};{8}", //
- scenario.getContainerConfig().getName(), //
+ String recordString = MessageFormat.format("{0};{1};{2};{3};{4};{5};{6};{7}", //
scenario.getRepositoryConfig().getName(), //
scenario.getSessionConfig().getName(), //
scenario.getModelConfig().getName(), //

Back to the top