Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2011-07-07 12:22:32 +0000
committerEike Stepper2011-07-07 12:22:32 +0000
commit142c270c33b750fbec802aa1f762339b3578a73e (patch)
treeb5e1dbc985e3d4d4050334de5934e64dad1b2dc3 /plugins/org.eclipse.emf.cdo.examples/src
parent790f4cef4375ee84aa1696a198cb49bbb71c4678 (diff)
downloadcdo-142c270c33b750fbec802aa1f762339b3578a73e.tar.gz
cdo-142c270c33b750fbec802aa1f762339b3578a73e.tar.xz
cdo-142c270c33b750fbec802aa1f762339b3578a73e.zip
[351405] Rename cdo.net4j.CDOSession to cdo.net4j.CDONet4jSession
https://bugs.eclipse.org/bugs/show_bug.cgi?id=351405
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.examples/src')
-rw-r--r--plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/ImportXML.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/StandaloneContainerExample.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/StandaloneContainerExampleSSL.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/StandaloneManualExample.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/TransactionMonitoring.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/VariousExamples.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/FailoverExample.java16
-rw-r--r--plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClient.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java8
9 files changed, 39 insertions, 39 deletions
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/ImportXML.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/ImportXML.java
index ce86d24472..142fde0a87 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/ImportXML.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/ImportXML.java
@@ -13,8 +13,8 @@ package org.eclipse.emf.cdo.examples;
import org.eclipse.emf.cdo.examples.company.Category;
import org.eclipse.emf.cdo.examples.company.CompanyFactory;
import org.eclipse.emf.cdo.examples.company.Product;
+import org.eclipse.emf.cdo.net4j.CDONet4jSessionConfiguration;
import org.eclipse.emf.cdo.net4j.CDONet4jUtil;
-import org.eclipse.emf.cdo.net4j.CDOSessionConfiguration;
import org.eclipse.emf.cdo.server.CDOServerUtil;
import org.eclipse.emf.cdo.server.IRepository;
import org.eclipse.emf.cdo.server.IStore;
@@ -110,9 +110,9 @@ public class ImportXML
protected static CDOSession openSession(IConnector connector)
{
- CDOSessionConfiguration configuration = CDONet4jUtil.createSessionConfiguration();
+ CDONet4jSessionConfiguration configuration = CDONet4jUtil.createNet4jSessionConfiguration();
configuration.setConnector(connector);
configuration.setRepositoryName(REPOSITORY_NAME);
- return configuration.openSession();
+ return configuration.openNet4jSession();
}
}
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 b3db6ef444..00980be6ac 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
@@ -13,8 +13,8 @@ package org.eclipse.emf.cdo.examples;
import org.eclipse.emf.cdo.eresource.CDOResource;
import org.eclipse.emf.cdo.examples.company.CompanyFactory;
import org.eclipse.emf.cdo.examples.company.CompanyPackage;
+import org.eclipse.emf.cdo.net4j.CDONet4jSessionConfiguration;
import org.eclipse.emf.cdo.net4j.CDONet4jUtil;
-import org.eclipse.emf.cdo.net4j.CDOSessionConfiguration;
import org.eclipse.emf.cdo.session.CDOSession;
import org.eclipse.emf.cdo.transaction.CDOTransaction;
import org.eclipse.emf.cdo.util.CommitException;
@@ -53,12 +53,12 @@ public class StandaloneContainerExample
IConnector connector = TCPUtil.getConnector(container, "localhost:2036"); //$NON-NLS-1$
// Create configuration
- CDOSessionConfiguration configuration = CDONet4jUtil.createSessionConfiguration();
+ CDONet4jSessionConfiguration configuration = CDONet4jUtil.createNet4jSessionConfiguration();
configuration.setConnector(connector);
configuration.setRepositoryName("repo1"); //$NON-NLS-1$
// Open session
- CDOSession session = configuration.openSession();
+ CDOSession session = configuration.openNet4jSession();
session.getPackageRegistry().putEPackage(CompanyPackage.eINSTANCE);
// Open transaction
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/StandaloneContainerExampleSSL.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/StandaloneContainerExampleSSL.java
index f85e3eec15..94b4b3ddf2 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/StandaloneContainerExampleSSL.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/StandaloneContainerExampleSSL.java
@@ -13,8 +13,8 @@ package org.eclipse.emf.cdo.examples;
import org.eclipse.emf.cdo.eresource.CDOResource;
import org.eclipse.emf.cdo.examples.company.CompanyFactory;
import org.eclipse.emf.cdo.examples.company.CompanyPackage;
+import org.eclipse.emf.cdo.net4j.CDONet4jSessionConfiguration;
import org.eclipse.emf.cdo.net4j.CDONet4jUtil;
-import org.eclipse.emf.cdo.net4j.CDOSessionConfiguration;
import org.eclipse.emf.cdo.session.CDOSession;
import org.eclipse.emf.cdo.transaction.CDOTransaction;
import org.eclipse.emf.cdo.util.CommitException;
@@ -55,12 +55,12 @@ public class StandaloneContainerExampleSSL
IConnector connector = SSLUtil.getConnector(container, "localhost:2036");
// Create configuration
- CDOSessionConfiguration configuration = CDONet4jUtil.createSessionConfiguration();
+ CDONet4jSessionConfiguration configuration = CDONet4jUtil.createNet4jSessionConfiguration();
configuration.setConnector(connector);
configuration.setRepositoryName("repo1"); //$NON-NLS-1$
// Open session
- CDOSession session = configuration.openSession();
+ CDOSession session = configuration.openNet4jSession();
session.options().setGeneratedPackageEmulationEnabled(true);
session.getPackageRegistry().putEPackage(CompanyPackage.eINSTANCE);
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 74efe15b67..9877cf6953 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
@@ -13,8 +13,8 @@ package org.eclipse.emf.cdo.examples;
import org.eclipse.emf.cdo.eresource.CDOResource;
import org.eclipse.emf.cdo.examples.company.CompanyFactory;
import org.eclipse.emf.cdo.examples.company.CompanyPackage;
+import org.eclipse.emf.cdo.net4j.CDONet4jSessionConfiguration;
import org.eclipse.emf.cdo.net4j.CDONet4jUtil;
-import org.eclipse.emf.cdo.net4j.CDOSessionConfiguration;
import org.eclipse.emf.cdo.session.CDOSession;
import org.eclipse.emf.cdo.transaction.CDOTransaction;
import org.eclipse.emf.cdo.util.CommitException;
@@ -81,12 +81,12 @@ public class StandaloneManualExample
connector.activate();
// Create configuration
- CDOSessionConfiguration configuration = CDONet4jUtil.createSessionConfiguration();
+ CDONet4jSessionConfiguration configuration = CDONet4jUtil.createNet4jSessionConfiguration();
configuration.setConnector(connector);
configuration.setRepositoryName("repo1"); //$NON-NLS-1$
// Open session
- CDOSession session = configuration.openSession();
+ CDOSession session = configuration.openNet4jSession();
session.getPackageRegistry().putEPackage(CompanyPackage.eINSTANCE);
// Open transaction
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/TransactionMonitoring.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/TransactionMonitoring.java
index 556815babd..54a8363ef4 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/TransactionMonitoring.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/TransactionMonitoring.java
@@ -12,8 +12,8 @@ package org.eclipse.emf.cdo.examples;
import org.eclipse.emf.cdo.examples.company.CompanyFactory;
import org.eclipse.emf.cdo.examples.company.CompanyPackage;
+import org.eclipse.emf.cdo.net4j.CDONet4jSessionConfiguration;
import org.eclipse.emf.cdo.net4j.CDONet4jUtil;
-import org.eclipse.emf.cdo.net4j.CDOSessionConfiguration;
import org.eclipse.emf.cdo.session.CDOSession;
import org.eclipse.emf.cdo.transaction.CDOTransaction;
import org.eclipse.emf.cdo.util.CommitException;
@@ -46,11 +46,11 @@ public class TransactionMonitoring
CDONet4jUtil.prepareContainer(container);
container.activate();
- CDOSessionConfiguration configuration = CDONet4jUtil.createSessionConfiguration();
+ CDONet4jSessionConfiguration configuration = CDONet4jUtil.createNet4jSessionConfiguration();
configuration.setConnector(TCPUtil.getConnector(container, "localhost"));
configuration.setRepositoryName("repo1");
- CDOSession session = configuration.openSession();
+ CDOSession session = configuration.openNet4jSession();
session.getPackageRegistry().putEPackage(CompanyPackage.eINSTANCE);
CDOTransaction transaction = session.openTransaction();
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/VariousExamples.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/VariousExamples.java
index 034142aac0..b29076ed35 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/VariousExamples.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/VariousExamples.java
@@ -10,9 +10,9 @@
*/
package org.eclipse.emf.cdo.examples;
+import org.eclipse.emf.cdo.net4j.CDONet4jSession;
+import org.eclipse.emf.cdo.net4j.CDONet4jSessionConfiguration;
import org.eclipse.emf.cdo.net4j.CDONet4jUtil;
-import org.eclipse.emf.cdo.net4j.CDOSession;
-import org.eclipse.emf.cdo.net4j.CDOSessionConfiguration;
import org.eclipse.emf.cdo.transaction.CDOTransaction;
import org.eclipse.emf.cdo.util.CommitException;
@@ -34,11 +34,11 @@ public class VariousExamples
ResourceSet resourceSet = new ResourceSetImpl();
IConnector connector = Net4jUtil.getConnector(IPluginContainer.INSTANCE, "tcp", "repos.foo.org:2036");
- CDOSessionConfiguration configuration = CDONet4jUtil.createSessionConfiguration();
+ CDONet4jSessionConfiguration configuration = CDONet4jUtil.createNet4jSessionConfiguration();
configuration.setConnector(connector);
configuration.setRepositoryName("MyRepo");
- CDOSession session = configuration.openSession();
+ CDONet4jSession session = configuration.openNet4jSession();
CDOTransaction transaction = session.openTransaction(resourceSet);
// Work with the resource set....
@@ -48,8 +48,8 @@ public class VariousExamples
public static void registerSessionWithPluginContainer() throws CommitException
{
- CDOSession session = (CDOSession)IPluginContainer.INSTANCE.getElement("org.eclipse.emf.cdo.sessions", "cdo",
- "tcp://repos.foo.org:2036/MyRepo");
+ CDONet4jSession session = (CDONet4jSession)IPluginContainer.INSTANCE.getElement("org.eclipse.emf.cdo.sessions",
+ "cdo", "tcp://repos.foo.org:2036/MyRepo");
CDOTransaction transaction = session.openTransaction();
// ...
transaction.commit();
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/FailoverExample.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/FailoverExample.java
index 07c9f703d3..44b7ddaa9c 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/FailoverExample.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/FailoverExample.java
@@ -17,9 +17,9 @@ import org.eclipse.emf.cdo.common.util.RepositoryStateChangedEvent;
import org.eclipse.emf.cdo.common.util.RepositoryTypeChangedEvent;
import org.eclipse.emf.cdo.examples.company.CompanyFactory;
import org.eclipse.emf.cdo.examples.company.Customer;
+import org.eclipse.emf.cdo.net4j.CDONet4jSession;
+import org.eclipse.emf.cdo.net4j.CDONet4jSessionConfiguration;
import org.eclipse.emf.cdo.net4j.CDONet4jUtil;
-import org.eclipse.emf.cdo.net4j.CDOSession;
-import org.eclipse.emf.cdo.net4j.CDOSessionConfiguration;
import org.eclipse.emf.cdo.net4j.CDOSessionRecoveryEvent;
import org.eclipse.emf.cdo.server.CDOServerUtil;
import org.eclipse.emf.cdo.server.IRepository;
@@ -271,16 +271,16 @@ public abstract class FailoverExample
{
return new CDOSessionConfigurationFactory()
{
- public CDOSessionConfiguration createSessionConfiguration()
+ public CDONet4jSessionConfiguration createSessionConfiguration()
{
return FailoverExample.this.createSessionConfiguration(connector, repositoryName);
}
};
}
- protected CDOSessionConfiguration createSessionConfiguration(IConnector connector, String repositoryName)
+ protected CDONet4jSessionConfiguration createSessionConfiguration(IConnector connector, String repositoryName)
{
- CDOSessionConfiguration configuration = CDONet4jUtil.createSessionConfiguration();
+ CDONet4jSessionConfiguration configuration = CDONet4jUtil.createNet4jSessionConfiguration();
configuration.setConnector(connector);
configuration.setRepositoryName(repositoryName);
configuration.setRevisionManager(CDORevisionUtil.createRevisionManager(CDORevisionCache.NOOP));
@@ -550,10 +550,10 @@ public abstract class FailoverExample
public static void main(String[] args) throws Exception
{
IManagedContainer container = createContainer();
- CDOSessionConfiguration configuration = CDONet4jUtil.createFailoverSessionConfiguration(REPOSITORY_MONITOR_HOST
- + ":" + REPOSITORY_MONITOR_PORT, REPOSITORY_GROUP, container);
+ CDONet4jSessionConfiguration configuration = CDONet4jUtil.createFailoverSessionConfiguration(
+ REPOSITORY_MONITOR_HOST + ":" + REPOSITORY_MONITOR_PORT, REPOSITORY_GROUP, container);
- final CDOSession session = configuration.openSession();
+ final CDONet4jSession session = configuration.openNet4jSession();
System.out.println("Connected");
final CDOTransaction tx = session.openTransaction();
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClient.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClient.java
index afd8f089f1..a8a448486d 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClient.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClient.java
@@ -16,9 +16,9 @@ import org.eclipse.emf.cdo.common.branch.CDOBranch;
import org.eclipse.emf.cdo.common.commit.CDOCommitInfo;
import org.eclipse.emf.cdo.examples.company.CompanyFactory;
import org.eclipse.emf.cdo.examples.company.Customer;
+import org.eclipse.emf.cdo.net4j.CDONet4jSession;
+import org.eclipse.emf.cdo.net4j.CDONet4jSessionConfiguration;
import org.eclipse.emf.cdo.net4j.CDONet4jUtil;
-import org.eclipse.emf.cdo.net4j.CDOSession;
-import org.eclipse.emf.cdo.net4j.CDOSessionConfiguration;
import org.eclipse.emf.cdo.session.CDORepositoryInfo;
import org.eclipse.emf.cdo.transaction.CDOTransaction;
import org.eclipse.emf.cdo.util.CommitException;
@@ -80,7 +80,7 @@ public class OfflineExampleClient
return false;
}
- private static void createSessionListener(final CDOSession session, final boolean autoMerging)
+ private static void createSessionListener(final CDONet4jSession session, final boolean autoMerging)
{
session.addListener(new IListener()
{
@@ -100,7 +100,7 @@ public class OfflineExampleClient
}
}
- private void merge(final CDOSession session, State newState)
+ private void merge(final CDONet4jSession session, State newState)
{
if (newState == State.ONLINE && wasOffline)
{
@@ -141,11 +141,11 @@ public class OfflineExampleClient
IConnector connector = Net4jUtil.getConnector(container, AbstractOfflineExampleServer.TRANSPORT_TYPE, "localhost:"
+ PORT);
- CDOSessionConfiguration configuration = CDONet4jUtil.createSessionConfiguration();
+ CDONet4jSessionConfiguration configuration = CDONet4jUtil.createNet4jSessionConfiguration();
configuration.setConnector(connector);
configuration.setRepositoryName(OfflineExampleClone.NAME);
- CDOSession session = configuration.openSession();
+ CDONet4jSession session = configuration.openNet4jSession();
CDORepositoryInfo repositoryInfo = session.getRepositoryInfo();
System.out.println("Connected to " + repositoryInfo.getName());
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java
index 4f7b86c589..c50b95676e 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.examples.server.offline;
import org.eclipse.emf.cdo.common.revision.CDORevisionCache;
import org.eclipse.emf.cdo.common.revision.CDORevisionUtil;
import org.eclipse.emf.cdo.net4j.CDONet4jUtil;
-import org.eclipse.emf.cdo.net4j.CDOSessionConfiguration;
+import org.eclipse.emf.cdo.net4j.CDONet4jSessionConfiguration;
import org.eclipse.emf.cdo.server.CDOServerUtil;
import org.eclipse.emf.cdo.server.IRepository;
import org.eclipse.emf.cdo.server.IRepositorySynchronizer;
@@ -81,7 +81,7 @@ public class OfflineExampleClone extends AbstractOfflineExampleServer
{
return new CDOSessionConfigurationFactory()
{
- public CDOSessionConfiguration createSessionConfiguration()
+ public CDONet4jSessionConfiguration createSessionConfiguration()
{
IConnector connector = createConnector("localhost:" + OfflineExampleMaster.PORT);
return OfflineExampleClone.this.createSessionConfiguration(connector, repositoryName);
@@ -89,9 +89,9 @@ public class OfflineExampleClone extends AbstractOfflineExampleServer
};
}
- protected CDOSessionConfiguration createSessionConfiguration(IConnector connector, String repositoryName)
+ protected CDONet4jSessionConfiguration createSessionConfiguration(IConnector connector, String repositoryName)
{
- CDOSessionConfiguration configuration = CDONet4jUtil.createSessionConfiguration();
+ CDONet4jSessionConfiguration configuration = CDONet4jUtil.createNet4jSessionConfiguration();
configuration.setConnector(connector);
configuration.setRepositoryName(repositoryName);
configuration.setRevisionManager(CDORevisionUtil.createRevisionManager(CDORevisionCache.NOOP));

Back to the top