Make 2-3x .classpath & .project matching to what M2E now auto. generates

Change-Id: I36706db8ef96d660f720f855fd0d392686d5f13e
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/plugins/org.opendaylight.yangide.core.tests/.project b/plugins/org.opendaylight.yangide.core.tests/.project
index 8d222732508c443641850a554c4b1cb967bc3249..5395b2a6b9dca5eef19198f40a4966e7eacecaf2 100644 (file)
--- a/plugins/org.opendaylight.yangide.core.tests/.project
+++ b/plugins/org.opendaylight.yangide.core.tests/.project
@@ -20,6 +20,11 @@
                        <arguments>
                        </arguments>
                </buildCommand>
+               <buildCommand>
+                       <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
                <buildCommand>
                        <name>org.eclipse.m2e.core.maven2Builder</name>
                        <arguments>
@@ -30,5 +35,6 @@
                <nature>org.eclipse.m2e.core.maven2Nature</nature>
                <nature>org.eclipse.pde.PluginNature</nature>
                <nature>org.eclipse.jdt.core.javanature</nature>
+               <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
        </natures>
 </projectDescription>

diff --git a/plugins/org.opendaylight.yangide.ext.model.editor/.classpath b/plugins/org.opendaylight.yangide.ext.model.editor/.classpath
index cf075adee694e04143a971367900d424a67fb3f4..61d594bc6c232e627ffa286ce6bb91f89e007491 100644 (file)
--- a/plugins/org.opendaylight.yangide.ext.model.editor/.classpath
+++ b/plugins/org.opendaylight.yangide.ext.model.editor/.classpath
@@ -1,8 +1,27 @@
 <?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/JavaSE-1.8"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+               <attributes>
+                       <attribute name="maven.pomderived" value="true"/>
+               </attributes>
+       </classpathentry>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="src" path="src/main/java"/>
-       <classpathentry kind="src" path="src/test/java/"/>
+       <classpathentry kind="src" output="target/classes" path="src/main/java">
+               <attributes>
+                       <attribute name="optional" value="true"/>
+                       <attribute name="maven.pomderived" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="src" output="target/test-classes" path="src/test/java">
+               <attributes>
+                       <attribute name="optional" value="true"/>
+                       <attribute name="maven.pomderived" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+               <attributes>
+                       <attribute name="maven.pomderived" value="true"/>
+               </attributes>
+       </classpathentry>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/plugins/org.opendaylight.yangide.m2e.yang.tests/.project b/plugins/org.opendaylight.yangide.m2e.yang.tests/.project
index 733815c064e7d270746fbe71a662d480585a0c1b..ad7d555d28e0949e1535f12d29dc0465078ea18e 100644 (file)
--- a/plugins/org.opendaylight.yangide.m2e.yang.tests/.project
+++ b/plugins/org.opendaylight.yangide.m2e.yang.tests/.project
@@ -20,6 +20,11 @@
                        <arguments>
                        </arguments>
                </buildCommand>
+               <buildCommand>
+                       <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
                <buildCommand>
                        <name>org.eclipse.m2e.core.maven2Builder</name>
                        <arguments>
@@ -30,5 +35,6 @@
                <nature>org.eclipse.m2e.core.maven2Nature</nature>
                <nature>org.eclipse.pde.PluginNature</nature>
                <nature>org.eclipse.jdt.core.javanature</nature>
+               <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
        </natures>
 </projectDescription>

diff --git a/samples/yang-module2/.classpath b/samples/yang-module2/.classpath
index 13a16d526fded7ef93d139e333b5d59c616f3ed1..5832dadf8c7b95ea0d3c361ce91c69d62ab84cfc 100644 (file)
--- a/samples/yang-module2/.classpath
+++ b/samples/yang-module2/.classpath
@@ -17,23 +17,24 @@
                        <attribute name="maven.pomderived" value="true"/>
                </attributes>
        </classpathentry>
-       <classpathentry kind="src" output="target/classes" path="src/main/yang">
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
                <attributes>
-                       <attribute name="ignore_optional_problems" value="true"/>
-                       <attribute name="optional" value="true"/>
                        <attribute name="maven.pomderived" value="true"/>
                </attributes>
        </classpathentry>
-       <classpathentry kind="src" output="target/classes" path="target/generated-sources/sal">
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry kind="src" output="target/classes" path="src/main/yang">
                <attributes>
-                       <attribute name="ignore_optional_problems" value="true"/>
                        <attribute name="optional" value="true"/>
                        <attribute name="maven.pomderived" value="true"/>
+                       <attribute name="ignore_optional_problems" value="true"/>
                </attributes>
        </classpathentry>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+       <classpathentry kind="src" output="target/classes" path="target/generated-sources/sal">
                <attributes>
+                       <attribute name="optional" value="true"/>
                        <attribute name="maven.pomderived" value="true"/>
+                       <attribute name="ignore_optional_problems" value="true"/>
                </attributes>
        </classpathentry>
        <classpathentry kind="output" path="target/classes"/>

diff --git a/tests/.settings/org.eclipse.m2e.core.prefs b/tests/.settings/org.eclipse.m2e.core.prefs
new file mode 100644 (file)
index 0000000..f897a7f
--- /dev/null
+++ b/tests/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1