CDO marker provider was in the wrong plug-in (it's not UML dependent).

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

7 files changed, 24 insertions, 20 deletions

diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF b/plugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF
index 68c062f11f5..15a9c1e6418 100644
--- a/plugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF
+++ b/plugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF
@@ -18,7 +18,9 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.cdo.dawn.ui;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.emf;bundle-version="0.10.0",
  org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.3.0",
- org.eclipse.papyrus.infra.onefile;bundle-version="0.10.0"
+ org.eclipse.papyrus.infra.onefile;bundle-version="0.10.0",
+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="0.10.0",
+ org.eclipse.papyrus.cdo.validation.problems;bundle-version="0.10.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
@@ -34,6 +36,7 @@ Export-Package: org.eclipse.papyrus.cdo.internal.ui,
  org.eclipse.papyrus.cdo.internal.ui.editors,
  org.eclipse.papyrus.cdo.internal.ui.expressions,
  org.eclipse.papyrus.cdo.internal.ui.handlers,
+ org.eclipse.papyrus.cdo.internal.ui.markers,
  org.eclipse.papyrus.cdo.internal.ui.properties,
  org.eclipse.papyrus.cdo.internal.ui.providers,
  org.eclipse.papyrus.cdo.internal.ui.util,
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/plugin.xml b/plugins/cdo/org.eclipse.papyrus.cdo.ui/plugin.xml
index 4c5dd4c08a3..9b24d13530c 100644
--- a/plugins/cdo/org.eclipse.papyrus.cdo.ui/plugin.xml
+++ b/plugins/cdo/org.eclipse.papyrus.cdo.ui/plugin.xml
@@ -274,4 +274,18 @@
       </propertyTester>
    </extension>
    
+   <extension
+         point="org.eclipse.papyrus.infra.services.markerlistener.markerproviders">
+      <provider
+            class="org.eclipse.papyrus.cdo.internal.ui.markers.CDOMarkerProvider">
+         <enablement>
+            <instanceof
+                  value="org.eclipse.emf.cdo.eresource.CDOResource">
+            </instanceof>
+         </enablement>
+      </provider>
+      <monitor class="org.eclipse.papyrus.cdo.internal.ui.markers.CDOMarkerMonitor">
+      </monitor>
+   </extension>
+   
 </plugin>
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/markers/CDOMarkerMonitor.java b/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/markers/CDOMarkerMonitor.java
index 0f66df59d81..719ec15440c 100644
--- a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/markers/CDOMarkerMonitor.java
+++ b/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/markers/CDOMarkerMonitor.java
@@ -9,7 +9,7 @@
  * Contributors:
  *   CEA LIST - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.cdo.uml.internal.ui.markers;
+package org.eclipse.papyrus.cdo.internal.ui.markers;
 
 import org.eclipse.papyrus.cdo.validation.problems.util.ProblemsEvent;
 import org.eclipse.papyrus.cdo.validation.problems.util.ProblemsListener;
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/markers/CDOMarkerProvider.java b/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/markers/CDOMarkerProvider.java
index 58defcb7c12..91241d0f200 100644
--- a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/markers/CDOMarkerProvider.java
+++ b/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/markers/CDOMarkerProvider.java
@@ -9,7 +9,7 @@
  * Contributors:
  *   CEA LIST - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.cdo.uml.internal.ui.markers;
+package org.eclipse.papyrus.cdo.internal.ui.markers;
 
 import java.util.Collection;
 
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/markers/CDOPapyrusMarker.java b/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/markers/CDOPapyrusMarker.java
index b7d934e3706..d2eacefdc8d 100644
--- a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/markers/CDOPapyrusMarker.java
+++ b/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/markers/CDOPapyrusMarker.java
@@ -9,7 +9,7 @@
  * Contributors:
  *   CEA LIST - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.cdo.uml.internal.ui.markers;
+package org.eclipse.papyrus.cdo.internal.ui.markers;
 
 import java.util.Map;
 
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF b/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF
index 4786e17ec6a..84a1f940070 100644
--- a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF
+++ b/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF
@@ -10,11 +10,11 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.core.log;bundle-version="0.10.0",
  org.eclipse.papyrus.uml.tools;bundle-version="0.10.0",
  org.eclipse.papyrus.cdo.ui;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="0.10.0",
- org.eclipse.papyrus.cdo.validation.problems;bundle-version="0.10.0"
+ org.eclipse.papyrus.infra.widgets;bundle-version="0.10.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
 Import-Package: com.google.common.base;version="10.0.1",
  com.google.common.collect;version="10.0.1"
+Export-Package: org.eclipse.papyrus.cdo.uml.internal.ui,
+ org.eclipse.papyrus.cdo.uml.internal.ui.importsources
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/plugin.xml b/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/plugin.xml
index 95d94c14035..0a442ce04a1 100644
--- a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/plugin.xml
+++ b/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/plugin.xml
@@ -23,18 +23,5 @@
          </enablement>
       </importSource>
    </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.services.markerlistener.markerproviders">
-      <provider
-            class="org.eclipse.papyrus.cdo.uml.internal.ui.markers.CDOMarkerProvider">
-         <enablement>
-            <instanceof
-                  value="org.eclipse.emf.cdo.eresource.CDOResource">
-            </instanceof>
-         </enablement>
-      </provider>
-      <monitor class="org.eclipse.papyrus.cdo.uml.internal.ui.markers.CDOMarkerMonitor">
-      </monitor>
-   </extension>
 
 </plugin>