diff options
| author | Eike Stepper | 2011-07-07 12:22:32 +0000 |
|---|---|---|
| committer | Eike Stepper | 2011-07-07 12:22:32 +0000 |
| commit | 142c270c33b750fbec802aa1f762339b3578a73e (patch) | |
| tree | b5e1dbc985e3d4d4050334de5934e64dad1b2dc3 /plugins/org.eclipse.emf.cdo.defs | |
| parent | 790f4cef4375ee84aa1696a198cb49bbb71c4678 (diff) | |
| download | cdo-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.defs')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.defs/META-INF/MANIFEST.MF | 8 | ||||
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/plugins/org.eclipse.emf.cdo.defs/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.defs/META-INF/MANIFEST.MF index 8c2cf41fa1..996c0e1191 100644 --- a/plugins/org.eclipse.emf.cdo.defs/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.defs/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.defs;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 4.0.100.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -12,6 +12,6 @@ Require-Bundle: org.eclipse.net4j.defs;bundle-version="[4.0.0,5.0.0)";visibility org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.emf.cdo.defs;version="4.0.0", - org.eclipse.emf.cdo.defs.impl;version="4.0.0", - org.eclipse.emf.cdo.defs.util;version="4.0.0" +Export-Package: org.eclipse.emf.cdo.defs;version="4.0.100", + org.eclipse.emf.cdo.defs.impl;version="4.0.100", + org.eclipse.emf.cdo.defs.util;version="4.0.100" diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java index 52aba2a781..b735366214 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java @@ -15,8 +15,8 @@ import org.eclipse.emf.cdo.common.model.CDOPackageRegistry; import org.eclipse.emf.cdo.defs.CDODefsPackage; import org.eclipse.emf.cdo.defs.CDOPackageRegistryDef; import org.eclipse.emf.cdo.defs.CDOSessionDef; +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.net4j.connector.IConnector; @@ -461,9 +461,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef } @Override + @SuppressWarnings("deprecation") protected CDOSession createInstance() { - CDOSessionConfiguration configuration = CDONet4jUtil.createSessionConfiguration(); + CDONet4jSessionConfiguration configuration = CDONet4jUtil.createNet4jSessionConfiguration(); if (isSetConnectorDef()) { |