4 files changed, 9 insertions, 16 deletions
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/.classpath b/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/.classpath
index 2d1a4302f04..8a8f1668cdc 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/.classpath
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/.classpath
@@ -1,6 +1,6 @@
 <?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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/.settings/org.eclipse.jdt.core.prefs b/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..f287d53cf45
--- /dev/null
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/.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.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/build.properties b/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/build.properties
index ba491cbd5a4..1b08f841b5e 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/build.properties
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/build.properties
@@ -2,15 +2,6 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.xml,\
                about.html,\
-               bin/,\
                plugin.properties
-src.includes = .classpath,\
-               .project,\
-               META-INF/,\
-               about.html,\
-               build.properties,\
-               plugin.properties,\
-               src/,\
-               plugin.xml
+src.includes = about.html
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/plugin.xml b/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/plugin.xml
deleted file mode 100644
index b60f62ae57e..00000000000
--- a/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-</plugin>