416817: [Table 2] The new tables must replace the old tables in Luna

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

Move the nattable feature for build and tests kfrom extraplugins feature
to main features

40 files changed, 24 insertions, 24 deletions

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/feature.xml
index d5610c75405..c8294960837 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/feature.xml
@@ -65,18 +65,6 @@ http://www.eclipse.org/legal/epl-v10.html
          version="0.0.0"/>

 

    <includes

-         id="org.eclipse.papyrus.infra.nattable.feature"

-         version="0.0.0"/>

-

-   <includes

-         id="org.eclipse.papyrus.sysml.nattable.feature"

-         version="0.0.0"/>

-

-   <includes

-         id="org.eclipse.papyrus.uml.nattable.feature"

-         version="0.0.0"/>

-

-   <includes

          id="org.eclipse.papyrus.extra.umlrt.feature"

          version="0.0.0"/>

 

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.sources.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.sources.feature/feature.xml
index de7a526e700..e1281bee346 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.sources.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.sources.feature/feature.xml
@@ -39,12 +39,6 @@ http://www.eclipse.org/legal/epl-v10.html
 

    <includes id="org.eclipse.papyrus.extra.uml.compare.source.feature" version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.infra.nattable.source.feature" version="0.0.0"/>

-

-   <includes id="org.eclipse.papyrus.sysml.nattable.source.feature" version="0.0.0"/>

-

-   <includes id="org.eclipse.papyrus.uml.nattable.source.feature" version="0.0.0"/>

-

    <includes id="org.eclipse.papyrus.extra.umlrt.source.feature" version="0.0.0"/>

 

    <includes id="org.eclipse.papyrus.java.generator.source.feature" version="0.0.0"/>

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.infra.nattable.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/.project
index 6108308f887..6108308f887 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.infra.nattable.feature/.project
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/.project
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.infra.nattable.feature/build.properties b/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/build.properties
index e1c31fb3a97..e1c31fb3a97 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.infra.nattable.feature/build.properties
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/build.properties
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.infra.nattable.feature/epl-v10.html b/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/epl-v10.html
index cb1073a4bad..cb1073a4bad 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.infra.nattable.feature/epl-v10.html
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/epl-v10.html
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.infra.nattable.feature/feature.properties b/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/feature.properties
index 3d80ed179fc..3d80ed179fc 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.infra.nattable.feature/feature.properties
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/feature.properties
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.infra.nattable.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/feature.xml
index ff503bbcbb6..ff503bbcbb6 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.infra.nattable.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/feature.xml
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.infra.nattable.feature/license.html b/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/license.html
index f19c483b9c8..f19c483b9c8 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.infra.nattable.feature/license.html
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/license.html
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml
index 673b9f590b1..d456ebcda49 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml
@@ -147,4 +147,16 @@ http://www.eclipse.org/legal/epl-v10.html
          id="org.eclipse.papyrus.uml.xtext.integration.feature"

          version="0.0.0"/>

 

+  <includes

+         id="org.eclipse.papyrus.infra.nattable.feature"

+         version="0.0.0"/>

+

+   <includes

+         id="org.eclipse.papyrus.sysml.nattable.feature"

+         version="0.0.0"/>

+

+   <includes

+         id="org.eclipse.papyrus.uml.nattable.feature"

+         version="0.0.0"/>

+

 </feature>

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sdk.sources.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.sdk.sources.feature/feature.xml
index e1f018e5be0..87fe88a76b7 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sdk.sources.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sdk.sources.feature/feature.xml
@@ -76,5 +76,11 @@ http://www.eclipse.org/legal/epl-v10.html
    <includes id="org.eclipse.papyrus.uml.search.source.feature" version="0.0.0"/>

    

    <includes id="org.eclipse.papyrus.uml.xtext.integration.feature" version="0.0.0"/>

+   

+   <includes id="org.eclipse.papyrus.infra.nattable.source.feature" version="0.0.0"/>

+

+   <includes id="org.eclipse.papyrus.sysml.nattable.source.feature" version="0.0.0"/>

+

+   <includes id="org.eclipse.papyrus.uml.nattable.source.feature" version="0.0.0"/>

 

 </feature>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.sysml.nattable.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/.project
index f06918a455a..f06918a455a 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.sysml.nattable.feature/.project
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/.project
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.sysml.nattable.feature/build.properties b/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/build.properties
index e1c31fb3a97..e1c31fb3a97 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.sysml.nattable.feature/build.properties
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/build.properties
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.sysml.nattable.feature/epl-v10.html b/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/epl-v10.html
index cb1073a4bad..cb1073a4bad 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.sysml.nattable.feature/epl-v10.html
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/epl-v10.html
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.sysml.nattable.feature/feature.properties b/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/feature.properties
index 3d80ed179fc..3d80ed179fc 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.sysml.nattable.feature/feature.properties
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/feature.properties
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.sysml.nattable.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/feature.xml
index 8e36198a738..8e36198a738 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.sysml.nattable.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/feature.xml
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.sysml.nattable.feature/license.html b/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/license.html
index f19c483b9c8..f19c483b9c8 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.sysml.nattable.feature/license.html
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/license.html
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.uml.nattable.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/.project
index a40675027f9..a40675027f9 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.uml.nattable.feature/.project
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/.project
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.uml.nattable.feature/build.properties b/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/build.properties
index e1c31fb3a97..e1c31fb3a97 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.uml.nattable.feature/build.properties
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/build.properties
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.uml.nattable.feature/epl-v10.html b/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/epl-v10.html
index cb1073a4bad..cb1073a4bad 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.uml.nattable.feature/epl-v10.html
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/epl-v10.html
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.uml.nattable.feature/feature.properties b/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/feature.properties
index 3d80ed179fc..3d80ed179fc 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.uml.nattable.feature/feature.properties
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/feature.properties
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.uml.nattable.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/feature.xml
index 6b677581a64..6b677581a64 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.uml.nattable.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/feature.xml
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.uml.nattable.feature/license.html b/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/license.html
index f19c483b9c8..f19c483b9c8 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.uml.nattable.feature/license.html
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/license.html
diff --git a/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.feature/feature.xml b/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.feature/feature.xml
index d60446c1dbd..61e61ee5e96 100644
--- a/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.feature/feature.xml
+++ b/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.feature/feature.xml
@@ -52,12 +52,6 @@ Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in t
 

    <includes id="org.eclipse.papyrus.tests.extra.cdo.feature" version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.uml.nattable.tests.feature" version="0.0.0"/>

-

-   <includes id="org.eclipse.papyrus.sysml.nattable.tests.feature" version="0.0.0"/>

-

-   <includes id="org.eclipse.papyrus.infra.nattable.tests.feature" version="0.0.0"/>

-

    <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.css.tests" install-size="0" unpack="false" version="0.0.0"/>

 

    <plugin download-size="0" id="org.eclipse.papyrus.tests.extra" install-size="0" unpack="false" version="0.0.0"/>

diff --git a/features/papyrus-tests-extra-features/org.eclipse.papyrus.infra.nattable.tests.feature/.project b/features/papyrus-tests-features/org.eclipse.papyrus.infra.nattable.tests.feature/.project
index 6b4ac00a62d..6b4ac00a62d 100644
--- a/features/papyrus-tests-extra-features/org.eclipse.papyrus.infra.nattable.tests.feature/.project
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.infra.nattable.tests.feature/.project
diff --git a/features/papyrus-tests-extra-features/org.eclipse.papyrus.infra.nattable.tests.feature/build.properties b/features/papyrus-tests-features/org.eclipse.papyrus.infra.nattable.tests.feature/build.properties
index a22994c721f..a22994c721f 100644
--- a/features/papyrus-tests-extra-features/org.eclipse.papyrus.infra.nattable.tests.feature/build.properties
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.infra.nattable.tests.feature/build.properties
diff --git a/features/papyrus-tests-extra-features/org.eclipse.papyrus.infra.nattable.tests.feature/epl-v10.html b/features/papyrus-tests-features/org.eclipse.papyrus.infra.nattable.tests.feature/epl-v10.html
index cb1073a4bad..cb1073a4bad 100644
--- a/features/papyrus-tests-extra-features/org.eclipse.papyrus.infra.nattable.tests.feature/epl-v10.html
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.infra.nattable.tests.feature/epl-v10.html
diff --git a/features/papyrus-tests-extra-features/org.eclipse.papyrus.infra.nattable.tests.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.infra.nattable.tests.feature/feature.xml
index 4540a99bd41..4540a99bd41 100644
--- a/features/papyrus-tests-extra-features/org.eclipse.papyrus.infra.nattable.tests.feature/feature.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.infra.nattable.tests.feature/feature.xml
diff --git a/features/papyrus-tests-extra-features/org.eclipse.papyrus.infra.nattable.tests.feature/license.html b/features/papyrus-tests-features/org.eclipse.papyrus.infra.nattable.tests.feature/license.html
index f19c483b9c8..f19c483b9c8 100644
--- a/features/papyrus-tests-extra-features/org.eclipse.papyrus.infra.nattable.tests.feature/license.html
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.infra.nattable.tests.feature/license.html
diff --git a/features/papyrus-tests-extra-features/org.eclipse.papyrus.sysml.nattable.tests.feature/.project b/features/papyrus-tests-features/org.eclipse.papyrus.sysml.nattable.tests.feature/.project
index 349bccd4cdd..349bccd4cdd 100644
--- a/features/papyrus-tests-extra-features/org.eclipse.papyrus.sysml.nattable.tests.feature/.project
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.sysml.nattable.tests.feature/.project
diff --git a/features/papyrus-tests-extra-features/org.eclipse.papyrus.sysml.nattable.tests.feature/build.properties b/features/papyrus-tests-features/org.eclipse.papyrus.sysml.nattable.tests.feature/build.properties
index a22994c721f..a22994c721f 100644
--- a/features/papyrus-tests-extra-features/org.eclipse.papyrus.sysml.nattable.tests.feature/build.properties
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.sysml.nattable.tests.feature/build.properties
diff --git a/features/papyrus-tests-extra-features/org.eclipse.papyrus.sysml.nattable.tests.feature/epl-v10.html b/features/papyrus-tests-features/org.eclipse.papyrus.sysml.nattable.tests.feature/epl-v10.html
index cb1073a4bad..cb1073a4bad 100644
--- a/features/papyrus-tests-extra-features/org.eclipse.papyrus.sysml.nattable.tests.feature/epl-v10.html
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.sysml.nattable.tests.feature/epl-v10.html
diff --git a/features/papyrus-tests-extra-features/org.eclipse.papyrus.sysml.nattable.tests.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.sysml.nattable.tests.feature/feature.xml
index 135eb18d4c5..135eb18d4c5 100644
--- a/features/papyrus-tests-extra-features/org.eclipse.papyrus.sysml.nattable.tests.feature/feature.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.sysml.nattable.tests.feature/feature.xml
diff --git a/features/papyrus-tests-extra-features/org.eclipse.papyrus.sysml.nattable.tests.feature/license.html b/features/papyrus-tests-features/org.eclipse.papyrus.sysml.nattable.tests.feature/license.html
index f19c483b9c8..f19c483b9c8 100644
--- a/features/papyrus-tests-extra-features/org.eclipse.papyrus.sysml.nattable.tests.feature/license.html
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.sysml.nattable.tests.feature/license.html
diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/feature.xml
index d36944f9d3b..3a334c23c74 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/feature.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/feature.xml
@@ -26,6 +26,12 @@ http://www.eclipse.org/legal/epl-v10.html
    <includes id="org.eclipse.papyrus.tests.uml.feature" version="0.0.0"/>

 

    <includes id="org.eclipse.papyrus.tests.views.feature" version="0.0.0"/>

+   

+   <includes id="org.eclipse.papyrus.uml.nattable.tests.feature" version="0.0.0"/>

+

+   <includes id="org.eclipse.papyrus.sysml.nattable.tests.feature" version="0.0.0"/>

+

+   <includes id="org.eclipse.papyrus.infra.nattable.tests.feature" version="0.0.0"/>

 

    <plugin download-size="0" id="org.eclipse.papyrus.tests" install-size="0" unpack="false" version="0.0.0"/>

 

diff --git a/features/papyrus-tests-extra-features/org.eclipse.papyrus.uml.nattable.tests.feature/.project b/features/papyrus-tests-features/org.eclipse.papyrus.uml.nattable.tests.feature/.project
index 287272eeb8b..287272eeb8b 100644
--- a/features/papyrus-tests-extra-features/org.eclipse.papyrus.uml.nattable.tests.feature/.project
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.uml.nattable.tests.feature/.project
diff --git a/features/papyrus-tests-extra-features/org.eclipse.papyrus.uml.nattable.tests.feature/build.properties b/features/papyrus-tests-features/org.eclipse.papyrus.uml.nattable.tests.feature/build.properties
index 463be2d773f..463be2d773f 100644
--- a/features/papyrus-tests-extra-features/org.eclipse.papyrus.uml.nattable.tests.feature/build.properties
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.uml.nattable.tests.feature/build.properties
diff --git a/features/papyrus-tests-extra-features/org.eclipse.papyrus.uml.nattable.tests.feature/epl-v10.html b/features/papyrus-tests-features/org.eclipse.papyrus.uml.nattable.tests.feature/epl-v10.html
index cb1073a4bad..cb1073a4bad 100644
--- a/features/papyrus-tests-extra-features/org.eclipse.papyrus.uml.nattable.tests.feature/epl-v10.html
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.uml.nattable.tests.feature/epl-v10.html
diff --git a/features/papyrus-tests-extra-features/org.eclipse.papyrus.uml.nattable.tests.feature/feature.properties b/features/papyrus-tests-features/org.eclipse.papyrus.uml.nattable.tests.feature/feature.properties
index 3d80ed179fc..3d80ed179fc 100644
--- a/features/papyrus-tests-extra-features/org.eclipse.papyrus.uml.nattable.tests.feature/feature.properties
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.uml.nattable.tests.feature/feature.properties
diff --git a/features/papyrus-tests-extra-features/org.eclipse.papyrus.uml.nattable.tests.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.uml.nattable.tests.feature/feature.xml
index c9984c68e6b..c9984c68e6b 100644
--- a/features/papyrus-tests-extra-features/org.eclipse.papyrus.uml.nattable.tests.feature/feature.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.uml.nattable.tests.feature/feature.xml
diff --git a/features/papyrus-tests-extra-features/org.eclipse.papyrus.uml.nattable.tests.feature/license.html b/features/papyrus-tests-features/org.eclipse.papyrus.uml.nattable.tests.feature/license.html
index f19c483b9c8..f19c483b9c8 100644
--- a/features/papyrus-tests-extra-features/org.eclipse.papyrus.uml.nattable.tests.feature/license.html
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.uml.nattable.tests.feature/license.html