Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2017-12-31 11:46:39 -0500
committerEike Stepper2017-12-31 11:46:39 -0500
commitbf25a5213129a0dd477e4cac7012828abb2d6ef5 (patch)
treec5c1c0463136ec6a9200688e0e807be7d4e9d043
parent7609ad187ff05da565e96ddb084d0e33a20c449e (diff)
downloadcdo-bf25a5213129a0dd477e4cac7012828abb2d6ef5.tar.gz
cdo-bf25a5213129a0dd477e4cac7012828abb2d6ef5.tar.xz
cdo-bf25a5213129a0dd477e4cac7012828abb2d6ef5.zip
[529326] Remove the "old" org.eclipse.emf.cdo.server.embedded package
https://bugs.eclipse.org/bugs/show_bug.cgi?id=529326
-rw-r--r--plugins/org.eclipse.emf.cdo.server.admin/.settings/.api_filters16
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/.settings/.api_filters16
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db4o/.settings/.api_filters19
-rw-r--r--plugins/org.eclipse.emf.cdo.server.hibernate/.settings/.api_filters16
-rw-r--r--plugins/org.eclipse.emf.cdo.server.lissome/.settings/.api_filters16
-rw-r--r--plugins/org.eclipse.emf.cdo.server.mongodb/.settings/.api_filters19
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/.settings/.api_filters16
-rw-r--r--plugins/org.eclipse.emf.cdo.server.objectivity/.settings/.api_filters16
-rw-r--r--plugins/org.eclipse.emf.cdo.server/.settings/.api_filters72
-rw-r--r--plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSession.java123
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionConfiguration.java189
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java677
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedServerSessionProtocol.java141
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/CDOSession.java25
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/CDOSessionConfiguration.java37
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/package-info.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.workspace/.settings/.api_filters16
19 files changed, 174 insertions, 1263 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.admin/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.server.admin/.settings/.api_filters
index 13d1adc0c5..75e56d3bcd 100644
--- a/plugins/org.eclipse.emf.cdo.server.admin/.settings/.api_filters
+++ b/plugins/org.eclipse.emf.cdo.server.admin/.settings/.api_filters
@@ -1,5 +1,21 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.emf.cdo.server.admin" version="2">
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.cdo.server.embedded.CDOSession">
+ <filter id="305422471">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.cdo.server.embedded.CDOSession"/>
+ <message_argument value="org.eclipse.emf.cdo.server.admin_4.2.300"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.cdo.server.embedded.CDOSessionConfiguration">
+ <filter id="305422471">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.cdo.server.embedded.CDOSessionConfiguration"/>
+ <message_argument value="org.eclipse.emf.cdo.server.admin_4.2.300"/>
+ </message_arguments>
+ </filter>
+ </resource>
<resource path="src/org/eclipse/emf/cdo/server/internal/admin/CDOAdminServer.java" type="org.eclipse.emf.cdo.server.internal.admin.CDOAdminServer">
<filter id="574619656">
<message_arguments>
diff --git a/plugins/org.eclipse.emf.cdo.server.db/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.server.db/.settings/.api_filters
index 6c803d9d9c..33b7e8495a 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/.settings/.api_filters
+++ b/plugins/org.eclipse.emf.cdo.server.db/.settings/.api_filters
@@ -1,5 +1,21 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.emf.cdo.server.db" version="2">
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.cdo.server.embedded.CDOSession">
+ <filter id="305422471">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.cdo.server.embedded.CDOSession"/>
+ <message_argument value="org.eclipse.emf.cdo.server.db_4.5.0"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.cdo.server.embedded.CDOSessionConfiguration">
+ <filter id="305422471">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.cdo.server.embedded.CDOSessionConfiguration"/>
+ <message_argument value="org.eclipse.emf.cdo.server.db_4.5.0"/>
+ </message_arguments>
+ </filter>
+ </resource>
<resource path="src/org/eclipse/emf/cdo/server/db/mapping/IMappingStrategy.java" type="org.eclipse.emf.cdo.server.db.mapping.IMappingStrategy">
<filter id="403767336">
<message_arguments>
diff --git a/plugins/org.eclipse.emf.cdo.server.db4o/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.server.db4o/.settings/.api_filters
new file mode 100644
index 0000000000..012c01f428
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.server.db4o/.settings/.api_filters
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.emf.cdo.server.db4o" version="2">
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.cdo.server.embedded.CDOSession">
+ <filter id="305422471">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.cdo.server.embedded.CDOSession"/>
+ <message_argument value="org.eclipse.emf.cdo.server.db4o_4.0.400"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.cdo.server.embedded.CDOSessionConfiguration">
+ <filter id="305422471">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.cdo.server.embedded.CDOSessionConfiguration"/>
+ <message_argument value="org.eclipse.emf.cdo.server.db4o_4.0.400"/>
+ </message_arguments>
+ </filter>
+ </resource>
+</component>
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/.api_filters
index 7b534aeecd..0f781d8929 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/.api_filters
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/.api_filters
@@ -1,5 +1,21 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.emf.cdo.server.hibernate" version="2">
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.cdo.server.embedded.CDOSession">
+ <filter id="305422471">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.cdo.server.embedded.CDOSession"/>
+ <message_argument value="org.eclipse.emf.cdo.server.hibernate_4.2.400"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.cdo.server.embedded.CDOSessionConfiguration">
+ <filter id="305422471">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.cdo.server.embedded.CDOSessionConfiguration"/>
+ <message_argument value="org.eclipse.emf.cdo.server.hibernate_4.2.400"/>
+ </message_arguments>
+ </filter>
+ </resource>
<resource path="src/org/eclipse/emf/cdo/server/internal/hibernate/CDOHibernateBranchPointImpl.java" type="org.eclipse.emf.cdo.server.internal.hibernate.CDOHibernateBranchPointImpl">
<filter comment="Need to implement own version of branch point to store commit information" id="574619656">
<message_arguments>
diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.server.lissome/.settings/.api_filters
index 07dd12beb5..93b67b21b9 100644
--- a/plugins/org.eclipse.emf.cdo.server.lissome/.settings/.api_filters
+++ b/plugins/org.eclipse.emf.cdo.server.lissome/.settings/.api_filters
@@ -1,5 +1,21 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.emf.cdo.server.lissome" version="2">
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.cdo.server.embedded.CDOSession">
+ <filter id="305422471">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.cdo.server.embedded.CDOSession"/>
+ <message_argument value="org.eclipse.emf.cdo.server.lissome_4.2.300"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.cdo.server.embedded.CDOSessionConfiguration">
+ <filter id="305422471">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.cdo.server.embedded.CDOSessionConfiguration"/>
+ <message_argument value="org.eclipse.emf.cdo.server.lissome_4.2.300"/>
+ </message_arguments>
+ </filter>
+ </resource>
<resource path="src/org/eclipse/emf/cdo/server/internal/lissome/LissomeFileHandle.java" type="org.eclipse.emf.cdo.server.internal.lissome.LissomeFileHandle">
<filter id="574619656">
<message_arguments>
diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.server.mongodb/.settings/.api_filters
new file mode 100644
index 0000000000..9447a5708b
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.server.mongodb/.settings/.api_filters
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.emf.cdo.server.mongodb" version="2">
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.cdo.server.embedded.CDOSession">
+ <filter id="305422471">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.cdo.server.embedded.CDOSession"/>
+ <message_argument value="org.eclipse.emf.cdo.server.mongodb_4.0.500"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.cdo.server.embedded.CDOSessionConfiguration">
+ <filter id="305422471">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.cdo.server.embedded.CDOSessionConfiguration"/>
+ <message_argument value="org.eclipse.emf.cdo.server.mongodb_4.0.500"/>
+ </message_arguments>
+ </filter>
+ </resource>
+</component>
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.server.net4j/.settings/.api_filters
index 5d1cff289d..461e2988bc 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/.settings/.api_filters
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/.settings/.api_filters
@@ -1,5 +1,21 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.emf.cdo.server.net4j" version="2">
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.cdo.server.embedded.CDOSession">
+ <filter id="305422471">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.cdo.server.embedded.CDOSession"/>
+ <message_argument value="org.eclipse.emf.cdo.server.net4j_4.1.400"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.cdo.server.embedded.CDOSessionConfiguration">
+ <filter id="305422471">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.cdo.server.embedded.CDOSessionConfiguration"/>
+ <message_argument value="org.eclipse.emf.cdo.server.net4j_4.1.400"/>
+ </message_arguments>
+ </filter>
+ </resource>
<resource path="src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.java" type="org.eclipse.emf.cdo.server.internal.net4j.protocol.CDOServerProtocol">
<filter id="574619656">
<message_arguments>
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.server.objectivity/.settings/.api_filters
index 092e291ce7..e784fa246d 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/.settings/.api_filters
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/.settings/.api_filters
@@ -1,5 +1,21 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.emf.cdo.server.objectivity" version="2">
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.cdo.server.embedded.CDOSession">
+ <filter id="305422471">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.cdo.server.embedded.CDOSession"/>
+ <message_argument value="org.eclipse.emf.cdo.server.objectivity_4.0.500"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.cdo.server.embedded.CDOSessionConfiguration">
+ <filter id="305422471">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.cdo.server.embedded.CDOSessionConfiguration"/>
+ <message_argument value="org.eclipse.emf.cdo.server.objectivity_4.0.500"/>
+ </message_arguments>
+ </filter>
+ </resource>
<resource path="src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreAccessor.java" type="org.eclipse.emf.cdo.server.internal.objectivity.ObjectivityStoreAccessor">
<filter id="574660632">
<message_arguments>
diff --git a/plugins/org.eclipse.emf.cdo.server/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.server/.settings/.api_filters
index 1dc4c7aa3d..a47bb68373 100644
--- a/plugins/org.eclipse.emf.cdo.server/.settings/.api_filters
+++ b/plugins/org.eclipse.emf.cdo.server/.settings/.api_filters
@@ -1,5 +1,21 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.emf.cdo.server" version="2">
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.cdo.server.embedded.CDOSession">
+ <filter id="305324134">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.cdo.server.embedded.CDOSession"/>
+ <message_argument value="org.eclipse.emf.cdo.server_4.6.100"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.cdo.server.embedded.CDOSessionConfiguration">
+ <filter id="305324134">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.cdo.server.embedded.CDOSessionConfiguration"/>
+ <message_argument value="org.eclipse.emf.cdo.server_4.6.100"/>
+ </message_arguments>
+ </filter>
+ </resource>
<resource path="src/org/eclipse/emf/cdo/internal/server/LockingManager.java" type="org.eclipse.emf.cdo.internal.server.LockingManager$DurableView">
<filter id="574619656">
<message_arguments>
@@ -192,38 +208,6 @@
</message_arguments>
</filter>
</resource>
- <resource path="src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionConfiguration.java" type="org.eclipse.emf.cdo.internal.server.embedded.EmbeddedClientSessionConfiguration$RepositoryInfo">
- <filter id="574619656">
- <message_arguments>
- <message_argument value="CDORepositoryInfo"/>
- <message_argument value="RepositoryInfo"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java" type="org.eclipse.emf.cdo.internal.server.embedded.EmbeddedClientSessionProtocol">
- <filter id="574619656">
- <message_arguments>
- <message_argument value="CDOSessionProtocol"/>
- <message_argument value="EmbeddedClientSessionProtocol"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedServerSessionProtocol.java" type="org.eclipse.emf.cdo.internal.server.embedded.EmbeddedServerSessionProtocol">
- <filter id="574660632">
- <message_arguments>
- <message_argument value="ISessionProtocol"/>
- <message_argument value="CDOProtocol"/>
- <message_argument value="EmbeddedServerSessionProtocol"/>
- </message_arguments>
- </filter>
- <filter id="574668824">
- <message_arguments>
- <message_argument value="ISessionProtocol"/>
- <message_argument value="EmbeddedServerSessionProtocol"/>
- <message_argument value="CDOProtocol"/>
- </message_arguments>
- </filter>
- </resource>
<resource path="src/org/eclipse/emf/cdo/internal/server/mem/MEMStoreAccessor.java" type="org.eclipse.emf.cdo.internal.server.mem.MEMStoreAccessor">
<filter id="574660632">
<message_arguments>
@@ -279,6 +263,14 @@
</message_arguments>
</filter>
</resource>
+ <resource path="src/org/eclipse/emf/cdo/server/CDOServerUtil.java" type="org.eclipse.emf.cdo.server.CDOServerUtil">
+ <filter id="338792546">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.cdo.server.CDOServerUtil"/>
+ <message_argument value="createSessionConfiguration()"/>
+ </message_arguments>
+ </filter>
+ </resource>
<resource path="src/org/eclipse/emf/cdo/server/IQueryContext.java" type="org.eclipse.emf.cdo.server.IQueryContext">
<filter id="571473929">
<message_arguments>
@@ -351,22 +343,6 @@
</message_arguments>
</filter>
</resource>
- <resource path="src/org/eclipse/emf/cdo/server/embedded/CDOSession.java" type="org.eclipse.emf.cdo.server.embedded.CDOSession">
- <filter id="571473929">
- <message_arguments>
- <message_argument value="CDOSession"/>
- <message_argument value="CDOSession"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/emf/cdo/server/embedded/CDOSessionConfiguration.java" type="org.eclipse.emf.cdo.server.embedded.CDOSessionConfiguration">
- <filter id="571473929">
- <message_arguments>
- <message_argument value="CDOSessionConfiguration"/>
- <message_argument value="CDOSessionConfiguration"/>
- </message_arguments>
- </filter>
- </resource>
<resource path="src/org/eclipse/emf/cdo/spi/server/DelegatingQueryResourcesContext.java" type="org.eclipse.emf.cdo.spi.server.DelegatingQueryResourcesContext">
<filter id="574660632">
<message_arguments>
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 4d71f76d6c..3dd066b8de 100644
--- a/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF
@@ -18,12 +18,10 @@ Export-Package: org.eclipse.emf.cdo.internal.server;version="4.6.100";
org.eclipse.emf.cdo.server.hibernate,
org.eclipse.emf.cdo.server.embedded",
org.eclipse.emf.cdo.internal.server.bundle;version="4.6.100";x-internal:=true,
- org.eclipse.emf.cdo.internal.server.embedded;version="4.6.100";x-friends:="org.eclipse.emf.cdo.tests",
org.eclipse.emf.cdo.internal.server.mem;version="4.6.100";x-friends:="org.eclipse.emf.cdo.tests",
org.eclipse.emf.cdo.internal.server.messages;version="4.6.100";x-internal:=true,
org.eclipse.emf.cdo.internal.server.syncing;version="4.6.100";x-friends:="org.eclipse.emf.cdo.tests",
org.eclipse.emf.cdo.server;version="4.6.100",
- org.eclipse.emf.cdo.server.embedded;version="4.6.100",
org.eclipse.emf.cdo.server.mem;version="4.6.100",
org.eclipse.emf.cdo.spi.server;version="4.6.100"
Automatic-Module-Name: org.eclipse.emf.cdo.server
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSession.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSession.java
deleted file mode 100644
index 88e5e8ff0f..0000000000
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSession.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2009-2013, 2015 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
- * Andre Dietisheim - bug 256649
- * Christian W. Damus (CEA LIST) - bug 399306
- */
-package org.eclipse.emf.cdo.internal.server.embedded;
-
-import org.eclipse.emf.cdo.common.lob.CDOLobStore;
-import org.eclipse.emf.cdo.common.revision.CDORevisionCache;
-import org.eclipse.emf.cdo.common.revision.CDORevisionUtil;
-import org.eclipse.emf.cdo.internal.server.embedded.EmbeddedClientSessionConfiguration.RepositoryInfo;
-import org.eclipse.emf.cdo.server.embedded.CDOSession;
-import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranchManager;
-import org.eclipse.emf.cdo.spi.common.commit.InternalCDOCommitInfoManager;
-import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageRegistry;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
-import org.eclipse.emf.cdo.spi.server.InternalRepository;
-
-import org.eclipse.emf.internal.cdo.session.CDOSessionImpl;
-
-/**
- * @author Eike Stepper
- * @deprecated Not yet supported.
- */
-@Deprecated
-public class EmbeddedClientSession extends CDOSessionImpl implements CDOSession
-{
- private InternalRepository repository;
-
- public EmbeddedClientSession()
- {
- }
-
- public InternalRepository getRepository()
- {
- return repository;
- }
-
- @Override
- public InternalCDOPackageRegistry getPackageRegistry()
- {
- return getRepository().getPackageRegistry();
- }
-
- @Override
- public InternalCDOBranchManager getBranchManager()
- {
- return getRepository().getBranchManager();
- }
-
- @Override
- public InternalCDOCommitInfoManager getCommitInfoManager()
- {
- return getRepository().getCommitInfoManager();
- }
-
- @Override
- public CDOLobStore getLobStore()
- {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Changing the user's password in an embedded client session is not supported:
- * it must be done interactively with the user in a client session.
- *
- * @since 4.3
- */
- public void changeCredentials()
- {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Resetting a user's password in an embedded client session is not supported:
- * it must be done interactively in a client session.
- *
- * @since 4.3
- */
- public void resetCredentials(String userID)
- {
- throw new UnsupportedOperationException();
- }
-
- @Override
- protected void doActivate() throws Exception
- {
- super.doActivate();
-
- EmbeddedClientSessionProtocol protocol = new EmbeddedClientSessionProtocol(this);
- setSessionProtocol(protocol);
- protocol.activate();
- protocol.openSession(options().isPassiveUpdateEnabled());
-
- setLastUpdateTime(repository.getLastCommitTimeStamp());
- setRepositoryInfo(new RepositoryInfo(this));
-
- InternalCDORevisionManager revisionManager = (InternalCDORevisionManager)CDORevisionUtil.createRevisionManager();
- setRevisionManager(revisionManager);
- revisionManager.setSupportingAudits(getRepositoryInfo().isSupportingAudits());
- revisionManager.setSupportingBranches(getRepositoryInfo().isSupportingBranches());
- revisionManager.setCache(CDORevisionCache.NOOP);
- revisionManager.setRevisionLoader(getSessionProtocol());
- revisionManager.setRevisionLocker(this);
- revisionManager.activate();
- }
-
- @Override
- protected void doDeactivate() throws Exception
- {
- super.doDeactivate();
-
- getRevisionManager().deactivate();
- setRevisionManager(null);
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionConfiguration.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionConfiguration.java
deleted file mode 100644
index 7719880505..0000000000
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionConfiguration.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright (c) 2009-2013, 2015, 2016 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.internal.server.embedded;
-
-import org.eclipse.emf.cdo.common.id.CDOID;
-import org.eclipse.emf.cdo.common.id.CDOID.ObjectType;
-import org.eclipse.emf.cdo.server.IRepository;
-import org.eclipse.emf.cdo.server.embedded.CDOSessionConfiguration;
-import org.eclipse.emf.cdo.spi.server.InternalRepository;
-
-import org.eclipse.emf.internal.cdo.session.CDOSessionConfigurationImpl;
-
-import org.eclipse.net4j.util.CheckUtil;
-
-import org.eclipse.emf.spi.cdo.InternalCDOSession;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.PlatformObject;
-
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- * @deprecated Not yet supported.
- */
-@Deprecated
-public class EmbeddedClientSessionConfiguration extends CDOSessionConfigurationImpl implements CDOSessionConfiguration
-{
- private InternalRepository repository;
-
- public EmbeddedClientSessionConfiguration()
- {
- throw new UnsupportedOperationException("Embedded sessions are not yet supported");
- }
-
- public InternalRepository getRepository()
- {
- return repository;
- }
-
- public void setRepository(IRepository repository)
- {
- checkNotOpen();
- this.repository = (InternalRepository)repository;
- }
-
- @Override
- public org.eclipse.emf.cdo.server.embedded.CDOSession openSession()
- {
- return (org.eclipse.emf.cdo.server.embedded.CDOSession)super.openSession();
- }
-
- public InternalCDOSession createSession()
- {
- if (isActivateOnOpen())
- {
- CheckUtil.checkState(repository, "Specify a repository"); //$NON-NLS-1$
- }
-
- return new EmbeddedClientSession();
- }
-
- /**
- * @author Eike Stepper
- */
- protected static class RepositoryInfo extends PlatformObject implements org.eclipse.emf.cdo.session.CDORepositoryInfo
- {
- private EmbeddedClientSession session;
-
- public RepositoryInfo(EmbeddedClientSession session)
- {
- this.session = session;
- }
-
- public EmbeddedClientSession getSession()
- {
- return session;
- }
-
- public String getName()
- {
- return session.getRepository().getName();
- }
-
- public String getUUID()
- {
- return session.getRepository().getUUID();
- }
-
- public Type getType()
- {
- return session.getRepository().getType();
- }
-
- public State getState()
- {
- return session.getRepository().getState();
- }
-
- public long getCreationTime()
- {
- return session.getRepository().getCreationTime();
- }
-
- public long getTimeStamp()
- {
- return getTimeStamp(false);
- }
-
- public long getTimeStamp(boolean forceRefresh)
- {
- return System.currentTimeMillis();
- }
-
- public CDOID getRootResourceID()
- {
- return session.getRepository().getRootResourceID();
- }
-
- public boolean isAuthenticating()
- {
- return session.getRepository().isAuthenticating();
- }
-
- public boolean isSupportingAudits()
- {
- return session.getRepository().isSupportingAudits();
- }
-
- public boolean isSupportingBranches()
- {
- return session.getRepository().isSupportingBranches();
- }
-
- public boolean isSupportingUnits()
- {
- return session.getRepository().isSupportingUnits();
- }
-
- @Deprecated
- public boolean isSupportingEcore()
- {
- return session.getRepository().isSupportingEcore();
- }
-
- public boolean isSerializingCommits()
- {
- return session.getRepository().isSerializingCommits();
- }
-
- public boolean isEnsuringReferentialIntegrity()
- {
- return session.getRepository().isEnsuringReferentialIntegrity();
- }
-
- public IDGenerationLocation getIDGenerationLocation()
- {
- return session.getRepository().getIDGenerationLocation();
- }
-
- public CommitInfoStorage getCommitInfoStorage()
- {
- return session.getRepository().getCommitInfoStorage();
- }
-
- public String getStoreType()
- {
- return session.getRepository().getStoreType();
- }
-
- public Set<ObjectType> getObjectIDTypes()
- {
- return session.getRepository().getObjectIDTypes();
- }
-
- public boolean waitWhileInitial(IProgressMonitor monitor)
- {
- throw new UnsupportedOperationException();
- }
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java
deleted file mode 100644
index 4ef5fe8aee..0000000000
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java
+++ /dev/null
@@ -1,677 +0,0 @@
-/*
- * Copyright (c) 2009-2016 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
- * Christian W. Damus (CEA LIST) - bug 399306
- */
-package org.eclipse.emf.cdo.internal.server.embedded;
-
-import org.eclipse.emf.cdo.CDOObject;
-import org.eclipse.emf.cdo.common.CDOCommonSession.Options.LockNotificationMode;
-import org.eclipse.emf.cdo.common.CDOCommonSession.Options.PassiveUpdateMode;
-import org.eclipse.emf.cdo.common.branch.CDOBranch;
-import org.eclipse.emf.cdo.common.branch.CDOBranchHandler;
-import org.eclipse.emf.cdo.common.branch.CDOBranchPoint;
-import org.eclipse.emf.cdo.common.branch.CDOBranchPointRange;
-import org.eclipse.emf.cdo.common.branch.CDOBranchVersion;
-import org.eclipse.emf.cdo.common.commit.CDOChangeSetData;
-import org.eclipse.emf.cdo.common.commit.CDOCommitData;
-import org.eclipse.emf.cdo.common.commit.CDOCommitInfo;
-import org.eclipse.emf.cdo.common.commit.CDOCommitInfoHandler;
-import org.eclipse.emf.cdo.common.id.CDOID;
-import org.eclipse.emf.cdo.common.id.CDOIDProvider;
-import org.eclipse.emf.cdo.common.lob.CDOLob;
-import org.eclipse.emf.cdo.common.lob.CDOLobInfo;
-import org.eclipse.emf.cdo.common.lock.CDOLockState;
-import org.eclipse.emf.cdo.common.model.CDOPackageUnit;
-import org.eclipse.emf.cdo.common.protocol.CDOAuthenticator;
-import org.eclipse.emf.cdo.common.revision.CDOIDAndVersion;
-import org.eclipse.emf.cdo.common.revision.CDORevision;
-import org.eclipse.emf.cdo.common.revision.CDORevisionHandler;
-import org.eclipse.emf.cdo.common.revision.CDORevisionKey;
-import org.eclipse.emf.cdo.common.security.CDOPermission;
-import org.eclipse.emf.cdo.common.util.CDOQueryQueue;
-import org.eclipse.emf.cdo.server.StoreThreadLocal;
-import org.eclipse.emf.cdo.session.remote.CDORemoteSession;
-import org.eclipse.emf.cdo.session.remote.CDORemoteSessionMessage;
-import org.eclipse.emf.cdo.spi.common.CDOAuthenticationResult;
-import org.eclipse.emf.cdo.spi.common.CDORawReplicationContext;
-import org.eclipse.emf.cdo.spi.common.CDOReplicationContext;
-import org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo;
-import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageUnit;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionDelta;
-import org.eclipse.emf.cdo.spi.common.revision.RevisionInfo;
-import org.eclipse.emf.cdo.spi.server.InternalCommitContext;
-import org.eclipse.emf.cdo.spi.server.InternalQueryManager;
-import org.eclipse.emf.cdo.spi.server.InternalQueryResult;
-import org.eclipse.emf.cdo.spi.server.InternalRepository;
-import org.eclipse.emf.cdo.spi.server.InternalSession;
-import org.eclipse.emf.cdo.spi.server.InternalTransaction;
-import org.eclipse.emf.cdo.spi.server.InternalView;
-import org.eclipse.emf.cdo.view.CDOView;
-
-import org.eclipse.net4j.util.collection.Pair;
-import org.eclipse.net4j.util.concurrent.IRWLockManager.LockType;
-import org.eclipse.net4j.util.lifecycle.Lifecycle;
-import org.eclipse.net4j.util.om.monitor.OMMonitor;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.spi.cdo.AbstractQueryIterator;
-import org.eclipse.emf.spi.cdo.CDOSessionProtocol;
-import org.eclipse.emf.spi.cdo.InternalCDOObject;
-import org.eclipse.emf.spi.cdo.InternalCDORemoteSessionManager;
-import org.eclipse.emf.spi.cdo.InternalCDOTransaction;
-import org.eclipse.emf.spi.cdo.InternalCDOTransaction.InternalCDOCommitContext;
-import org.eclipse.emf.spi.cdo.InternalCDOXATransaction.InternalCDOXACommitContext;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- * @deprecated Not yet supported.
- */
-@Deprecated
-public class EmbeddedClientSessionProtocol extends Lifecycle implements CDOSessionProtocol
-{
- private EmbeddedClientSession session;
-
- // A separate session protocol instance is required because the getSession() methods are ambiguous!
- private EmbeddedServerSessionProtocol serverSessionProtocol;
-
- private InternalRepository repository;
-
- public EmbeddedClientSessionProtocol(EmbeddedClientSession session)
- {
- this.session = session;
- }
-
- public EmbeddedClientSession getSession()
- {
- return session;
- }
-
- public EmbeddedServerSessionProtocol getServerSessionProtocol()
- {
- return serverSessionProtocol;
- }
-
- public InternalSession openSession(boolean passiveUpdateEnabled)
- {
- repository = session.getRepository();
- activate();
- return serverSessionProtocol.openSession(repository, passiveUpdateEnabled);
- }
-
- public EPackage[] loadPackages(CDOPackageUnit packageUnit)
- {
- throw new UnsupportedOperationException();
- }
-
- public Pair<Integer, Long> createBranch(int branchID, BranchInfo branchInfo)
- {
- throw new UnsupportedOperationException();
- }
-
- public BranchInfo loadBranch(int branchID)
- {
- throw new UnsupportedOperationException();
- }
-
- public SubBranchInfo[] loadSubBranches(int branchID)
- {
- throw new UnsupportedOperationException();
- }
-
- public int loadBranches(int startID, int endID, CDOBranchHandler branchHandler)
- {
- throw new UnsupportedOperationException();
- }
-
- @Deprecated
- public void deleteBranch(int branchID)
- {
- throw new UnsupportedOperationException();
- }
-
- @Deprecated
- public void renameBranch(int branchID, String newName)
- {
- throw new UnsupportedOperationException();
- }
-
- public void renameBranch(int branchID, String oldName, String newName)
- {
- throw new UnsupportedOperationException();
- }
-
- public RepositoryTimeResult getRepositoryTime()
- {
- RepositoryTimeResult result = new RepositoryTimeResult();
- long timeStamp = System.currentTimeMillis();
- result.setRequested(timeStamp);
- result.setIndicated(timeStamp);
- result.setResponded(timeStamp);
- result.setConfirmed(timeStamp);
- return result;
- }
-
- public void openedSession()
- {
- throw new UnsupportedOperationException();
- }
-
- @Deprecated
- public CDOLockState[] getLockStates(int viewID, Collection<CDOID> ids)
- {
- throw new UnsupportedOperationException();
- }
-
- public CDOLockState[] getLockStates(int viewID, Collection<CDOID> ids, int depth)
- {
- throw new UnsupportedOperationException();
- }
-
- public void enableLockNotifications(int viewID, boolean enable)
- {
- throw new UnsupportedOperationException();
- }
-
- public void disablePassiveUpdate()
- {
- // serverSessionProtocol.getSession().setPassiveUpdateEnabled(passiveUpdateEnabled);
- // TODO: implement EmbeddedClientSessionProtocol.setPassiveUpdate(idAndVersions, initialChunkSize,
- // passiveUpdateEnabled)
- throw new UnsupportedOperationException();
- }
-
- public void setPassiveUpdateMode(PassiveUpdateMode mode)
- {
- // TODO: implement EmbeddedClientSessionProtocol.setPassiveUpdateMode(mode)
- throw new UnsupportedOperationException();
- }
-
- public void setLockNotificationMode(LockNotificationMode mode)
- {
- throw new UnsupportedOperationException();
- }
-
- public Object loadChunk(InternalCDORevision revision, EStructuralFeature feature, int accessIndex, int fetchIndex, int fromIndex, int toIndex)
- {
- throw new UnsupportedOperationException();
- }
-
- public void loadCommitInfos(CDOBranch branch, long startTime, long endTime, CDOCommitInfoHandler handler)
- {
- throw new UnsupportedOperationException();
- }
-
- public CDOCommitData loadCommitData(long timeStamp)
- {
- throw new UnsupportedOperationException();
- }
-
- public InternalCDORevision loadRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int referenceChunk)
- {
- try
- {
- InternalSession session = serverSessionProtocol.getSession();
- StoreThreadLocal.setSession(session);
- return repository.getRevisionManager().getRevisionByVersion(id, branchVersion, referenceChunk, true);
- }
- finally
- {
- StoreThreadLocal.release();
- }
- }
-
- public CDOBranchPointRange loadObjectLifetime(CDOID id, CDOBranchPoint branchPoint)
- {
- throw new UnsupportedOperationException();
- }
-
- public List<RevisionInfo> loadRevisions(List<RevisionInfo> infos, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth)
- {
- try
- {
- InternalSession session = serverSessionProtocol.getSession();
- StoreThreadLocal.setSession(session);
-
- List<CDOID> ids = new ArrayList<CDOID>(infos.size());
- for (RevisionInfo info : infos)
- {
- ids.add(info.getID());
- }
-
- // @SuppressWarnings("unchecked")
- // List<InternalCDORevision> revisions = (List<InternalCDORevision>)(List<?>)repository.getRevisionManager()
- // .getRevisions(ids, branchPoint, referenceChunk, prefetchDepth, true);
-
- // TODO: implement EmbeddedClientSessionProtocol.loadRevisions(infos, branchPoint, referenceChunk, prefetchDepth)
- throw new UnsupportedOperationException();
- }
- finally
- {
- StoreThreadLocal.release();
- }
- }
-
- public RefreshSessionResult refresh(long lastUpdateTime, Map<CDOBranch, Map<CDOID, InternalCDORevision>> viewedRevisions, int initialChunkSize,
- boolean enablePassiveUpdates)
- {
- throw new UnsupportedOperationException();
- }
-
- public void openView(int viewID, boolean readOnly, CDOBranchPoint branchPoint)
- {
- InternalSession session = serverSessionProtocol.getSession();
- if (readOnly)
- {
- session.openView(viewID, branchPoint);
- }
- else
- {
- session.openTransaction(viewID, branchPoint);
- }
- }
-
- public CDOBranchPoint openView(int viewID, boolean readOnly, String durableLockingID)
- {
- throw new UnsupportedOperationException();
- }
-
- public void switchTarget(int viewID, CDOBranchPoint branchPoint, List<InternalCDOObject> invalidObjects, List<CDORevisionKey> allChangedObjects,
- List<CDOIDAndVersion> allDetachedObjects, OMMonitor monitor)
- {
- // TODO: implement EmbeddedClientSessionProtocol.changeView(viewID, branchPoint, invalidObjects, allChangedObjects,
- // allDetachedObjects, monitor)
- throw new UnsupportedOperationException();
-
- // try
- // {
- // monitor.begin();
- // Async async = monitor.forkAsync();
- //
- // try
- // {
- // InternalView view = serverSessionProtocol.getSession().getView(viewID);
- // if (view != null)
- // {
- // List<CDOID> ids = new ArrayList<CDOID>(invalidObjects.size());
- // for (InternalCDOObject object : invalidObjects)
- // {
- // ids.add(object.cdoID());
- // }
- //
- // view.changeTarget(branchPoint, ids, allChangedObjects, allDetachedObjects);
- // }
- // }
- // finally
- // {
- // async.stop();
- // }
- // }
- // finally
- // {
- // monitor.done();
- // }
- }
-
- public void closeView(int viewID)
- {
- InternalView view = serverSessionProtocol.getSession().getView(viewID);
- if (view != null)
- {
- view.close();
- }
- }
-
- public void changeSubscription(int viewID, List<CDOID> ids, boolean subscribeMode, boolean clear)
- {
- throw new UnsupportedOperationException();
- }
-
- public void query(CDOView view, AbstractQueryIterator<?> query)
- {
- InternalView serverView = serverSessionProtocol.getSession().getView(view.getViewID());
- InternalQueryManager queryManager = repository.getQueryManager();
- InternalQueryResult result = queryManager.execute(serverView, query.getQueryInfo());
-
- query.setQueryID(result.getQueryID());
- CDOQueryQueue<Object> resultQueue = query.getQueue();
-
- try
- {
- while (result.hasNext())
- {
- Object object = result.next();
- resultQueue.add(object);
- }
- }
- catch (RuntimeException ex)
- {
- resultQueue.setException(ex);
- }
- catch (Throwable throwable)
- {
- resultQueue.setException(new RuntimeException(throwable.getMessage(), throwable));
- }
- finally
- {
- resultQueue.close();
- }
- }
-
- public boolean cancelQuery(int queryID)
- {
- repository.getQueryManager().cancel(queryID);
- return true;
- }
-
- public boolean isObjectLocked(CDOView view, CDOObject object, LockType lockType, boolean byOthers)
- {
- throw new UnsupportedOperationException();
- }
-
- @Deprecated
- public LockObjectsResult lockObjects(List<InternalCDORevision> viewedRevisions, int viewID, CDOBranch viewedBranch, LockType lockType, long timeout)
- throws InterruptedException
- {
- throw new UnsupportedOperationException();
- }
-
- /**
- * @since 4.1
- */
- public LockObjectsResult lockObjects2(List<CDORevisionKey> keys, int viewID, CDOBranch viewedBranch, LockType type, boolean recursive, long timeout)
- throws InterruptedException
- {
- throw new UnsupportedOperationException();
- }
-
- @Deprecated
- public void unlockObjects(CDOView view, Collection<CDOID> ids, LockType type)
- {
- throw new UnsupportedOperationException();
- }
-
- public UnlockObjectsResult unlockObjects2(CDOView view, Collection<CDOID> ids, LockType type, boolean recursive)
- {
- throw new UnsupportedOperationException();
- }
-
- public LockObjectsResult delegateLockObjects(String lockAreaID, List<CDORevisionKey> keys, CDOBranch viewedBranch, LockType type, boolean recursive,
- long timeout) throws InterruptedException
- {
- throw new UnsupportedOperationException();
- }
-
- public UnlockObjectsResult delegateUnlockObjects(String lockAreaID, Collection<CDOID> ids, LockType type, boolean recursive)
- {
- throw new UnsupportedOperationException();
- }
-
- public String changeLockArea(CDOView view, boolean create)
- {
- throw new UnsupportedOperationException();
- }
-
- public List<byte[]> queryLobs(Set<byte[]> ids)
- {
- // TODO: implement EmbeddedClientSessionProtocol.queryLobs(ids)
- throw new UnsupportedOperationException();
- }
-
- public void loadLob(CDOLobInfo info, Object outputStreamOrWriter)
- {
- // TODO: implement EmbeddedClientSessionProtocol.loadLob(info, out)
- throw new UnsupportedOperationException();
- }
-
- public void handleRevisions(EClass eClass, CDOBranch branch, boolean exactBranch, long timeStamp, boolean exactTime, CDORevisionHandler handler)
- {
- // TODO: implement EmbeddedClientSessionProtocol.handleRevisions(eClass, branch, exactBranch, timeStamp, exactTime,
- // handler)
- throw new UnsupportedOperationException();
- }
-
- @Deprecated
- public CommitTransactionResult commitTransaction(int transactionID, String comment, boolean releaseLocks, CDOIDProvider idProvider, CDOCommitData commitData,
- Collection<CDOLob<?>> lobs, OMMonitor monitor)
- {
- throw new UnsupportedOperationException();
- }
-
- public CommitTransactionResult commitTransaction(InternalCDOCommitContext context, OMMonitor monitor)
- {
- monitor.begin(2);
- boolean success = false;
- InternalCommitContext serverCommitContext = null;
- CommitTransactionResult result = null;
-
- try
- {
- InternalCDOTransaction transaction = context.getTransaction();
- CDOCommitData commitData = context.getCommitData();
-
- int transactionID = transaction.getViewID();
- InternalTransaction serverTransaction = (InternalTransaction)serverSessionProtocol.getSession().getView(transactionID);
- serverCommitContext = serverTransaction.createCommitContext();
- serverCommitContext.preWrite();
- serverCommitContext.setAutoReleaseLocksEnabled(transaction.options().isAutoReleaseLocksEnabled());
-
- List<CDOPackageUnit> npu = commitData.getNewPackageUnits();
- serverCommitContext.setNewPackageUnits(npu.toArray(new InternalCDOPackageUnit[npu.size()]));
-
- List<CDOIDAndVersion> no = commitData.getNewObjects();
- InternalCDORevision[] array = new InternalCDORevision[no.size()];
- int index = 0;
- for (CDOIDAndVersion object : no)
- {
- InternalCDORevision revision = (InternalCDORevision)object;
- // revision.convertEObjects(clientTransaction);
- array[index++] = revision;
- }
-
- serverCommitContext.setNewObjects(array);
-
- List<CDORevisionKey> rd = commitData.getChangedObjects();
- serverCommitContext.setDirtyObjectDeltas(rd.toArray(new InternalCDORevisionDelta[rd.size()]));
-
- List<CDOIDAndVersion> detachedObjects = commitData.getDetachedObjects();
- serverCommitContext.setDetachedObjects(detachedObjects.toArray(new CDOID[detachedObjects.size()]));
-
- serverCommitContext.write(monitor.fork());
- success = serverCommitContext.getRollbackMessage() == null;
- if (success)
- {
- serverCommitContext.commit(monitor.fork());
- }
- else
- {
- monitor.worked();
- }
-
- // result = new CommitTransactionResult(commitData, serverCommitContext.getBranchPoint().getTimeStamp());
- // for (Entry<CDOID, CDOID> entry : serverCommitContext.getIDMappings().entrySet())
- // {
- // result.addIDMapping(entry.getKey(), entry.getValue());
- // }
- }
- finally
- {
- if (serverCommitContext != null)
- {
- serverCommitContext.postCommit(success);
- }
-
- monitor.done();
- }
-
- return result;
- }
-
- @Deprecated
- public CommitTransactionResult commitDelegation(CDOBranch branch, String userID, String comment, CDOCommitData commitData,
- Map<CDOID, EClass> detachedObjectTypes, Collection<CDOLob<?>> lobs, OMMonitor monitor)
- {
- throw new UnsupportedOperationException();
- }
-
- public CommitTransactionResult commitDelegation(InternalCDOCommitContext context, OMMonitor monitor)
- {
- throw new UnsupportedOperationException();
- }
-
- public CommitTransactionResult commitXATransactionCancel(InternalCDOXACommitContext xaContext, OMMonitor monitor)
- {
- throw new UnsupportedOperationException();
- }
-
- public CommitTransactionResult commitXATransactionPhase1(InternalCDOXACommitContext xaContext, OMMonitor monitor)
- {
- throw new UnsupportedOperationException();
- }
-
- public CommitTransactionResult commitXATransactionPhase2(InternalCDOXACommitContext xaContext, OMMonitor monitor)
- {
- throw new UnsupportedOperationException();
- }
-
- public CommitTransactionResult commitXATransactionPhase3(InternalCDOXACommitContext xaContext, OMMonitor monitor)
- {
- throw new UnsupportedOperationException();
- }
-
- public CDOCommitInfo resetTransaction(int transactionID, int commitNumber)
- {
- throw new UnsupportedOperationException();
- }
-
- public List<CDORemoteSession> getRemoteSessions(InternalCDORemoteSessionManager manager, boolean subscribe)
- {
- throw new UnsupportedOperationException();
- }
-
- public Set<Integer> sendRemoteMessage(CDORemoteSessionMessage message, List<CDORemoteSession> recipients)
- {
- throw new UnsupportedOperationException();
- }
-
- public boolean unsubscribeRemoteSessions()
- {
- throw new UnsupportedOperationException();
- }
-
- public void replicateRepository(CDOReplicationContext context, OMMonitor monitor)
- {
- throw new UnsupportedOperationException();
- }
-
- public void replicateRepositoryRaw(CDORawReplicationContext context, OMMonitor monitor)
- {
- throw new UnsupportedOperationException();
- }
-
- public CDOChangeSetData[] loadChangeSets(CDOBranchPointRange... ranges)
- {
- throw new UnsupportedOperationException();
- }
-
- public Set<CDOID> loadMergeData(CDORevisionAvailabilityInfo targetInfo, CDORevisionAvailabilityInfo sourceInfo, CDORevisionAvailabilityInfo targetBaseInfo,
- CDORevisionAvailabilityInfo sourceBaseInfo)
- {
- throw new UnsupportedOperationException();
- }
-
- public MergeDataResult loadMergeData2(CDORevisionAvailabilityInfo targetInfo, CDORevisionAvailabilityInfo sourceInfo,
- CDORevisionAvailabilityInfo targetBaseInfo, CDORevisionAvailabilityInfo sourceBaseInfo)
- {
- throw new UnsupportedOperationException();
- }
-
- public Map<CDORevision, CDOPermission> loadPermissions(InternalCDORevision[] revisions)
- {
- throw new UnsupportedOperationException();
- }
-
- public CDOAuthenticationResult handleAuthenticationChallenge(byte[] randomToken) throws Exception
- {
- CDOAuthenticator authenticator = getSession().getAuthenticator();
- if (authenticator == null)
- {
- throw new IllegalStateException("No authenticator configured"); //$NON-NLS-1$
- }
-
- CDOAuthenticationResult result = authenticator.authenticate(randomToken);
- if (result == null)
- {
- throw new SecurityException("Not authenticated"); //$NON-NLS-1$
- }
-
- String userID = result.getUserID();
- if (userID == null)
- {
- throw new SecurityException("No user ID"); //$NON-NLS-1$
- }
-
- byte[] cryptedToken = result.getCryptedToken();
- if (cryptedToken == null)
- {
- throw new SecurityException("No crypted token"); //$NON-NLS-1$
- }
-
- return result;
- }
-
- /**
- * Change of credentials may not be requested by embedded client sessions, only by
- * interactive user client sessions.
- */
- public void requestChangeCredentials()
- {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Reset of credentials may not be requested by embedded client sessions, only by
- * interactive client sessions.
- */
- public void requestResetCredentials(String userID)
- {
- throw new UnsupportedOperationException();
- }
-
- public boolean requestUnit(int viewID, CDOID rootID, UnitOpcode opcode, CDORevisionHandler revisionHandler, OMMonitor monitor)
- {
- throw new UnsupportedOperationException();
- }
-
- @Override
- protected void doActivate() throws Exception
- {
- super.doActivate();
- serverSessionProtocol = new EmbeddedServerSessionProtocol(this);
- serverSessionProtocol.activate();
- }
-
- @Override
- protected void doDeactivate() throws Exception
- {
- serverSessionProtocol.deactivate();
- serverSessionProtocol = null;
- super.doDeactivate();
- }
-
-}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedServerSessionProtocol.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedServerSessionProtocol.java
deleted file mode 100644
index 25aac1dbad..0000000000
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedServerSessionProtocol.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2009-2013, 2016 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
- * Christian W. Damus (CEA LIST) - bug 399306
- */
-package org.eclipse.emf.cdo.internal.server.embedded;
-
-import org.eclipse.emf.cdo.common.CDOCommonRepository;
-import org.eclipse.emf.cdo.common.branch.CDOBranchChangedEvent.ChangeKind;
-import org.eclipse.emf.cdo.common.commit.CDOCommitInfo;
-import org.eclipse.emf.cdo.common.id.CDOID;
-import org.eclipse.emf.cdo.common.lock.CDOLockChangeInfo;
-import org.eclipse.emf.cdo.session.remote.CDORemoteSessionMessage;
-import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranch;
-import org.eclipse.emf.cdo.spi.server.ISessionProtocol;
-import org.eclipse.emf.cdo.spi.server.InternalRepository;
-import org.eclipse.emf.cdo.spi.server.InternalSession;
-
-import org.eclipse.net4j.util.lifecycle.Lifecycle;
-import org.eclipse.net4j.util.security.CredentialsUpdateOperation;
-import org.eclipse.net4j.util.security.DiffieHellman.Client.Response;
-import org.eclipse.net4j.util.security.DiffieHellman.Server.Challenge;
-
-/**
- * @author Eike Stepper
- * @deprecated Not yet supported.
- */
-@Deprecated
-public class EmbeddedServerSessionProtocol extends Lifecycle implements ISessionProtocol
-{
- // A separate session protocol instance is required because the getSession() methods are ambiguous!
- private EmbeddedClientSessionProtocol clientSessionProtocol;
-
- private InternalSession session;
-
- public EmbeddedServerSessionProtocol(EmbeddedClientSessionProtocol clientSessionProtocol)
- {
- this.clientSessionProtocol = clientSessionProtocol;
- }
-
- public EmbeddedClientSessionProtocol getClientSessionProtocol()
- {
- return clientSessionProtocol;
- }
-
- public InternalSession openSession(InternalRepository repository, boolean passiveUpdateEnabled)
- {
- session = repository.getSessionManager().openSession(this);
- session.setPassiveUpdateEnabled(passiveUpdateEnabled);
- return session;
- }
-
- public InternalSession getSession()
- {
- return session;
- }
-
- @Deprecated
- public org.eclipse.emf.cdo.spi.common.CDOAuthenticationResult sendAuthenticationChallenge(byte[] randomToken) throws Exception
- {
- return clientSessionProtocol.handleAuthenticationChallenge(randomToken);
- }
-
- public Response sendAuthenticationChallenge(Challenge challenge) throws Exception
- {
- throw new UnsupportedOperationException();
- }
-
- public Response sendCredentialsChallenge(Challenge challenge, String userID, CredentialsUpdateOperation operation) throws Exception
- {
- throw new UnsupportedOperationException();
- }
-
- public void sendRepositoryTypeNotification(CDOCommonRepository.Type oldType, CDOCommonRepository.Type newType)
- {
- EmbeddedClientSession clientSession = clientSessionProtocol.getSession();
- clientSession.handleRepositoryTypeChanged(oldType, newType);
- }
-
- @Deprecated
- public void sendRepositoryStateNotification(CDOCommonRepository.State oldState, CDOCommonRepository.State newState)
- {
- sendRepositoryStateNotification(oldState, newState, null);
- }
-
- public void sendRepositoryStateNotification(CDOCommonRepository.State oldState, CDOCommonRepository.State newState, CDOID rootResourceID)
- {
- EmbeddedClientSession clientSession = clientSessionProtocol.getSession();
- clientSession.handleRepositoryStateChanged(oldState, newState);
- }
-
- public void sendBranchNotification(InternalCDOBranch branch)
- {
- throw new UnsupportedOperationException();
- }
-
- public void sendBranchNotification(InternalCDOBranch branch, ChangeKind changeKind) throws Exception
- {
- throw new UnsupportedOperationException();
- }
-
- @Deprecated
- public void sendCommitNotification(CDOCommitInfo commitInfo)
- {
- EmbeddedClientSession clientSession = clientSessionProtocol.getSession();
- clientSession.handleCommitNotification(commitInfo);
- }
-
- @Deprecated
- public void sendCommitNotification(CDOCommitInfo commitInfo, boolean clearResourcePathCache) throws Exception
- {
- throw new UnsupportedOperationException();
- }
-
- public void sendCommitNotification(CommitNotificationInfo info) throws Exception
- {
- throw new UnsupportedOperationException();
- }
-
- public void sendLockNotification(CDOLockChangeInfo lockChangeInfo)
- {
- EmbeddedClientSession clientSession = clientSessionProtocol.getSession();
- clientSession.handleLockNotification(lockChangeInfo, null);
- }
-
- public void sendRemoteSessionNotification(InternalSession sender, byte opcode)
- {
- throw new UnsupportedOperationException();
- }
-
- public void sendRemoteMessageNotification(InternalSession sender, CDORemoteSessionMessage message)
- {
- throw new UnsupportedOperationException();
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java
index 0e6b5770fd..c9f29e13e1 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java
@@ -185,16 +185,6 @@ public final class CDOServerUtil
/**
* @since 3.0
- * @deprecated Not yet supported.
- */
- @Deprecated
- public static org.eclipse.emf.cdo.server.embedded.CDOSessionConfiguration createSessionConfiguration()
- {
- return new org.eclipse.emf.cdo.internal.server.embedded.EmbeddedClientSessionConfiguration();
- }
-
- /**
- * @since 3.0
*/
public static ISessionManager createSessionManager()
{
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/CDOSession.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/CDOSession.java
deleted file mode 100644
index 40f952173f..0000000000
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/CDOSession.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2009, 2011, 2012, 2015 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.server.embedded;
-
-/**
- * Deprecated, not yet supported.
- *
- * @author Eike Stepper
- * @since 3.0
- * @noextend This interface is not intended to be extended by clients.
- * @noimplement This interface is not intended to be implemented by clients.
- * @deprecated Not yet supported.
- */
-@Deprecated
-public interface CDOSession extends org.eclipse.emf.cdo.session.CDOSession
-{
-}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/CDOSessionConfiguration.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/CDOSessionConfiguration.java
deleted file mode 100644
index cf2fadd6a5..0000000000
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/CDOSessionConfiguration.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2009, 2011, 2012, 2015 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.server.embedded;
-
-import org.eclipse.emf.cdo.common.revision.CDORevisionManager;
-import org.eclipse.emf.cdo.server.IRepository;
-
-/**
- * Deprecated, not yet supported.
- *
- * @author Eike Stepper
- * @since 3.0
- * @noextend This interface is not intended to be extended by clients.
- * @noimplement This interface is not intended to be implemented by clients.
- * @deprecated Not yet supported.
- */
-@Deprecated
-public interface CDOSessionConfiguration extends org.eclipse.emf.cdo.session.CDOSessionConfiguration
-{
- public IRepository getRepository();
-
- public void setRepository(IRepository repository);
-
- public CDORevisionManager getRevisionManager();
-
- public void setRevisionManager(CDORevisionManager revisionManager);
-
- public org.eclipse.emf.cdo.server.embedded.CDOSession openSession();
-}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/package-info.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/package-info.java
deleted file mode 100644
index d10a2cd46e..0000000000
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/package-info.java
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) 2011-2013, 2015 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
- */
-
-/**
- * Server concepts for dealing with embedded sessions.
- */
-package org.eclipse.emf.cdo.server.embedded;
diff --git a/plugins/org.eclipse.emf.cdo.workspace/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.workspace/.settings/.api_filters
index 65e743b73d..bf1807c5a0 100644
--- a/plugins/org.eclipse.emf.cdo.workspace/.settings/.api_filters
+++ b/plugins/org.eclipse.emf.cdo.workspace/.settings/.api_filters
@@ -1,5 +1,21 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.emf.cdo.workspace" version="2">
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.cdo.server.embedded.CDOSession">
+ <filter id="305422471">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.cdo.server.embedded.CDOSession"/>
+ <message_argument value="org.eclipse.emf.cdo.workspace_4.2.200"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.cdo.server.embedded.CDOSessionConfiguration">
+ <filter id="305422471">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.cdo.server.embedded.CDOSessionConfiguration"/>
+ <message_argument value="org.eclipse.emf.cdo.workspace_4.2.200"/>
+ </message_arguments>
+ </filter>
+ </resource>
<resource path="src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java" type="org.eclipse.emf.cdo.internal.workspace.CDOWorkspaceImpl">
<filter id="572522506">
<message_arguments>

Back to the top