Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Noyrit2016-04-18 04:23:09 -0400
committerGerrit Code Review @ Eclipse.org2016-04-19 09:10:07 -0400
commit74277e4e464813a72120e2f3e1c320eca04a51f2 (patch)
tree3a71f39f7d7a1c0dad7d8de281f7cb9d7fd531f2 /tests/framework
parent4ea6b237f5db0dc206ce1f239c9bd93d38126aa5 (diff)
downloadorg.eclipse.papyrus-74277e4e464813a72120e2f3e1c320eca04a51f2.tar.gz
org.eclipse.papyrus-74277e4e464813a72120e2f3e1c320eca04a51f2.tar.xz
org.eclipse.papyrus-74277e4e464813a72120e2f3e1c320eca04a51f2.zip
Bug 491883 - Remove the ExtendedTypes framework
Diffstat (limited to 'tests/framework')
-rw-r--r--tests/framework/org.eclipse.papyrus.tests.framework.annotations/.classpath4
-rw-r--r--tests/framework/org.eclipse.papyrus.tests.framework.annotations/.project10
-rw-r--r--tests/framework/org.eclipse.papyrus.tests.framework/.classpath6
-rw-r--r--tests/framework/org.eclipse.papyrus.tests.framework/.project10
-rw-r--r--tests/framework/org.eclipse.papyrus.tests.framework/.settings/org.eclipse.xtend.core.Xtend.prefs6
5 files changed, 21 insertions, 15 deletions
diff --git a/tests/framework/org.eclipse.papyrus.tests.framework.annotations/.classpath b/tests/framework/org.eclipse.papyrus.tests.framework.annotations/.classpath
index ee4eb7d5271..5e6b75c87b4 100644
--- a/tests/framework/org.eclipse.papyrus.tests.framework.annotations/.classpath
+++ b/tests/framework/org.eclipse.papyrus.tests.framework.annotations/.classpath
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="xtend-gen"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="src" path="xtend-gen/"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/tests/framework/org.eclipse.papyrus.tests.framework.annotations/.project b/tests/framework/org.eclipse.papyrus.tests.framework.annotations/.project
index 1e0ca0d6f8e..5f37c92d7f5 100644
--- a/tests/framework/org.eclipse.papyrus.tests.framework.annotations/.project
+++ b/tests/framework/org.eclipse.papyrus.tests.framework.annotations/.project
@@ -26,11 +26,6 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.eclipse.oomph.version.VersionBuilder</name>
<arguments>
<dictionary>
@@ -52,6 +47,11 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
diff --git a/tests/framework/org.eclipse.papyrus.tests.framework/.classpath b/tests/framework/org.eclipse.papyrus.tests.framework/.classpath
index aa2831b138c..82a65d5292c 100644
--- a/tests/framework/org.eclipse.papyrus.tests.framework/.classpath
+++ b/tests/framework/org.eclipse.papyrus.tests.framework/.classpath
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="xtend-gen"/>
- <classpathentry kind="src" path="src-gen"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="src" path="xtend-gen/"/>
+ <classpathentry kind="src" path="src-gen/"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/tests/framework/org.eclipse.papyrus.tests.framework/.project b/tests/framework/org.eclipse.papyrus.tests.framework/.project
index 6b608537427..111a7536bc3 100644
--- a/tests/framework/org.eclipse.papyrus.tests.framework/.project
+++ b/tests/framework/org.eclipse.papyrus.tests.framework/.project
@@ -26,11 +26,6 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.eclipse.oomph.version.VersionBuilder</name>
<arguments>
<dictionary>
@@ -52,6 +47,11 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
diff --git a/tests/framework/org.eclipse.papyrus.tests.framework/.settings/org.eclipse.xtend.core.Xtend.prefs b/tests/framework/org.eclipse.papyrus.tests.framework/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 00000000000..df3c3c49d40
--- /dev/null
+++ b/tests/framework/org.eclipse.papyrus.tests.framework/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,6 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true

Back to the top