[257365] [UI] Provide a Watch List Panel

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

12 files changed, 1152 insertions, 42 deletions

diff --git a/plugins/org.eclipse.emf.cdo.ui/CDOClient2.launch b/plugins/org.eclipse.emf.cdo.ui/CDOClient2.launch
index a3534d5448..a62818514e 100644
--- a/plugins/org.eclipse.emf.cdo.ui/CDOClient2.launch
+++ b/plugins/org.eclipse.emf.cdo.ui/CDOClient2.launch
@@ -24,8 +24,8 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.sdk.ide"/>
 <stringAttribute key="selectedPlugin" value="org.eclipse.emf.cdo"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.emf.mapping.ecore2xml,org.eclipse.xsd,org.eclipse.emf.ant,org.eclipse.xsd.editor,org.eclipse.jface.databinding,org.eclipse.ui.intro.universal,org.eclipse.ui.views.log,org.eclipse.emf.codegen.ecore.ui,org.eclipse.help.appserver,org.eclipse.ui.externaltools,org.eclipse.jdt.compiler.tool,org.eclipse.equinox.http.servlet,org.eclipse.emf.common.ui,org.eclipse.emf.converter,org.eclipse.core.runtime.compatibility,org.eclipse.emf.commonj.sdo,org.eclipse.team.ui,org.eclipse.team.cvs.ssh2,org.eclipse.emf.ecore.change.edit,org.eclipse.jdt.debug,org.eclipse.jdt.doc.user,org.apache.commons.logging,org.eclipse.xsd.ecore.exporter,org.eclipse.emf.mapping.xsd2ecore.editor,org.eclipse.ui.workbench.texteditor,org.eclipse.help.base,com.jcraft.jsch,org.eclipse.pde.junit.runtime,org.eclipse.cvs.source,org.eclipse.emf.mapping.ecore2xml.ui,org.eclipse.emf.importer.rose,org.eclipse.emf.codegen.ecore,org.eclipse.equinox.preferences,com.ibm.icu,org.eclipse.ant.ui,org.eclipse.jdt.launching,org.eclipse.update.core.win32,org.eclipse.emf.importer.java,org.eclipse.ui.ide,org.eclipse.emf.ecore.sdo.edit,org.eclipse.help,org.eclipse.update.ui,org.eclipse.emf.mapping.ecore2ecore.editor,org.apache.lucene.analysis,org.eclipse.ui.console,org.junit,org.apache.ant,org.eclipse.equinox.jsp.jasper,org.eclipse.ui.win32,org.junit4,org.eclipse.core.contenttype,org.eclipse.team.cvs.ui,org.eclipse.compare.core,org.apache.lucene,org.apache.jasper,org.eclipse.ui.navigator.resources,org.eclipse.ui.editors,org.eclipse.osgi.services,org.eclipse.emf.ecore.change,org.eclipse.cvs,org.eclipse.update.scheduler,org.eclipse.ui.views.properties.tabbed,org.eclipse.pde.ui,org.eclipse.pde.runtime,org.eclipse.emf.cheatsheets,org.eclipse.osgi.util,org.eclipse.core.variables,org.eclipse.osgi,org.eclipse.update.core,org.eclipse.core.filesystem.win32.x86,org.eclipse.jdt.source,org.eclipse.equinox.common,org.eclipse.pde.doc.user,org.eclipse.emf.mapping.ui,org.eclipse.emf.source,org.eclipse.help.ui,org.eclipse.debug.ui,org.eclipse.team.core,org.eclipse.core.net.win32.x86,org.eclipse.emf.mapping.xsd2ecore,org.eclipse.core.filebuffers,org.eclipse.pde.source,org.eclipse.emf.ecore.sdo.source,org.eclipse.swt,org.eclipse.jdt.debug.ui,org.eclipse.emf.ecore.sdo.doc,org.eclipse.ui.cheatsheets,org.eclipse.jdt.core.manipulation,org.eclipse.jdt.ui,org.eclipse.equinox.security.win32.x86,org.eclipse.emf.exporter,org.eclipse.xsd.edit,org.eclipse.core.filesystem,org.eclipse.core.expressions,org.eclipse.equinox.http.jetty,org.eclipse.ant.core,org.eclipse.emf.importer.ecore,org.eclipse.equinox.jsp.jasper.registry,org.eclipse.core.net,org.eclipse.emf.codegen,org.eclipse.core.jobs,javax.servlet.jsp,org.eclipse.sdk,org.eclipse.core.boot,org.eclipse.emf.mapping.ecore2ecore,org.eclipse.team.cvs.ssh,org.eclipse.ltk.ui.refactoring,org.eclipse.core.resources,org.eclipse.core.runtime.compatibility.registry,org.eclipse.ui.browser,org.eclipse.jdt.doc.isv,org.eclipse.equinox.http.registry,org.mortbay.jetty,org.eclipse.ui.intro,org.eclipse.jdt.junit.runtime,org.eclipse.emf.ecore.edit,org.eclipse.search,org.eclipse.core.databinding.beans,org.eclipse.ui.ide.application,org.eclipse.xsd.ecore.importer,org.eclipse.equinox.registry,org.eclipse.help.webapp,org.eclipse.ui.views,org.eclipse.jdt.junit,org.eclipse.xsd.source,org.eclipse.jdt.core,org.eclipse.xsd.doc,org.eclipse.emf.ecore.sdo.editor,org.eclipse.ui.presentations.r21,org.eclipse.platform.doc.isv,org.eclipse.xsd.cheatsheets,org.eclipse.jdt.junit4.runtime,org.eclipse.equinox.security,org.eclipse.core.commands,org.eclipse.ui,org.eclipse.debug.core,org.eclipse.emf.ecore.xmi,org.eclipse.pde.ui.templates,org.eclipse.emf.doc,org.eclipse.compare,org.eclipse.core.runtime,org.eclipse.emf.codegen.ui,org.eclipse.equinox.launcher.win32.win32.x86,org.eclipse.core.resources.compatibility,org.eclipse.ui.forms,org.eclipse.text,org.apache.commons.httpclient,org.apache.commons.el,org.eclipse.emf.ecore.editor,org.eclipse.ui.workbench.compatibility,org.eclipse.emf.ecore.sdo,org.eclipse.pde.build,org.eclipse.core.resources.win32.x86,org.eclipse.emf.importer,com.springsource.org.apache.commons.logging,org.eclipse.ui.navigator,org.eclipse.swt.win32.win32.x86,org.eclipse.jface,org.eclipse.pde,org.eclipse.platform.source,org.eclipse.jdt.compiler.apt,org.eclipse.equinox.launcher,javax.servlet,org.eclipse.update.configurator,org.eclipse.team.cvs.core,org.eclipse.emf.common,org.eclipse.jsch.core,org.eclipse.ltk.core.refactoring,org.eclipse.equinox.app,org.eclipse.rcp.source,org.eclipse.emf.ecore,org.eclipse.emf.edit,org.apache.commons.codec,org.eclipse.jface.text,org.eclipse.emf.edit.ui,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.databinding,org.eclipse.pde.core,org.eclipse.ui.workbench,org.eclipse.emf.mapping"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.tests.mango.edit,org.eclipse.emf.cdo.examples,org.eclipse.emf.cdo.tests.model1.edit,org.eclipse.emf.cdo.common,org.eclipse.net4j.util.ui,org.eclipse.emf.cdo.tests.mango,org.eclipse.net4j.tcp,org.eclipse.emf.cdo.doc,org.eclipse.net4j.ui,org.eclipse.emf.cdo.tests.model3,org.eclipse.emf.cdo.tests.model2,org.eclipse.net4j.util,org.eclipse.emf.cdo.edit,org.eclipse.emf.cdo.ui,org.eclipse.emf.cdo,org.eclipse.emf.cdo.tests.model2.edit,org.eclipse.net4j,org.eclipse.emf.cdo.tests.model1"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.jdt.compiler.tool,org.eclipse.emf.ecore.change,org.eclipse.emf.ecore,org.apache.lucene.analysis,org.eclipse.ui.editors,org.eclipse.pde.build,org.eclipse.osgi.util,org.eclipse.emf.ecore.xmi,org.eclipse.equinox.launcher.win32.win32.x86,org.eclipse.emf.codegen.ecore,org.apache.jasper,org.eclipse.ui.externaltools,org.eclipse.equinox.http.registry,org.eclipse.equinox.security.ui,org.apache.commons.codec*1.3.0.v20080530-1600,com.springsource.org.apache.commons.logging,org.eclipse.emf.mapping.ui,org.eclipse.emf.common.ui,org.eclipse.text,org.eclipse.jdt.core.manipulation,org.eclipse.ui.console,org.apache.commons.httpclient,org.eclipse.debug.ui,org.eclipse.core.runtime.compatibility.auth,org.eclipse.update.core.win32,org.eclipse.emf.cheatsheets,org.eclipse.core.runtime.compatibility.registry,org.eclipse.equinox.security,org.apache.ant,org.eclipse.pde.junit.runtime,org.eclipse.pde.ui.templates,org.eclipse.equinox.p2.core,org.eclipse.jdt.doc.isv,org.eclipse.jdt.ui,com.jcraft.jsch,org.apache.commons.codec*1.2.0.v20080530-1550,org.eclipse.team.core,javax.servlet.jsp,org.eclipse.emf.codegen.ui,org.eclipse.equinox.p2.artifact.repository,org.eclipse.pde.core,org.eclipse.equinox.frameworkadmin.equinox,org.eclipse.equinox.p2.director,org.eclipse.swt.win32.win32.x86,org.eclipse.ui.ide.application,org.eclipse.core.jobs,org.eclipse.emf.importer.rose,org.eclipse.pde.doc.user,org.eclipse.emf.mapping.xsd2ecore.editor,org.eclipse.jdt.debug,org.eclipse.ui.views.log,org.eclipse.ui.workbench,org.eclipse.equinox.app,org.eclipse.ecf,org.eclipse.platform.doc.isv,org.eclipse.emf.codegen.ecore.ui,org.eclipse.team.cvs.ssh2,org.eclipse.emf.mapping.xsd2ecore,org.eclipse.ecf.identity,org.eclipse.xsd.editor,org.eclipse.emf.exporter,org.eclipse.help.webapp,org.eclipse.xsd.edit,org.eclipse.search,org.eclipse.ui.navigator,org.eclipse.cvs,org.eclipse.emf.mapping.ecore2xml,org.eclipse.ui.workbench.compatibility,org.eclipse.equinox.p2.ui,org.eclipse.help.appserver,org.eclipse.ecf.filetransfer,org.eclipse.xsd.doc,org.eclipse.ui,org.sat4j.pb,org.eclipse.ui.browser,org.eclipse.update.scheduler,org.eclipse.jface,org.eclipse.ui.cheatsheets,org.eclipse.pde,org.eclipse.ant.ui,org.eclipse.jface.databinding,org.eclipse.equinox.p2.engine,javax.servlet,org.eclipse.emf.mapping.ecore2ecore,org.eclipse.emf.edit,org.eclipse.core.resources,org.eclipse.jface.text,org.eclipse.help.ui,org.eclipse.emf.importer,org.eclipse.equinox.p2.metadata.repository,org.eclipse.core.runtime.compatibility,org.eclipse.core.resources.compatibility,org.eclipse.emf.source,org.eclipse.pde.ui,org.eclipse.xsd.ecore.importer,org.mortbay.jetty.util,org.apache.commons.logging,org.eclipse.core.variables,org.eclipse.equinox.jsp.jasper,org.eclipse.emf.importer.ecore,org.eclipse.update.core,org.apache.lucene,org.eclipse.ui.views,org.eclipse.emf.importer.java,org.eclipse.equinox.simpleconfigurator,org.mortbay.jetty.server,org.eclipse.equinox.common,org.eclipse.emf.mapping.ecore2ecore.editor,org.eclipse.ui.navigator.resources,org.eclipse.ui.win32,org.eclipse.team.cvs.ssh,org.eclipse.help.base,org.eclipse.emf.ecore.editor,org.eclipse.ltk.core.refactoring,org.eclipse.equinox.p2.metadata,org.eclipse.jdt.source,org.eclipse.equinox.launcher,org.eclipse.equinox.frameworkadmin,org.eclipse.xsd.cheatsheets,org.sat4j.core,org.eclipse.debug.core,org.eclipse.compare,org.apache.commons.el,org.eclipse.core.filesystem,org.eclipse.ui.presentations.r21,org.eclipse.ui.intro.universal,org.eclipse.core.expressions,org.eclipse.jdt.core,org.eclipse.jsch.core,org.eclipse.core.net.win32.x86,org.eclipse.core.net,org.eclipse.emf.mapping.ecore2xml.ui,org.eclipse.osgi.services,org.eclipse.jdt.doc.user,org.eclipse.emf.edit.ui,org.eclipse.update.ui,org.eclipse.osgi,org.eclipse.rcp.source,org.eclipse.help,org.eclipse.jdt.launching,org.eclipse.ui.ide,org.eclipse.core.resources.win32.x86,com.ibm.icu,org.eclipse.equinox.jsp.jasper.registry,org.eclipse.jdt.junit,org.eclipse.emf.converter,org.eclipse.emf.ecore.edit,org.eclipse.team.cvs.ui,org.eclipse.ecf.ssl,org.eclipse.core.databinding.beans,org.eclipse.ui.forms,org.eclipse.equinox.http.servlet,org.eclipse.core.databinding,org.eclipse.xsd,org.eclipse.sdk,org.eclipse.xsd.ecore.exporter,org.eclipse.cvs.source,org.eclipse.equinox.simpleconfigurator.manipulator,org.eclipse.compare.core,org.eclipse.jdt.junit.runtime,org.eclipse.core.boot,org.eclipse.jdt.debug.ui,org.eclipse.emf.codegen,org.eclipse.emf.mapping,org.eclipse.equinox.p2.jarprocessor,org.eclipse.core.filebuffers,org.eclipse.equinox.http.jetty,org.eclipse.team.cvs.core,org.eclipse.emf.ant,org.eclipse.ui.intro,org.eclipse.core.runtime,org.junit4,org.eclipse.platform.source,org.eclipse.pde.runtime,org.eclipse.equinox.security.win32.x86,org.eclipse.core.commands,org.eclipse.jdt.compiler.apt,org.eclipse.jdt.junit4.runtime,org.eclipse.equinox.preferences,org.eclipse.ltk.ui.refactoring,org.eclipse.pde.source,org.eclipse.emf.common,org.eclipse.core.contenttype,org.eclipse.swt,org.eclipse.emf.doc,org.eclipse.ant.core,org.eclipse.xsd.source,org.eclipse.ui.views.properties.tabbed,org.eclipse.ui.workbench.texteditor,org.eclipse.emf.ecore.change.edit,org.junit,org.eclipse.equinox.registry,org.eclipse.team.ui,org.eclipse.core.filesystem.win32.x86,org.eclipse.update.configurator"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.tests.mango.edit,org.eclipse.emf.cdo.examples,org.eclipse.emf.cdo.tests.model1.edit,org.eclipse.net4j.util.ui,org.eclipse.emf.cdo.common,org.eclipse.emf.cdo.tests.mango,org.eclipse.net4j.tcp,org.eclipse.emf.cdo.doc,org.eclipse.net4j.ui,org.eclipse.emf.cdo.tests.model3,org.eclipse.emf.cdo.tests.model2,org.eclipse.net4j.util,org.eclipse.emf.cdo.edit,org.eclipse.emf.cdo.ui,org.eclipse.emf.cdo,org.eclipse.emf.cdo.tests.model2.edit,org.eclipse.emf.cdo.tests.model1,org.eclipse.net4j"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
 <booleanAttribute key="tracing" value="true"/>
@@ -41,23 +41,23 @@
 <mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
 <mapEntry key="org.eclipse.debug.ui/debug/viewers/updateSequence" value="false"/>
 <mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
-<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
 <mapEntry key="org.eclipse.debug.ui/debug/contextlaunching" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
 <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
 <mapEntry key="org.eclipse.net4j.tcp/debug" value="true"/>
 <mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug.repository" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
 <mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.common/debug.protocol" value="true"/>
 <mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/>
+<mapEntry key="org.eclipse.emf.cdo.common/debug.protocol" value="true"/>
 <mapEntry key="org.eclipse.net4j.util/debug.lifecycle.dump" value="true"/>
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.util" value="true"/>
 <mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/>
 <mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
-<mapEntry key="org.eclipse.ui/debug" value="false"/>
 <mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
+<mapEntry key="org.eclipse.ui/debug" value="false"/>
 <mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
 <mapEntry key="org.eclipse.pde.core/classpath" value="false"/>
 <mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
@@ -67,8 +67,8 @@
 <mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
 <mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
 <mapEntry key="org.eclipse.debug.core/debug/commands" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/>
 <mapEntry key="org.eclipse.team.core/threading" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/>
 <mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
@@ -81,14 +81,14 @@
 <mapEntry key="org.eclipse.debug.ui/debug" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
 <mapEntry key="org.eclipse.help.base/debug/search" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
 <mapEntry key="org.eclipse.pde.build/debug" value="false"/>
+<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/>
 <mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/>
 <mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
 <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/>
 <mapEntry key="org.eclipse.osgi/resolver/generics" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/>
 <mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/>
 <mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/>
@@ -100,8 +100,8 @@
 <mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/>
 <mapEntry key="org.eclipse.net4j.buddies/debug" value="true"/>
-<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/>
+<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
 <mapEntry key="org.eclipse.osgi/profile/startup" value="false"/>
 <mapEntry key="org.eclipse.core.jobs/jobs" value="false"/>
 <mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/>
@@ -117,11 +117,11 @@
 <mapEntry key="org.eclipse.net4j/debug.buffer" value="false"/>
 <mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.repository" value="true"/>
-<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
 <mapEntry key="org.eclipse.core.jobs/jobs/locks" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.examples/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
 <mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
 <mapEntry key="org.eclipse.ui.ide/debug" value="false"/>
 <mapEntry key="org.eclipse.osgi/profile/debug" value="false"/>
 <mapEntry key="org.eclipse.pde.core/debug" value="true"/>
@@ -130,17 +130,17 @@
 <mapEntry key="org.eclipse.net4j.util/debug.registry" value="true"/>
 <mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/>
 <mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.object" value="false"/>
 <mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo/debug.object" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug.revision" value="false"/>
 <mapEntry key="org.eclipse.core.resources/strings" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/>
 <mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
 <mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
-<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/>
+<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
+<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/perf/content_assist_sorters/extensions" value=""/>
 <mapEntry key="org.eclipse.jdt.core/debug/javamodel/cache" value="false"/>
@@ -152,45 +152,45 @@
 <mapEntry key="org.eclipse.ui/perf/part.activate" value="200"/>
 <mapEntry key="org.eclipse.update.core/debug" value="true"/>
 <mapEntry key="org.eclipse.osgi/debug/security" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
 <mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
 <mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/>
-<mapEntry key="org.eclipse.net4j.db.hsqldb/debug" value="true"/>
 <mapEntry key="org.eclipse.net4j.jms.admin/debug.protocol" value="true"/>
+<mapEntry key="org.eclipse.net4j.db.hsqldb/debug" value="true"/>
+<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/>
 <mapEntry key="org.eclipse.ui/debug/showAllJobs" value="false"/>
-<mapEntry key="org.eclipse.core.resources/history" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug.store" value="true"/>
+<mapEntry key="org.eclipse.core.resources/history" value="false"/>
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
 <mapEntry key="org.eclipse.pde.core/validation" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
 <mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/>
 <mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
 <mapEntry key="org.eclipse.equinox.preferences/set" value="false"/>
 <mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/>
-<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.protocol" value="true"/>
+<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.common/perf.revision" value="true"/>
 <mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.common/debug.model" value="true"/>
 <mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/>
-<mapEntry key="org.eclipse.emf.cdo.common/perf.revision.reading" value="true"/>
 <mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo.common/perf.revision.reading" value="true"/>
 <mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/>
 <mapEntry key="org.eclipse.net4j/debug.connector" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/perf/selection" value="300"/>
 <mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
 <mapEntry key="org.eclipse.core.resources/restore" value="false"/>
 <mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/>
 <mapEntry key="org.eclipse.net4j.buddies.server/debug" value="true"/>
+<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/>
 <mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
 <mapEntry key="org.eclipse.osgi/resolver/grouping" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/>
 <mapEntry key="org.eclipse.net4j/debug.acceptor" value="true"/>
@@ -217,8 +217,8 @@
 <mapEntry key="org.eclipse.ui.intro.universal/trace/logPerformance" value="false"/>
 <mapEntry key="org.eclipse.help/debug/context" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/multipageeditor" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo/debug" value="true"/>
+<mapEntry key="org.eclipse.ui/trace/multipageeditor" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.ui/debug" value="true"/>
 <mapEntry key="org.eclipse.net4j.examples/debug" value="true"/>
 <mapEntry key="org.eclipse.core.resources/build/needbuildstack" value="false"/>
@@ -231,12 +231,12 @@
 <mapEntry key="org.eclipse.emf.cdo.common/debug.revision" value="true"/>
 <mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/>
 <mapEntry key="org.eclipse.net4j.jms.server.jdbc/debug" value="true"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/>
 <mapEntry key="org.eclipse.core.resources/save" value="false"/>
+<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/>
 <mapEntry key="org.eclipse.core.resources/contenttype" value="false"/>
 <mapEntry key="org.eclipse.jface.text/debug/FastPartitioner/PositionCache" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug" value="true"/>
+<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/commands" value="false"/>
 <mapEntry key="org.eclipse.equinox.preferences/get" value="false"/>
@@ -253,25 +253,25 @@
 <mapEntry key="org.eclipse.net4j.jms/debug" value="true"/>
 <mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug.resource" value="true"/>
-<mapEntry key="org.eclipse.net4j.debug/debug" value="true"/>
 <mapEntry key="org.eclipse.net4j.db.derby/debug.sql" value="true"/>
+<mapEntry key="org.eclipse.net4j.debug/debug" value="true"/>
 <mapEntry key="org.eclipse.pde.core/cache" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.transaction" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo.server.db/debug" value="true"/>
-<mapEntry key="org.eclipse.debug.core/debug/events" value="false"/>
 <mapEntry key="org.eclipse.net4j/debug.selector" value="true"/>
+<mapEntry key="org.eclipse.debug.core/debug/events" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.common/perf" value="true"/>
 <mapEntry key="org.eclipse.jdt.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.db/debug.sql" value="true"/>
 <mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
+<mapEntry key="org.eclipse.net4j.db/debug.sql" value="true"/>
 <mapEntry key="org.eclipse.ui/perf/part.input" value="200"/>
 <mapEntry key="org.eclipse.ui.intro.universal/debug" value="true"/>
 <mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/messageBundles" value="false"/>
 <mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/javadelta/verbose" value="false"/>
-<mapEntry key="org.eclipse.net4j.fileshare.ui/debug" value="true"/>
 <mapEntry key="org.eclipse.net4j.util/debug.concurrency" value="true"/>
+<mapEntry key="org.eclipse.net4j.fileshare.ui/debug" value="true"/>
 <mapEntry key="org.eclipse.core.resources/save/tree" value="false"/>
 <mapEntry key="org.eclipse.ui/debug/contributions" value="false"/>
 <mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
@@ -279,20 +279,20 @@
 <mapEntry key="org.eclipse.jdt.core.manipulation/debug" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo.common/perf.revision.writing" value="true"/>
 <mapEntry key="org.eclipse.net4j.jms.admin/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.db.derby/debug" value="true"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.model" value="true"/>
+<mapEntry key="org.eclipse.net4j.db.derby/debug" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
-<mapEntry key="org.eclipse.help/debug/search" value="false"/>
 <mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
+<mapEntry key="org.eclipse.help/debug/search" value="false"/>
 <mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/part.create" value="800"/>
+<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
 <mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
 <mapEntry key="org.eclipse.team.core/streams" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.common/debug" value="true"/>
 <mapEntry key="org.eclipse.ui.ide/debug/undomonitor" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
 <mapEntry key="org.eclipse.net4j.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
 <mapEntry key="org.eclipse.ui/experimental/menus" value="false"/>
 <mapEntry key="org.eclipse.core.jobs/jobs/shutdown" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/>
@@ -309,15 +309,15 @@
 <mapEntry key="org.eclipse.ui.workbench/debug" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/perf/content_assist/extensions" value="1000"/>
 <mapEntry key="org.eclipse.osgi/debug/filter" value="false"/>
-<mapEntry key="org.eclipse.debug.core/debug" value="false"/>
 <mapEntry key="org.eclipse.net4j.buddies.common/debug" value="true"/>
+<mapEntry key="org.eclipse.debug.core/debug" value="false"/>
 <mapEntry key="org.eclipse.core.resources/debug" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
-<mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo.server/debug.protocol" value="true"/>
+<mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
 <mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/>
-<mapEntry key="org.eclipse.net4j.jms.server/debug.protocol" value="true"/>
 <mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
+<mapEntry key="org.eclipse.net4j.jms.server/debug.protocol" value="true"/>
 <mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/>
 <mapEntry key="org.eclipse.help/debug" value="true"/>
 <mapEntry key="org.eclipse.core.runtime/perf" value="false"/>
@@ -329,10 +329,10 @@
 <mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/>
 <mapEntry key="org.eclipse.debug.ui/debug/viewers/viewer" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
 <mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
+<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
 <mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/>
+<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
 <mapEntry key="org.eclipse.emf.cdo/debug.resource" value="true"/>
 <mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
 <mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
@@ -349,8 +349,8 @@
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/>
 <mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
 <mapEntry key="org.eclipse.debug.ui/debug/viewers/deltas" value="false"/>
+<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
 <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
 <mapEntry key="org.eclipse.ui.intro.universal/trace/logInfo" value="true"/>
 </mapAttribute>
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/view16/watch_list.gif b/plugins/org.eclipse.emf.cdo.ui/icons/full/view16/watch_list.gif
new file mode 100644
index 0000000000..778b46972b
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui/icons/full/view16/watch_list.gif
diff --git a/plugins/org.eclipse.emf.cdo.ui/plugin.xml b/plugins/org.eclipse.emf.cdo.ui/plugin.xml
index 48966e43a5..6c9e2eb217 100644
--- a/plugins/org.eclipse.emf.cdo.ui/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.ui/plugin.xml
@@ -36,6 +36,13 @@
             id="org.eclipse.emf.cdo.CDOSessionsView"
             name="CDO Sessions">
       </view>
+      <view
+            category="org.eclipse.emf.cdo"
+            class="org.eclipse.emf.cdo.internal.ui.views.CDOSubscriptionsView"
+            icon="icons/full/view16/watch_list.gif"
+            id="org.eclipse.emf.cdo.CDOSubscriptionsView"
+            name="CDO Subscriptions">
+      </view>
    </extension>
    
    <extension
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractContainerAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractContainerAction.java
new file mode 100644
index 0000000000..67e68d4c1c
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractContainerAction.java
@@ -0,0 +1,37 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * 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:
+ *    Victor Roldan Betancort - initial API and implementation
+ **************************************************************************/
+package org.eclipse.emf.cdo.internal.ui.actions;
+
+import org.eclipse.net4j.util.container.IContainer;
+import org.eclipse.net4j.util.ui.actions.LongRunningAction;
+
+/**
+ * @author Victor Roldan Betancort
+ */
+public abstract class AbstractContainerAction<E> extends LongRunningAction
+{
+  private IContainer.Modifiable<E> container;
+
+  public AbstractContainerAction(IContainer.Modifiable<E> container)
+  {
+    setContainer(container);
+  }
+
+  protected IContainer.Modifiable<E> getContainer()
+  {
+    return container;
+  }
+
+  protected void setContainer(IContainer.Modifiable<E> container)
+  {
+    this.container = container;
+  }
+}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CDOObjectFilterAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CDOObjectFilterAction.java
new file mode 100644
index 0000000000..ea89d64726
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CDOObjectFilterAction.java
@@ -0,0 +1,55 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * 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:
+ *    Victor Roldan Betancort - initial API and implementation
+ **************************************************************************/
+package org.eclipse.emf.cdo.internal.ui.actions;
+
+import org.eclipse.emf.cdo.internal.ui.filters.CDOObjectFilter;
+
+import org.eclipse.net4j.util.ui.actions.LongRunningAction;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * @author Victor Roldan Betancort
+ */
+public class CDOObjectFilterAction extends LongRunningAction
+{
+  private StructuredViewer viewer;
+
+  private CDOObjectFilter filter;
+
+  public CDOObjectFilterAction(StructuredViewer viewer, CDOObjectFilter filter)
+  {
+    this.viewer = viewer;
+    this.filter = filter;
+  }
+
+  @Override
+  protected void doRun(IProgressMonitor progressMonitor) throws Exception
+  {
+    viewer.getControl().getDisplay().asyncExec(new Runnable()
+    {
+      public void run()
+      {
+        Shell shell = viewer.getControl().getShell();
+        InputDialog dialog = new InputDialog(shell, filter.getTitle(), filter.getDescription(), filter.getPattern(),
+            null);
+
+        if (dialog.open() == InputDialog.OK)
+        {
+          filter.setPattern(dialog.getValue().trim());
+        }
+      }
+    });
+  }
+}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RemoveAllContainerItemAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RemoveAllContainerItemAction.java
new file mode 100644
index 0000000000..5b5bca5096
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RemoveAllContainerItemAction.java
@@ -0,0 +1,37 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * 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.ui.actions;
+
+import org.eclipse.net4j.util.container.IContainer;
+import org.eclipse.net4j.util.container.IContainer.Modifiable;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+
+/**
+ * @author Victor Roldan Betancort
+ */
+public class RemoveAllContainerItemAction<E> extends AbstractContainerAction<E>
+{
+  public RemoveAllContainerItemAction(IContainer.Modifiable<E> container)
+  {
+    super(container);
+  }
+
+  @Override
+  protected void doRun(IProgressMonitor progressMonitor) throws Exception
+  {
+    Modifiable<E> container = getContainer();
+    for (E element : container.getElements())
+    {
+      container.removeElement(element);
+    }
+  }
+}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RemoveContainerItemAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RemoveContainerItemAction.java
new file mode 100644
index 0000000000..771434fba9
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RemoveContainerItemAction.java
@@ -0,0 +1,70 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * 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:
+ *    Victor Roldan Betancort - initial API and implementation
+ **************************************************************************/
+package org.eclipse.emf.cdo.internal.ui.actions;
+
+import org.eclipse.net4j.util.container.IContainer;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+
+import java.util.List;
+
+/**
+ * @author Victor Roldan Betancort
+ */
+public class RemoveContainerItemAction<E> extends AbstractContainerAction<E>
+{
+  private ISelectionProvider selectionProvider;
+
+  private transient List<E> targets;
+
+  public RemoveContainerItemAction(IContainer.Modifiable<E> container, ISelectionProvider selectionProvider)
+  {
+    super(container);
+  }
+
+  @Override
+  protected void preRun() throws Exception
+  {
+    ISelection selection = selectionProvider.getSelection();
+    if (selection instanceof IStructuredSelection)
+    {
+      IStructuredSelection ssel = (IStructuredSelection)selection;
+      if (!ssel.isEmpty())
+      {
+        @SuppressWarnings("unchecked")
+        List<E> cast = ssel.toList();
+        targets = cast;
+        return;
+      }
+    }
+
+    cancel();
+  }
+
+  @Override
+  protected void doRun(IProgressMonitor progressMonitor) throws Exception
+  {
+    if (targets != null)
+    {
+      List<E> useTargets = targets;
+      targets = null;
+
+      IContainer.Modifiable<E> container = getContainer();
+      for (E target : useTargets)
+      {
+        container.removeElement(target);
+      }
+    }
+  }
+}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dnd/CDOObjectDropAdapter.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dnd/CDOObjectDropAdapter.java
new file mode 100644
index 0000000000..e317cb8fde
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dnd/CDOObjectDropAdapter.java
@@ -0,0 +1,76 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * 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:
+ *    Victor Roldan Betancort - initial API and implementation
+ **************************************************************************/
+package org.eclipse.emf.cdo.internal.ui.dnd;
+
+import org.eclipse.emf.cdo.CDOObject;
+
+import org.eclipse.net4j.util.container.IContainer;
+import org.eclipse.net4j.util.ui.dnd.DNDDropAdapter;
+
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TreeSelection;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.dnd.TransferData;
+
+/**
+ * @author Victor Roldan Betancort
+ */
+public class CDOObjectDropAdapter extends DNDDropAdapter<TreeSelection>
+{
+  private static final Transfer[] TRANSFERS = new Transfer[] { // CDOObjectTransfer.INSTANCE,
+  org.eclipse.emf.edit.ui.dnd.LocalTransfer.getInstance() };
+
+  protected CDOObjectDropAdapter(StructuredViewer viewer)
+  {
+    super(org.eclipse.emf.edit.ui.dnd.LocalTransfer.getInstance(), viewer);
+    setExpandEnabled(false);
+  }
+
+  @SuppressWarnings("unchecked")
+  @Override
+  protected boolean performDrop(TreeSelection data, Object target)
+  {
+    if (target instanceof IContainer.Modifiable<?>)
+    {
+      IContainer.Modifiable<CDOObject> objectContainer = (IContainer.Modifiable<CDOObject>)target;
+      for (Object obj : data.toArray())
+      {
+        if (obj instanceof CDOObject)
+        {
+          objectContainer.addElement((CDOObject)obj);
+        }
+      }
+
+      return true;
+    }
+
+    return false;
+  }
+
+  @Override
+  protected boolean validateTarget(Object target, int operation)
+  {
+    return false;
+  }
+
+  @Override
+  public boolean validateDrop(Object target, int operation, TransferData type)
+  {
+    return getTransfer().isSupportedType(type);
+  }
+
+  public static void support(StructuredViewer viewer)
+  {
+    int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+    viewer.addDropSupport(dndOperations, TRANSFERS, new CDOObjectDropAdapter(viewer));
+  }
+}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/filters/CDOObjectFilter.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/filters/CDOObjectFilter.java
new file mode 100644
index 0000000000..8f1d5d1d36
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/filters/CDOObjectFilter.java
@@ -0,0 +1,49 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * 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.ui.filters;
+
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.ViewerFilter;
+
+/**
+ * @author Victor Roldan Betancort
+ */
+public abstract class CDOObjectFilter extends ViewerFilter
+{
+  private StructuredViewer viewer;
+
+  private String pattern = "";
+
+  public CDOObjectFilter(StructuredViewer viewer)
+  {
+    this.viewer = viewer;
+    viewer.addFilter(this);
+  }
+
+  public String getPattern()
+  {
+    return pattern;
+  }
+
+  public void setPattern(String pattern)
+  {
+    parsePattern(pattern);
+    this.pattern = pattern;
+    viewer.refresh();
+  }
+
+  protected abstract void parsePattern(String pattern);
+
+  public abstract String getDescription();
+
+  public abstract String getTitle();
+
+}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/filters/CDOStateFilter.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/filters/CDOStateFilter.java
new file mode 100644
index 0000000000..8ed3cbaaab
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/filters/CDOStateFilter.java
@@ -0,0 +1,81 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * 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:
+ *    Victor Roldan Betancort - initial API and implementation
+ **************************************************************************/
+package org.eclipse.emf.cdo.internal.ui.filters;
+
+import org.eclipse.emf.cdo.CDOObject;
+import org.eclipse.emf.cdo.CDOState;
+
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.Viewer;
+
+/**
+ * @author Victor Roldan Betancort
+ */
+public class CDOStateFilter extends CDOObjectFilter
+{
+  private CDOState stateFilter;
+
+  public CDOStateFilter(StructuredViewer viewer)
+  {
+    super(viewer);
+  }
+
+  @Override
+  protected void parsePattern(String pattern)
+  {
+    if (pattern.compareToIgnoreCase("dirty") == 0)
+    {
+      stateFilter = CDOState.DIRTY;
+    }
+    else if (pattern.compareToIgnoreCase("clean") == 0)
+    {
+      stateFilter = CDOState.CLEAN;
+    }
+    else if (pattern.compareToIgnoreCase("new") == 0)
+    {
+      stateFilter = CDOState.NEW;
+    }
+    else if (pattern.compareToIgnoreCase("transient") == 0)
+    {
+      stateFilter = CDOState.TRANSIENT;
+    }
+    else if (pattern.compareToIgnoreCase("conflict") == 0)
+    {
+      stateFilter = CDOState.CONFLICT;
+    }
+    else
+    {
+      stateFilter = null;
+    }
+  }
+
+  @Override
+  public boolean select(Viewer viewer, Object parentElement, Object element)
+  {
+    if (stateFilter != null)
+    {
+      return ((CDOObject)element).cdoState() == stateFilter;
+    }
+    return true;
+  }
+
+  @Override
+  public String getDescription()
+  {
+    return "Specify a state to filter: dirty | clean | transient | new | conflict";
+  }
+
+  @Override
+  public String getTitle()
+  {
+    return "CDOState filter";
+  }
+}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSubscriptionsView.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSubscriptionsView.java
new file mode 100644
index 0000000000..ea6498b17d
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSubscriptionsView.java
@@ -0,0 +1,695 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * 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:
+ *    Victor Roldan Betancort - initial API and implementation
+ **************************************************************************/
+package org.eclipse.emf.cdo.internal.ui.views;
+
+import org.eclipse.emf.cdo.CDOAdapterPolicy;
+import org.eclipse.emf.cdo.CDOObject;
+import org.eclipse.emf.cdo.internal.ui.actions.CDOObjectFilterAction;
+import org.eclipse.emf.cdo.internal.ui.actions.RemoveAllContainerItemAction;
+import org.eclipse.emf.cdo.internal.ui.actions.RemoveContainerItemAction;
+import org.eclipse.emf.cdo.internal.ui.dnd.CDOObjectDropAdapter;
+import org.eclipse.emf.cdo.internal.ui.filters.CDOStateFilter;
+
+import org.eclipse.net4j.util.container.Container;
+import org.eclipse.net4j.util.container.IContainer;
+import org.eclipse.net4j.util.ui.UIUtil;
+import org.eclipse.net4j.util.ui.actions.LongRunningAction;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.common.notify.impl.AdapterImpl;
+import org.eclipse.emf.common.notify.impl.BasicNotifierImpl.EAdapterList;
+import org.eclipse.emf.common.util.BasicEList;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.EMFEditPlugin;
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.viewers.IColorProvider;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.KeyAdapter;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.IWorkbenchActionConstants;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.part.ViewPart;
+import org.eclipse.ui.views.properties.IPropertySheetPage;
+import org.eclipse.ui.views.properties.PropertySheetPage;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author Victor Roldan Betancort
+ */
+public class CDOSubscriptionsView extends ViewPart implements ISelectionProvider
+{
+  private TableViewer viewer;
+
+  private final String[] columnNames = { "Object", "URI", "State", "Changes" };
+
+  private final int[] columnWidths = { 100, 300, 75, 250 };
+
+  private CDOObjectContainer container = new CDOObjectContainer();
+
+  private ComposedAdapterFactory adapterFactory;
+
+  private WatchListLabelProvider labelProvider;
+
+  private PropertySheetPage propertySheetPage;
+
+  private IAction removeAction;
+
+  private IAction removeAllAction;
+
+  private IAction resetNotificationAction;
+
+  private CDOObjectFilterAction filterAction;
+
+  public CDOSubscriptionsView()
+  {
+    adapterFactory = new ComposedAdapterFactory(EMFEditPlugin.getComposedAdapterFactoryDescriptorRegistry());
+    // adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+    // adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+    adapterFactory.addAdapterFactory(new CDOObjectContainerAdapterFactory());
+  }
+
+  @Override
+  public void createPartControl(Composite parent)
+  {
+    // Create Viewer
+    getSite().setSelectionProvider(this);
+    viewer = createViewer(parent);
+
+    // Configure ViewPart
+    createActions();
+    createToolbarButtons();
+    createContextMenu();
+    hookKeyboardActions();
+    createViewPulldownMenu();
+  }
+
+  private void createActions()
+  {
+    ISharedImages platformImages = PlatformUI.getWorkbench().getSharedImages();
+    removeAction = new RemoveContainerItemAction<CDOObject>(container, viewer);
+    removeAction.setText("Remove");
+    removeAction.setImageDescriptor(platformImages.getImageDescriptor(ISharedImages.IMG_TOOL_DELETE));
+    removeAction.setDisabledImageDescriptor(platformImages.getImageDescriptor(ISharedImages.IMG_TOOL_DELETE_DISABLED));
+    removeAction.setToolTipText("Remove selected subscriptions");
+
+    removeAllAction = new RemoveAllContainerItemAction<CDOObject>(container);
+    removeAllAction.setText("Remove All");
+    removeAllAction.setImageDescriptor(platformImages.getImageDescriptor(ISharedImages.IMG_OBJS_ERROR_TSK));
+    removeAllAction.setToolTipText("Remove all subscriptions");
+
+    resetNotificationAction = new ResetNotificationAction();
+    resetNotificationAction.setText("Reset Changes");
+    resetNotificationAction.setImageDescriptor(platformImages.getImageDescriptor(ISharedImages.IMG_TOOL_UNDO));
+    resetNotificationAction.setDisabledImageDescriptor(platformImages
+        .getImageDescriptor(ISharedImages.IMG_TOOL_UNDO_DISABLED));
+    resetNotificationAction.setToolTipText("Reset all change notifications from the selected subscriptions");
+  }
+
+  private void createToolbarButtons()
+  {
+    getViewSite().getActionBars().getToolBarManager().add(removeAction);
+    removeAction.setEnabled(false);
+    viewer.addSelectionChangedListener(new ISelectionChangedListener()
+    {
+      public void selectionChanged(SelectionChangedEvent event)
+      {
+        removeAction.setEnabled(!event.getSelection().isEmpty());
+      }
+    });
+
+    getViewSite().getActionBars().getToolBarManager().add(resetNotificationAction);
+    resetNotificationAction.setEnabled(false);
+    viewer.addSelectionChangedListener(new ISelectionChangedListener()
+    {
+      public void selectionChanged(SelectionChangedEvent event)
+      {
+        resetNotificationAction.setEnabled(!event.getSelection().isEmpty());
+      }
+    });
+
+    getViewSite().getActionBars().getToolBarManager().add(removeAllAction);
+  }
+
+  private void createViewPulldownMenu()
+  {
+    ISharedImages platformImages = PlatformUI.getWorkbench().getSharedImages();
+    IMenuManager menu = getViewSite().getActionBars().getMenuManager();
+    filterAction = new CDOObjectFilterAction(viewer, new CDOStateFilter(viewer));
+    filterAction.setText("Filter...");
+    filterAction.setImageDescriptor(platformImages.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE));
+    menu.add(filterAction);
+  }
+
+  private void createContextMenu()
+  {
+    MenuManager menuMgr = new MenuManager("#PopupMenu");
+    menuMgr.setRemoveAllWhenShown(true);
+    menuMgr.addMenuListener(new IMenuListener()
+    {
+      public void menuAboutToShow(IMenuManager m)
+      {
+        CDOSubscriptionsView.this.fillContextMenu(m);
+      }
+    });
+
+    Menu menu = menuMgr.createContextMenu(viewer.getControl());
+    viewer.getControl().setMenu(menu);
+    getSite().registerContextMenu(menuMgr, viewer);
+  }
+
+  private void fillContextMenu(IMenuManager menuMgr)
+  {
+    boolean isEmpty = viewer.getSelection().isEmpty();
+    removeAction.setEnabled(!isEmpty);
+    menuMgr.add(removeAction);
+    resetNotificationAction.setEnabled(!isEmpty);
+    menuMgr.add(resetNotificationAction);
+    menuMgr.add(removeAllAction);
+    menuMgr.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
+  }
+
+  private void hookKeyboardActions()
+  {
+    viewer.getControl().addKeyListener(new KeyAdapter()
+    {
+      @Override
+      public void keyReleased(KeyEvent event)
+      {
+        handleKeyReleased(event);
+      }
+    });
+  }
+
+  protected void handleKeyReleased(KeyEvent event)
+  {
+    if (event.character == SWT.DEL && event.stateMask == 0)
+    {
+      removeAction.run();
+    }
+  }
+
+  @Override
+  public void setFocus()
+  {
+  }
+
+  public ISelection getSelection()
+  {
+    if (viewer != null)
+    {
+      return viewer.getSelection();
+    }
+
+    return StructuredSelection.EMPTY;
+  }
+
+  public void setSelection(ISelection selection)
+  {
+    // Doesn't need to set viewer.setSelection(). Already done with user event.
+  }
+
+  public void addSelectionChangedListener(ISelectionChangedListener listener)
+  {
+    if (viewer != null)
+    {
+      viewer.addSelectionChangedListener(listener);
+    }
+  }
+
+  public void removeSelectionChangedListener(ISelectionChangedListener listener)
+  {
+    if (viewer != null)
+    {
+      viewer.removeSelectionChangedListener(listener);
+    }
+  }
+
+  @SuppressWarnings("unchecked")
+  @Override
+  public Object getAdapter(Class adapter)
+  {
+    if (adapter.equals(IPropertySheetPage.class))
+    {
+      return getPropertySheetPage();
+    }
+
+    return super.getAdapter(adapter);
+  }
+
+  public IPropertySheetPage getPropertySheetPage()
+  {
+    if (propertySheetPage == null)
+    {
+      propertySheetPage = new PropertySheetPage();
+      propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
+    }
+
+    return propertySheetPage;
+  }
+
+  private TableViewer createViewer(Composite parent)
+  {
+    TableViewer viewer = new TableViewer(parent, SWT.FULL_SELECTION | SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
+    viewer.getTable().setLayoutData(UIUtil.createGridData());
+    viewer.getTable().setHeaderVisible(true);
+    viewer.getTable().setLinesVisible(true);
+    createColumns(viewer.getTable(), columnNames, columnWidths);
+    viewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+    labelProvider = new WatchListLabelProvider(adapterFactory);
+    viewer.setLabelProvider(labelProvider);
+    viewer.setInput(container);
+    CDOObjectDropAdapter.support(viewer);
+    return viewer;
+  }
+
+  private void refreshViewer()
+  {
+    try
+    {
+      viewer.getControl().getDisplay().asyncExec(new Runnable()
+      {
+        public void run()
+        {
+          try
+          {
+            viewer.refresh();
+          }
+          catch (RuntimeException ignore)
+          {
+            // Do nothing
+          }
+        }
+      });
+    }
+    catch (RuntimeException ignore)
+    {
+      // Do nothing
+    }
+  }
+
+  private void createColumns(Table table, String[] columnNames, int[] columnWidths)
+  {
+    TableColumn[] columns = new TableColumn[columnNames.length];
+    for (int i = 0; i < columns.length; i++)
+    {
+      TableColumn column = new TableColumn(table, SWT.LEFT, i);
+      column.setText(columnNames[i]);
+      column.setWidth(columnWidths[i]);
+      column.setMoveable(true);
+      column.setResizable(true);
+    }
+  }
+
+  /**
+   * @author Eike Stepper
+   */
+  private final class CDOSubscriptionAdapter extends AdapterImpl implements CDOAdapterPolicy
+  {
+    public CDOSubscriptionAdapter()
+    {
+    }
+
+    @Override
+    public void notifyChanged(Notification msg)
+    {
+      labelProvider.addNotification(msg);
+      refreshViewer();
+    }
+
+    public boolean isValid(EObject object, Adapter adapter)
+    {
+      return adapter instanceof CDOSubscriptionAdapter;
+    }
+  }
+
+  /**
+   * Since we want to get the benefits of the usage of AdapterFactoryLabelProvider and AdapterFactoryContentProvider,
+   * this class extends Notifier so it can be adapted by <code>ComposedAdapterFactory</code>. See
+   * ComposedAdapterFactory.adapt(Object target, Object type).
+   * 
+   * @author Victor Roldan Betancort
+   */
+  private final class CDOObjectContainer extends Container<CDOObject> implements Notifier,
+      IContainer.Modifiable<CDOObject>
+  {
+    private BasicEList<Adapter> eAdapters;
+
+    private Set<CDOObject> watchedObjects = new HashSet<CDOObject>();
+
+    private CDOSubscriptionAdapter subscriptionAdapter = new CDOSubscriptionAdapter();
+
+    public CDOObjectContainer()
+    {
+    }
+
+    public CDOObject[] getElements()
+    {
+      return watchedObjects.toArray(new CDOObject[watchedObjects.size()]);
+    }
+
+    @Override
+    public boolean isEmpty()
+    {
+      return watchedObjects.isEmpty();
+    }
+
+    public EList<Adapter> eAdapters()
+    {
+      if (eAdapters == null)
+      {
+        eAdapters = new EAdapterList<Adapter>(this);
+      }
+
+      return eAdapters;
+    }
+
+    public boolean eDeliver()
+    {
+      return false;
+    }
+
+    public void eNotify(Notification notification)
+    {
+      // Do nothing
+    }
+
+    public void eSetDeliver(boolean deliver)
+    {
+      // Do nothing
+    }
+
+    public void addElement(CDOObject element)
+    {
+      if (watchedObjects.add(element))
+      {
+        element.cdoView().options().addChangeSubscriptionPolicy(subscriptionAdapter);
+        element.eAdapters().add(subscriptionAdapter);
+        refreshViewer();
+      }
+    }
+
+    public void removeElement(CDOObject element)
+    {
+      if (watchedObjects.remove(element))
+      {
+        element.eAdapters().remove(subscriptionAdapter);
+        refreshViewer();
+      }
+    }
+  }
+
+  /**
+   * @author Victor Roldan Betancort
+   */
+  private static final class CDOObjectContainerAdapterFactory extends AdapterFactoryImpl implements
+      ComposeableAdapterFactory, IChangeNotifier, IDisposable
+  {
+    private static final Package viewsPackage = CDOSubscriptionsView.class.getPackage();
+
+    private ComposedAdapterFactory parentAdapterFactory;
+
+    private IChangeNotifier changeNotifier = new ChangeNotifier();
+
+    private Collection<Object> supportedTypes = new ArrayList<Object>();
+
+    public CDOObjectContainerAdapterFactory()
+    {
+      supportedTypes.add(IStructuredItemContentProvider.class);
+    }
+
+    public ComposeableAdapterFactory getRootAdapterFactory()
+    {
+      return parentAdapterFactory;
+    }
+
+    @Override
+    public boolean isFactoryForType(Object type)
+    {
+      return type == viewsPackage || type instanceof CDOObjectContainer || supportedTypes.contains(type);
+    }
+
+    /**
+     * This implementation substitutes the factory itself as the key for the adapter.
+     */
+    @Override
+    public Adapter adapt(Notifier notifier, Object type)
+    {
+      if (notifier instanceof CDOObjectContainer && IStructuredItemContentProvider.class.equals(type))
+      {
+        return new CDOObjectContainerContentProvider();
+      }
+
+      return null;
+    }
+
+    public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory)
+    {
+      this.parentAdapterFactory = parentAdapterFactory;
+    }
+
+    public void addListener(INotifyChangedListener notifyChangedListener)
+    {
+      changeNotifier.addListener(notifyChangedListener);
+    }
+
+    public void removeListener(INotifyChangedListener notifyChangedListener)
+    {
+      changeNotifier.removeListener(notifyChangedListener);
+    }
+
+    public void fireNotifyChanged(Notification notification)
+    {
+      changeNotifier.fireNotifyChanged(notification);
+      if (parentAdapterFactory != null)
+      {
+        parentAdapterFactory.fireNotifyChanged(notification);
+      }
+    }
+
+    public void dispose()
+    {
+    }
+  }
+
+  /**
+   * @author Victor Roldan Betancort
+   */
+  private static final class WatchListLabelProvider extends AdapterFactoryLabelProvider implements IColorProvider
+  {
+    private static final Color YELLOW = UIUtil.getDisplay().getSystemColor(SWT.COLOR_YELLOW);
+
+    private static final String[] eventTypes = { "CREATE", "SET", "UNSET", "ADD", "REMOVE", "ADD MANY", "REMOVE MANY",
+        "MOVE", "REMOVING ADAPTER", "RESOLVE" };
+
+    private HashMap<CDOObject, Notification> notificationMap = new HashMap<CDOObject, Notification>();
+
+    public WatchListLabelProvider(AdapterFactory adapterFactory)
+    {
+      super(adapterFactory);
+    }
+
+    @Override
+    public Image getColumnImage(Object object, int columnIndex)
+    {
+      switch (columnIndex)
+      {
+      case 0:
+        return super.getColumnImage(object, columnIndex);
+
+      default:
+        return null;
+      }
+    }
+
+    @Override
+    public String getColumnText(Object element, int columnIndex)
+    {
+      CDOObject cdoobject = (CDOObject)element;
+      switch (columnIndex)
+      {
+      case 0:
+        return super.getText(cdoobject);
+
+      case 1:
+        return cdoobject.cdoResource().getURI().toString();
+
+      case 2:
+        return cdoobject.cdoState().toString();
+
+      case 3:
+        Notification notification = notificationMap.get(element);
+        return createEventLabel(notification);
+
+      default:
+        return element.toString();
+      }
+    }
+
+    public void addNotification(Notification msg)
+    {
+      if (msg.getNotifier() instanceof CDOObject)
+      {
+        notificationMap.put((CDOObject)msg.getNotifier(), msg);
+      }
+    }
+
+    public void removeNotification(CDOObject cdoobject)
+    {
+      notificationMap.remove(cdoobject);
+    }
+
+    @Override
+    public Color getBackground(Object element)
+    {
+      if (element instanceof CDOObject)
+      {
+        if (notificationMap.containsKey(element))
+        {
+          return YELLOW;
+        }
+      }
+
+      return super.getBackground(element);
+    }
+
+    private String createEventLabel(Notification notification)
+    {
+      if (notification == null)
+      {
+        return null;
+      }
+
+      StringBuffer eventString = new StringBuffer();
+      int event = notification.getEventType();
+      if (event < Notification.EVENT_TYPE_COUNT)
+      {
+        eventString.append(eventTypes[event]);
+      }
+
+      eventString.append(": ");
+      eventString.append(((EStructuralFeature)notification.getFeature()).getName());
+      eventString.append(" = ");
+      eventString.append(notification.getNewValue().toString());
+      return eventString.toString();
+    }
+  }
+
+  /**
+   * @author Victor Roldan Betancort
+   */
+  private static final class CDOObjectContainerContentProvider extends AdapterImpl implements
+      IStructuredItemContentProvider
+  {
+    public CDOObjectContainerContentProvider()
+    {
+    }
+
+    public Collection<?> getElements(Object object)
+    {
+      Collection<Object> cdoObjects = new ArrayList<Object>();
+      if (object instanceof IContainer<?>)
+      {
+        for (Object cdoObject : ((IContainer<?>)object).getElements())
+        {
+          cdoObjects.add(cdoObject);
+        }
+      }
+
+      return cdoObjects;
+    }
+  }
+
+  private final class ResetNotificationAction extends LongRunningAction
+  {
+    private transient List<?> targets;
+
+    public ResetNotificationAction()
+    {
+    }
+
+    @Override
+    protected void preRun() throws Exception
+    {
+      ISelection selection = getSelection();
+      if (selection instanceof IStructuredSelection)
+      {
+        IStructuredSelection ssel = (IStructuredSelection)selection;
+        if (!ssel.isEmpty())
+        {
+          targets = ssel.toList();
+          return;
+        }
+      }
+
+      cancel();
+    }
+
+    @Override
+    protected void doRun(IProgressMonitor progressMonitor) throws Exception
+    {
+      if (targets != null)
+      {
+        List<?> useTargets = targets;
+        targets = null;
+
+        for (Object object : useTargets)
+        {
+          if (object instanceof CDOObject)
+          {
+            labelProvider.removeNotification((CDOObject)object);
+            refreshViewer();
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageRegistryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageRegistryImpl.java
index 0f2218cd97..1b63672c5d 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageRegistryImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageRegistryImpl.java
@@ -285,7 +285,10 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements CDOP
           try
           {
             EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage(uri);
-            putEPackage(ePackage);
+            if (ePackage.getESuperPackage() == null)
+            {
+              putEPackage(ePackage);
+            }
           }
           catch (RuntimeException ex)
           {