Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionImpl.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSession.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jViewProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSession.java13
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CompareTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ExternalReferenceTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SessionTest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_241464_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246442_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258933_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/SessionConfig.java2
-rw-r--r--plugins/org.gastro.rcp/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.gastro.server.web/META-INF/MANIFEST.MF6
13 files changed, 38 insertions, 17 deletions
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionImpl.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionImpl.java
index 4b5672f78b..cf5f88d408 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionImpl.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionImpl.java
@@ -22,6 +22,7 @@ import org.eclipse.emf.cdo.internal.net4j.CDONet4jSessionConfigurationImpl.Repos
import org.eclipse.emf.cdo.internal.net4j.protocol.CDOClientProtocol;
import org.eclipse.emf.cdo.internal.net4j.protocol.CommitTransactionRequest;
import org.eclipse.emf.cdo.net4j.CDONet4jSession;
+import org.eclipse.emf.cdo.net4j.CDOSession;
import org.eclipse.emf.cdo.spi.common.branch.CDOBranchUtil;
import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranchManager;
import org.eclipse.emf.cdo.spi.common.commit.CDOCommitInfoUtil;
@@ -260,7 +261,7 @@ public class CDONet4jSessionImpl extends CDOSessionImpl implements org.eclipse.e
return (CDONet4jSession)super.getContainer();
}
- public ISignalProtocol<org.eclipse.emf.cdo.net4j.CDONet4jSession> getProtocol()
+ public ISignalProtocol<org.eclipse.emf.cdo.net4j.CDONet4jSession> getNet4jProtocol()
{
CDOSessionProtocol protocol = getSessionProtocol();
if (protocol instanceof DelegatingSessionProtocol)
@@ -273,6 +274,13 @@ public class CDONet4jSessionImpl extends CDOSessionImpl implements org.eclipse.e
return signalProtocol;
}
+ public ISignalProtocol<CDOSession> getProtocol()
+ {
+ @SuppressWarnings("unchecked")
+ ISignalProtocol<CDOSession> net4jProtocol = (ISignalProtocol<CDOSession>)(ISignalProtocol<?>)getNet4jProtocol();
+ return net4jProtocol;
+ }
+
public int getCommitTimeout()
{
return commitTimeout;
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSession.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSession.java
index be76656ee0..bd9cdb1d4e 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSession.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSession.java
@@ -49,7 +49,7 @@ public interface CDONet4jSession extends org.eclipse.emf.cdo.session.CDOSession
* Returns the Net4j {@link CDOSessionProtocol protocol} instance that represents the underlying
* <em>signalling connection</em> to the repository of this session.
*/
- public ISignalProtocol<CDONet4jSession> getProtocol();
+ public ISignalProtocol<CDONet4jSession> getNet4jProtocol();
/**
* Returns the timeout for commit operations in <b>seconds</b>.
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jViewProvider.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jViewProvider.java
index 437c2b2d29..e7da851e0b 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jViewProvider.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jViewProvider.java
@@ -93,7 +93,7 @@ public abstract class CDONet4jViewProvider extends AbstractCDOViewProvider
// builder.append("@");
// }
- IConnector connector = (IConnector)session.options().getProtocol().getChannel().getMultiplexer();
+ IConnector connector = (IConnector)session.options().getNet4jProtocol().getChannel().getMultiplexer();
String repositoryName = session.getRepositoryInfo().getName();
append(builder, connector, repositoryName);
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSession.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSession.java
index cb17348a84..f45d4df20f 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSession.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSession.java
@@ -10,6 +10,10 @@
*/
package org.eclipse.emf.cdo.net4j;
+import org.eclipse.net4j.signal.ISignalProtocol;
+
+import org.eclipse.emf.spi.cdo.CDOSessionProtocol;
+
/**
* Deprecated, use {@link org.eclipse.emf.cdo.net4j.CDONet4jSession CDONet4jSession}.
*
@@ -41,5 +45,14 @@ public interface CDOSession extends CDONet4jSession
@Deprecated
public interface Options extends CDONet4jSession.Options
{
+ /**
+ * Returns the Net4j {@link CDOSessionProtocol protocol} instance that represents the underlying
+ * <em>signalling connection</em> to the repository of this session.
+ *
+ * @see #getNet4jProtocol()
+ * @deprecated Kept for 4.0 compatibility. Newer code should call {@link #getNet4jProtocol()}.
+ */
+ @Deprecated
+ public ISignalProtocol<CDOSession> getProtocol();
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CompareTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CompareTest.java
index 6db50eed95..d9df0125a9 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CompareTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CompareTest.java
@@ -34,7 +34,7 @@ public class CompareTest extends AbstractCDOTest
public void testFromEmptyBranches() throws Exception
{
CDOSession session = openSession();
- ((org.eclipse.emf.cdo.net4j.CDONet4jSession)session).options().getProtocol().setTimeout(1000000000);
+ ((org.eclipse.emf.cdo.net4j.CDONet4jSession)session).options().getNet4jProtocol().setTimeout(1000000000);
CDOBranch mainBranch = session.getBranchManager().getMainBranch();
CDOTransaction transaction = session.openTransaction(mainBranch);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ExternalReferenceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ExternalReferenceTest.java
index 958b4c87c2..3d768bead8 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ExternalReferenceTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ExternalReferenceTest.java
@@ -460,7 +460,7 @@ public class ExternalReferenceTest extends AbstractCDOTest
SignalCounter signalCounter = new SignalCounter();
CDOSession session = openSession();
- ISignalProtocol<?> protocol = ((org.eclipse.emf.cdo.net4j.CDONet4jSession)session).options().getProtocol();
+ ISignalProtocol<?> protocol = ((org.eclipse.emf.cdo.net4j.CDONet4jSession)session).options().getNet4jProtocol();
protocol.addListener(signalCounter);
CDOTransaction transaction = session.openTransaction(resourceSet);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SessionTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SessionTest.java
index 3b9df2ccd8..8d7cdeaed4 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SessionTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SessionTest.java
@@ -400,7 +400,7 @@ public class SessionTest extends AbstractCDOTest
final boolean[] eventSent = { false };
org.eclipse.emf.cdo.net4j.CDONet4jSession session = (org.eclipse.emf.cdo.net4j.CDONet4jSession)openSession();
- session.options().getProtocol().addListener(new IListener()
+ session.options().getNet4jProtocol().addListener(new IListener()
{
public void notifyEvent(IEvent event)
{
@@ -413,7 +413,7 @@ public class SessionTest extends AbstractCDOTest
}
});
- session.options().getProtocol().setTimeout(20L * 1000L);
+ session.options().getNet4jProtocol().setTimeout(20L * 1000L);
assertEquals(true, eventSent[0]);
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_241464_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_241464_Test.java
index d60b038fde..8caac26c66 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_241464_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_241464_Test.java
@@ -55,7 +55,7 @@ public class Bugzilla_241464_Test extends AbstractCDOTest
TestRevisionManager revisionManager = (TestRevisionManager)getRepository().getRevisionManager();
revisionManager.setGetRevisionsDelay(10000L); // Make the protocol time out
- ((org.eclipse.emf.cdo.net4j.CDONet4jSession)session).options().getProtocol().setTimeout(2000L);
+ ((org.eclipse.emf.cdo.net4j.CDONet4jSession)session).options().getNet4jProtocol().setTimeout(2000L);
try
{
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246442_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246442_Test.java
index 30557a6618..7b565196dd 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246442_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246442_Test.java
@@ -63,7 +63,7 @@ public class Bugzilla_246442_Test extends AbstractCDOTest
CDOSession session = openSession();
if (session instanceof org.eclipse.emf.cdo.net4j.CDONet4jSession)
{
- ((org.eclipse.emf.cdo.net4j.CDONet4jSession)session).options().getProtocol().setTimeout(2000L);
+ ((org.eclipse.emf.cdo.net4j.CDONet4jSession)session).options().getNet4jProtocol().setTimeout(2000L);
}
CDOTransaction transaction = session.openTransaction();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258933_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258933_Test.java
index 2c4071d082..41c7dd8da7 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258933_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258933_Test.java
@@ -130,7 +130,7 @@ public class Bugzilla_258933_Test extends AbstractCDOTest
CDOSession session = openSession();
if (session instanceof org.eclipse.emf.cdo.net4j.CDONet4jSession)
{
- ((org.eclipse.emf.cdo.net4j.CDONet4jSession)session).options().getProtocol().setTimeout(2000L);
+ ((org.eclipse.emf.cdo.net4j.CDONet4jSession)session).options().getNet4jProtocol().setTimeout(2000L);
}
EPackage subpackage1 = session.getPackageRegistry().getEPackage(SUB_PACKAGE_URI);
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 6258afac33..dd28b225a5 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
@@ -316,7 +316,7 @@ public abstract class SessionConfig extends Config implements ISessionConfig
protected void configureSession(CDOSession session)
{
super.configureSession(session);
- ((org.eclipse.emf.cdo.net4j.CDONet4jSession)session).options().getProtocol().setTimeout(-1);
+ ((org.eclipse.emf.cdo.net4j.CDONet4jSession)session).options().getNet4jProtocol().setTimeout(-1);
}
protected abstract CDOViewProvider createViewProvider(IManagedContainer container);
diff --git a/plugins/org.gastro.rcp/META-INF/MANIFEST.MF b/plugins/org.gastro.rcp/META-INF/MANIFEST.MF
index e0bcabf7ef..749905c692 100644
--- a/plugins/org.gastro.rcp/META-INF/MANIFEST.MF
+++ b/plugins/org.gastro.rcp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: CDO Gastro Example RCP
Bundle-SymbolicName: org.gastro.rcp; singleton:=true
-Bundle-Version: 4.0.100.qualifier
+Bundle-Version: 4.1.0.qualifier
Bundle-Activator: org.gastro.internal.rcp.Activator
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";visibility:=reexport,
org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
@@ -21,8 +21,8 @@ Export-Package: org.eclipse.nebula.animation;version="0.5.2",
org.eclipse.nebula.jface.galleryviewer;version="0.5.2",
org.eclipse.nebula.widgets.gallery;version="0.5.2",
org.eclipse.nebula.widgets.pshelf;version="1.0.0",
- org.gastro.internal.rcp;version="4.0.100";x-internal:=true,
- org.gastro.rcp;version="4.0.100"
+ org.gastro.internal.rcp;version="4.1.0";x-internal:=true,
+ org.gastro.rcp;version="4.1.0"
Bundle-ClassPath: .,
org.eclipse.nebula.widgets.pshelf_1.0.0.HEAD.jar,
org.eclipse.nebula.widgets.gallery_0.5.2.R_0_20090418.jar
diff --git a/plugins/org.gastro.server.web/META-INF/MANIFEST.MF b/plugins/org.gastro.server.web/META-INF/MANIFEST.MF
index 2cc19c0a96..3fc2f4d9f8 100644
--- a/plugins/org.gastro.server.web/META-INF/MANIFEST.MF
+++ b/plugins/org.gastro.server.web/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: CDO Gastro Example Server Web Support
Bundle-SymbolicName: org.gastro.server.web;singleton:=true
-Bundle-Version: 4.0.100.qualifier
+Bundle-Version: 4.1.0.qualifier
Bundle-Activator: org.gastro.server.internal.web.OM$Activator
Bundle-Vendor: Eclipse Modeling Project
Require-Bundle: org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)",
@@ -21,5 +21,5 @@ Import-Package: javax.servlet;version="[2.3.0,3.0.0)",
org.apache.commons.lang;version="[2.3.0,3.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
-Export-Package: org.gastro.server.internal.web;version="4.0.100";x-internal:=true,
- templates;version="4.0.100";x-internal:=true
+Export-Package: org.gastro.server.internal.web;version="4.1.0";x-internal:=true,
+ templates;version="4.1.0";x-internal:=true

Back to the top