diff options
6 files changed, 15 insertions, 11 deletions
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/StandaloneContainerExample.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/StandaloneContainerExample.java index eb9a8701dc..df5b4be67f 100644 --- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/StandaloneContainerExample.java +++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/StandaloneContainerExample.java @@ -11,6 +11,7 @@ package org.eclipse.emf.cdo.examples; import org.eclipse.emf.cdo.eresource.CDOResource; +import org.eclipse.emf.cdo.net4j.CDONet4jUtil; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.session.CDOSessionConfiguration; import org.eclipse.emf.cdo.tests.model1.Model1Factory; @@ -44,14 +45,14 @@ public class StandaloneContainerExample IManagedContainer container = ContainerUtil.createContainer(); Net4jUtil.prepareContainer(container); // Register Net4j factories TCPUtil.prepareContainer(container); // Register TCP factories - org.eclipse.emf.cdo.net4j.CDONet4jUtil.prepareContainer(container); // Register CDO factories + CDONet4jUtil.prepareContainer(container); // Register CDO factories container.activate(); // Create connector IConnector connector = TCPUtil.getConnector(container, "localhost:2036"); // Create configuration - CDOSessionConfiguration configuration = org.eclipse.emf.cdo.net4j.CDONet4jUtil.createSessionConfiguration(); + CDOSessionConfiguration configuration = CDONet4jUtil.createSessionConfiguration(); configuration.setConnector(connector); configuration.setRepositoryName("repo1"); diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/StandaloneManualExample.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/StandaloneManualExample.java index 5229a8d9dc..22f3b9a836 100644 --- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/StandaloneManualExample.java +++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/StandaloneManualExample.java @@ -11,6 +11,7 @@ package org.eclipse.emf.cdo.examples; import org.eclipse.emf.cdo.eresource.CDOResource; +import org.eclipse.emf.cdo.net4j.CDONet4jUtil; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.session.CDOSessionConfiguration; import org.eclipse.emf.cdo.tests.model1.Model1Factory; @@ -80,7 +81,7 @@ public class StandaloneManualExample connector.activate(); // Create configuration - CDOSessionConfiguration configuration = org.eclipse.emf.cdo.net4j.CDONet4jUtil.createSessionConfiguration(); + CDOSessionConfiguration configuration = CDONet4jUtil.createSessionConfiguration(); configuration.setConnector(connector); configuration.setRepositoryName("repo1"); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ImportXML.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ImportXML.java index cdc918f158..f97b809832 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ImportXML.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ImportXML.java @@ -10,6 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo.tests; +import org.eclipse.emf.cdo.net4j.CDONet4jUtil; import org.eclipse.emf.cdo.server.CDOServerUtil; import org.eclipse.emf.cdo.server.IRepository; import org.eclipse.emf.cdo.server.IStore; @@ -53,7 +54,7 @@ public class ImportXML Net4jUtil.prepareContainer(container); // Prepare the Net4j kernel JVMUtil.prepareContainer(container); // Prepare the JVM transport CDOServerUtil.prepareContainer(container); // Prepare the CDO server - org.eclipse.emf.cdo.net4j.CDONet4jUtil.prepareContainer(container); // Prepare the CDO client + CDONet4jUtil.prepareContainer(container); // Prepare the CDO client container.activate(); // Start the transport and create a repository @@ -111,7 +112,7 @@ public class ImportXML protected static CDOSession openSession(IConnector connector) { - CDOSessionConfiguration configuration = org.eclipse.emf.cdo.net4j.CDONet4jUtil.createSessionConfiguration(); + CDOSessionConfiguration configuration = CDONet4jUtil.createSessionConfiguration(); configuration.setConnector(connector); configuration.setRepositoryName(REPOSITORY_NAME); return configuration.openSession(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionMonitoringTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionMonitoringTest.java index 9982119c7d..15865025d7 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionMonitoringTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionMonitoringTest.java @@ -10,6 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo.tests; +import org.eclipse.emf.cdo.net4j.CDONet4jUtil; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.session.CDOSessionConfiguration; import org.eclipse.emf.cdo.tests.model1.Model1Factory; @@ -40,10 +41,10 @@ public class TransactionMonitoringTest IManagedContainer container = ContainerUtil.createContainer(); Net4jUtil.prepareContainer(container); TCPUtil.prepareContainer(container); - org.eclipse.emf.cdo.net4j.CDONet4jUtil.prepareContainer(container); + CDONet4jUtil.prepareContainer(container); container.activate(); - CDOSessionConfiguration configuration = org.eclipse.emf.cdo.net4j.CDONet4jUtil.createSessionConfiguration(); + CDOSessionConfiguration configuration = CDONet4jUtil.createSessionConfiguration(); configuration.setConnector(TCPUtil.getConnector(container, "localhost")); configuration.setRepositoryName("repo1"); 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 index 6325e5e20f..66dc1b0ff7 100644 --- 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 @@ -10,6 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo.tests.config.impl; +import org.eclipse.emf.cdo.net4j.CDONet4jUtil; import org.eclipse.emf.cdo.server.CDOServerUtil; import org.eclipse.emf.cdo.tests.config.IContainerConfig; @@ -95,7 +96,7 @@ public abstract class ContainerConfig extends Config implements IContainerConfig { IManagedContainer container = ContainerUtil.createContainer(); Net4jUtil.prepareContainer(container); - org.eclipse.emf.cdo.net4j.CDONet4jUtil.prepareContainer(container); + CDONet4jUtil.prepareContainer(container); CDOServerUtil.prepareContainer(container); return container; } @@ -143,7 +144,7 @@ public abstract class ContainerConfig extends Config implements IContainerConfig { IManagedContainer container = ContainerUtil.createContainer(); Net4jUtil.prepareContainer(container); - org.eclipse.emf.cdo.net4j.CDONet4jUtil.prepareContainer(container); + CDONet4jUtil.prepareContainer(container); return container; } diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/PluginContainerViewProvider.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/PluginContainerViewProvider.java index f72bc0bfaa..b31aac5c69 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/PluginContainerViewProvider.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/PluginContainerViewProvider.java @@ -17,7 +17,6 @@ import org.eclipse.emf.cdo.view.CDOViewProvider; import org.eclipse.emf.cdo.view.CDOViewSet; import org.eclipse.emf.cdo.view.ManagedContainerViewProvider; -import org.eclipse.emf.internal.cdo.net4j.CDONet4jSessionFactory; import org.eclipse.emf.internal.cdo.session.CDOSessionFactory; import org.eclipse.net4j.util.container.IManagedContainer; @@ -50,7 +49,7 @@ public class PluginContainerViewProvider extends ManagedContainerViewProvider im } String repoUUID = CDOURIUtil.extractRepositoryUUID(uri); - for (Object element : container.getElements(CDOSessionFactory.PRODUCT_GROUP, CDONet4jSessionFactory.TYPE)) + for (Object element : container.getElements(CDOSessionFactory.PRODUCT_GROUP)) { CDOSession session = (CDOSession)element; String uuid = session.repository().getUUID(); |