Fix for bug 373644 (on behalf of Christian W. Camus)

[+minor correction of build.properties]

3 files changed, 48 insertions, 3 deletions

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF
index 4b130ed275b..b05cee3a861 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: UML Tools
-Bundle-SymbolicName: org.eclipse.papyrus.uml.tools
+Bundle-SymbolicName: org.eclipse.papyrus.uml.tools;singleton:=true
 Bundle-Version: 0.9.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.uml.tools.Activator
 Bundle-Vendor: Eclipse Modeling Project
@@ -22,7 +22,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.services.edit;bundle-version="0.9.0",
  org.eclipse.papyrus.uml.tools.utils;bundle-version="0.9.0",
  org.eclipse.uml2.common.edit;bundle-version="1.6.0",
- org.eclipse.uml2.uml.edit;bundle-version="4.0.0"
+ org.eclipse.uml2.uml.edit;bundle-version="4.0.0",
+ org.eclipse.papyrus.infra.services.validation;bundle-version="0.9.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.uml.tools,
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/build.properties b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/build.properties
index 785a40c0ec7..e3693a3b66e 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/build.properties
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/build.properties
@@ -2,5 +2,6 @@ source.. = src/
 output.. = bin/

 bin.includes = META-INF/,\

                .,\

-               about.html

+               about.html,\

+               plugin.xml

 src.includes = about.html

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/plugin.xml b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/plugin.xml
new file mode 100644
index 00000000000..442b1ff7996
--- /dev/null
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/plugin.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+<!-- Register the UML delegating constraint provider -->
+<extension
+      point="org.eclipse.emf.validation.constraintProviders">
+   <category
+         id="org.eclipse.papyrus.uml.tools.uml"
+         name="UML Metamodel Constraints">
+   </category>
+   <constraintProvider
+         cache="true"
+         class="org.eclipse.uml2.uml.validation.DelegatingConstraintProvider"
+         mode="Batch">
+      <package
+            namespaceUri="http://www.eclipse.org/uml2/4.0.0/UML">
+      </package>
+      
+      <!-- Put the UML metamodel constraints into this category. -->
+      <category path="org.eclipse.papyrus.uml.tools.uml"/>
+      
+      <!-- EMF Facet replaces the UML Validator with one that delegates
+           to the ModelValidationService, which not only doesn't work
+           with the delegating provider, but would be a dependency
+           cycle anyways. -->
+      <eValidatorProvider class="org.eclipse.uml2.uml.validation.IEValidatorProvider$UML"/>
+   </constraintProvider>
+</extension>
+<!-- Bind the UML metamodel constraint provider's constraints to the Papyrus application. -->
+<extension
+      point="org.eclipse.emf.validation.constraintBindings">
+   <clientContext
+         id="org.eclipse.papyrus.uml.tools.context">
+      <selector
+            class="org.eclipse.papyrus.infra.services.validation.PapyrusClientSelector">
+      </selector>
+   </clientContext>
+   <binding
+         context="org.eclipse.papyrus.uml.tools.context"
+         category="org.eclipse.papyrus.uml.tools.uml">
+   </binding>
+</extension>
+</plugin>