[402206] Undesirable export of org.eclipse.emf.validation dependency
https://bugs.eclipse.org/bugs/show_bug.cgi?id=402206
Factor out the oeu.uml.validation package into its own plug-in.
diff --git a/plugins/org.eclipse.uml2-feature/feature.xml b/plugins/org.eclipse.uml2-feature/feature.xml
index 10e3d85..4de9987 100644
--- a/plugins/org.eclipse.uml2-feature/feature.xml
+++ b/plugins/org.eclipse.uml2-feature/feature.xml
@@ -90,4 +90,11 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.uml2.uml.validation"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/plugins/org.eclipse.uml2.uml.validation/.classpath b/plugins/org.eclipse.uml2.uml.validation/.classpath
new file mode 100644
index 0000000..64c5e31
--- /dev/null
+++ b/plugins/org.eclipse.uml2.uml.validation/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/org.eclipse.uml2.uml.validation/.project b/plugins/org.eclipse.uml2.uml.validation/.project
new file mode 100644
index 0000000..10a8c20
--- /dev/null
+++ b/plugins/org.eclipse.uml2.uml.validation/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.uml2.uml.validation</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/org.eclipse.uml2.uml.validation/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.uml2.uml.validation/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..af0f20f
--- /dev/null
+++ b/plugins/org.eclipse.uml2.uml.validation/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.uml2.uml.validation/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.uml.validation/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..acda3fc
--- /dev/null
+++ b/plugins/org.eclipse.uml2.uml.validation/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.uml2.uml.validation;singleton:=true
+Bundle-Version: 5.0.0.qualifier
+Bundle-Vendor: %providerName
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
+ org.eclipse.emf.validation;visibility:=reexport,
+ org.eclipse.uml2.uml;visibility:=reexport
+Export-Package: org.eclipse.uml2.uml.validation
diff --git a/plugins/org.eclipse.uml2.uml.validation/about.html b/plugins/org.eclipse.uml2.uml.validation/about.html
new file mode 100644
index 0000000..598b368
--- /dev/null
+++ b/plugins/org.eclipse.uml2.uml.validation/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>May 12, 2008</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.uml2.uml.validation/build.properties b/plugins/org.eclipse.uml2.uml.validation/build.properties
new file mode 100644
index 0000000..b52ff10
--- /dev/null
+++ b/plugins/org.eclipse.uml2.uml.validation/build.properties
@@ -0,0 +1,21 @@
+# Copyright (c) 2013 CEA 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:
+# Christian W. Damus (CEA) - initial API and implementation
+#
+
+# NLS_MESSAGEFORMAT_VAR
+source.. = src/
+output.. = bin/
+bin.includes = about.html,\
+ plugin.properties,\
+ .,\
+ META-INF/
+src.includes = about.html
+exclude.. = **/doc-files/**
+javacSource = 1.5
+javacTarget = 1.5
diff --git a/plugins/org.eclipse.uml2.uml.validation/plugin.properties b/plugins/org.eclipse.uml2.uml.validation/plugin.properties
new file mode 100644
index 0000000..56963e9
--- /dev/null
+++ b/plugins/org.eclipse.uml2.uml.validation/plugin.properties
@@ -0,0 +1,14 @@
+# Copyright (c) 2012, 2013 CEA 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:
+# Christian W. Damus (CEA) - initial API and implementation
+#
+
+# NLS_MESSAGEFORMAT_VAR
+
+pluginName = UML Extensible Validation Support
+providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/validation/DelegatingConstraintDescriptor.java b/plugins/org.eclipse.uml2.uml.validation/src/org/eclipse/uml2/uml/validation/DelegatingConstraintDescriptor.java
similarity index 100%
rename from plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/validation/DelegatingConstraintDescriptor.java
rename to plugins/org.eclipse.uml2.uml.validation/src/org/eclipse/uml2/uml/validation/DelegatingConstraintDescriptor.java
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/validation/DelegatingConstraintProvider.java b/plugins/org.eclipse.uml2.uml.validation/src/org/eclipse/uml2/uml/validation/DelegatingConstraintProvider.java
similarity index 100%
rename from plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/validation/DelegatingConstraintProvider.java
rename to plugins/org.eclipse.uml2.uml.validation/src/org/eclipse/uml2/uml/validation/DelegatingConstraintProvider.java
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/validation/DelegatingModelConstraint.java b/plugins/org.eclipse.uml2.uml.validation/src/org/eclipse/uml2/uml/validation/DelegatingModelConstraint.java
similarity index 100%
rename from plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/validation/DelegatingModelConstraint.java
rename to plugins/org.eclipse.uml2.uml.validation/src/org/eclipse/uml2/uml/validation/DelegatingModelConstraint.java
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/validation/IEValidatorProvider.java b/plugins/org.eclipse.uml2.uml.validation/src/org/eclipse/uml2/uml/validation/IEValidatorProvider.java
similarity index 100%
rename from plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/validation/IEValidatorProvider.java
rename to plugins/org.eclipse.uml2.uml.validation/src/org/eclipse/uml2/uml/validation/IEValidatorProvider.java
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/validation/UMLTraversalStrategy.java b/plugins/org.eclipse.uml2.uml.validation/src/org/eclipse/uml2/uml/validation/UMLTraversalStrategy.java
similarity index 100%
rename from plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/validation/UMLTraversalStrategy.java
rename to plugins/org.eclipse.uml2.uml.validation/src/org/eclipse/uml2/uml/validation/UMLTraversalStrategy.java
diff --git a/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF
index 87828cf..19ab3d1 100644
--- a/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF
@@ -13,14 +13,12 @@
org.eclipse.uml2.uml.internal.operations;x-internal:=true,
org.eclipse.uml2.uml.internal.resource;x-internal:=true,
org.eclipse.uml2.uml.resource,
- org.eclipse.uml2.uml.util,
- org.eclipse.uml2.uml.validation
+ org.eclipse.uml2.uml.util
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.emf.ecore.xmi;visibility:=reexport,
org.eclipse.uml2.common;visibility:=reexport,
org.eclipse.uml2.types;visibility:=reexport,
- org.eclipse.emf.mapping.ecore2xml;visibility:=reexport,
- org.eclipse.emf.validation;resolution:=optional;visibility:=reexport
+ org.eclipse.emf.mapping.ecore2xml;visibility:=reexport
Eclipse-LazyStart: true
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.uml2.uml.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.uml2.uml.tests/META-INF/MANIFEST.MF
index c0b7bad..8c5b834 100644
--- a/tests/org.eclipse.uml2.uml.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.uml2.uml.tests/META-INF/MANIFEST.MF
@@ -11,6 +11,7 @@
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.uml2.uml;visibility:=reexport,
org.eclipse.uml2.uml.resources;visibility:=reexport,
+ org.eclipse.uml2.uml.validation;visibility:=reexport,
org.eclipse.emf.ecore.xmi;visibility:=reexport,
org.junit;visibility:=reexport
Eclipse-LazyStart: true
