[258850] Make Options extend INotifier

https://bugs.eclipse.org/bugs/show_bug.cgi?id=258850

2 files changed, 32 insertions, 0 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.server/.settings/.api_filters
index f49ab05e5d..edc83dd679 100644
--- a/plugins/org.eclipse.emf.cdo.server/.settings/.api_filters
+++ b/plugins/org.eclipse.emf.cdo.server/.settings/.api_filters
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <component id="org.eclipse.emf.cdo.server" version="2">
+    <resource path="src/org/eclipse/emf/cdo/internal/server/View.java" type="org.eclipse.emf.cdo.internal.server.View">
+        <filter id="574660632">
+            <message_arguments>
+                <message_argument value="IView"/>
+                <message_argument value="CDOProtocolView"/>
+                <message_argument value="View"/>
+            </message_arguments>
+        </filter>
+    </resource>
     <resource path="src/org/eclipse/emf/cdo/internal/server/RevisionManager.java" type="org.eclipse.emf.cdo.internal.server.RevisionManager">
         <filter id="576720909">
             <message_arguments>
@@ -93,6 +102,13 @@
                 <message_argument value="Session(SessionManager, CDOServerProtocol, int, boolean)"/>
             </message_arguments>
         </filter>
+        <filter id="574660632">
+            <message_arguments>
+                <message_argument value="ISession"/>
+                <message_argument value="CDOProtocolSession"/>
+                <message_argument value="Session"/>
+            </message_arguments>
+        </filter>
     </resource>
     <resource path="src/org/eclipse/emf/cdo/internal/server/PackageManager.java" type="org.eclipse.emf.cdo.internal.server.PackageManager">
         <filter id="576720909">
@@ -103,6 +119,13 @@
         </filter>
     </resource>
     <resource path="src/org/eclipse/emf/cdo/internal/server/TransactionCommitContextImpl.java" type="org.eclipse.emf.cdo.internal.server.TransactionCommitContextImpl$TransactionPackageManager">
+        <filter id="574660632">
+            <message_arguments>
+                <message_argument value="InternalCDOPackageManager"/>
+                <message_argument value="CDOPackageManager"/>
+                <message_argument value="TransactionPackageManager"/>
+            </message_arguments>
+        </filter>
         <filter id="574619656">
             <message_arguments>
                 <message_argument value="CDOPackageManager"/>
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java
index 58a16bcf0a..2b0d405d25 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java
@@ -44,6 +44,7 @@ import org.eclipse.net4j.util.io.StringCompressor;
 import org.eclipse.net4j.util.lifecycle.ILifecycle;
 import org.eclipse.net4j.util.lifecycle.LifecycleEventAdapter;
 import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
+import org.eclipse.net4j.util.options.IOptionsContainer;
 
 import java.io.IOException;
 import java.text.MessageFormat;
@@ -112,6 +113,14 @@ public class Session extends Container<IView> implements ISession, CDOIDProvider
     return this;
   }
 
+  /**
+   * @since 2.0
+   */
+  public IOptionsContainer getContainer()
+  {
+    return this;
+  }
+
   public SessionManager getSessionManager()
   {
     return sessionManager;