Removed .classpath from .gitignore and added .classpath files.

Turns out Eclipse can't easily regenerate the .classpath files, so they need to be stored.

Change-Id: I0b866a65da87bc57e76d0428c5135460b760dd13
Signed-off-by: David M. Karr <davidmichaelkarr@gmail.com>

diff --git a/.gitignore b/.gitignore
index f4d4effb0736f47fbfc1f6f17530eb1cad23fe0c..ea5abb72710bdc4c857726debfc08423d311d0b2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 **/target/
 /.settings/
-.classpath
 bin/
 libs/

diff --git a/features/com.cisco.yangide.feature/.gitignore b/features/com.cisco.yangide.feature/.gitignore
index f3de6a83f74d13791afee22302056883af552220..731eb433c5fbf213fcb10543efb586f044f69823 100644 (file)
--- a/features/com.cisco.yangide.feature/.gitignore
+++ b/features/com.cisco.yangide.feature/.gitignore
@@ -1,3 +1,2 @@
 /target/
 /.settings/
-.classpath

diff --git a/features/com.cisco.yangide.m2e.yang.feature/.gitignore b/features/com.cisco.yangide.m2e.yang.feature/.gitignore
index b77461b06d5f0ae999ce03d9e0b1dc644cabe5b1..731eb433c5fbf213fcb10543efb586f044f69823 100644 (file)
--- a/features/com.cisco.yangide.m2e.yang.feature/.gitignore
+++ b/features/com.cisco.yangide.m2e.yang.feature/.gitignore
@@ -1,3 +1,2 @@
 /target/
 /.settings/
-.classpath
\ No newline at end of file

diff --git a/plugins/com.cisco.yangide.core.tests/.classpath b/plugins/com.cisco.yangide.core.tests/.classpath
new file mode 100644 (file)
index 0000000..7641f12
--- /dev/null
+++ b/plugins/com.cisco.yangide.core.tests/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry including="**/*.java" kind="src" path="src"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry kind="output" path="target/classes"/>
+</classpath>

diff --git a/plugins/com.cisco.yangide.core.tests/.gitignore b/plugins/com.cisco.yangide.core.tests/.gitignore
index 1a79925a44dd39e1a0dfd91e54ce3821badf244f..755cdc373dd137ffb854e4ef73ee7a477cb72e7f 100644 (file)
--- a/plugins/com.cisco.yangide.core.tests/.gitignore
+++ b/plugins/com.cisco.yangide.core.tests/.gitignore
@@ -1,4 +1,3 @@
 /bin/
 /target/
 /.settings/
-.classpath
\ No newline at end of file

diff --git a/plugins/com.cisco.yangide.core/.classpath b/plugins/com.cisco.yangide.core/.classpath
new file mode 100644 (file)
index 0000000..527f722
--- /dev/null
+++ b/plugins/com.cisco.yangide.core/.classpath
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry including="**/*.java" kind="src" path="src"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry exported="true" kind="lib" path="libs/antlr4-runtime-4.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="libs/mapdb-1.0.4.jar"/>
+       <classpathentry exported="true" kind="lib" path="libs/yang-model-api-0.6.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="libs/yang-parser-impl-0.6.1.jar"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry kind="output" path="target/classes"/>
+</classpath>

diff --git a/plugins/com.cisco.yangide.core/.gitignore b/plugins/com.cisco.yangide.core/.gitignore
index b77461b06d5f0ae999ce03d9e0b1dc644cabe5b1..731eb433c5fbf213fcb10543efb586f044f69823 100644 (file)
--- a/plugins/com.cisco.yangide.core/.gitignore
+++ b/plugins/com.cisco.yangide.core/.gitignore
@@ -1,3 +1,2 @@
 /target/
 /.settings/
-.classpath
\ No newline at end of file

diff --git a/plugins/com.cisco.yangide.editor/.classpath b/plugins/com.cisco.yangide.editor/.classpath
new file mode 100644 (file)
index 0000000..af2a43e
--- /dev/null
+++ b/plugins/com.cisco.yangide.editor/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="src" path="src"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry kind="output" path="target/classes"/>
+</classpath>

diff --git a/plugins/com.cisco.yangide.editor/.gitignore b/plugins/com.cisco.yangide.editor/.gitignore
index 1a79925a44dd39e1a0dfd91e54ce3821badf244f..755cdc373dd137ffb854e4ef73ee7a477cb72e7f 100644 (file)
--- a/plugins/com.cisco.yangide.editor/.gitignore
+++ b/plugins/com.cisco.yangide.editor/.gitignore
@@ -1,4 +1,3 @@
 /bin/
 /target/
 /.settings/
-.classpath
\ No newline at end of file

diff --git a/plugins/com.cisco.yangide.ext.model.editor/.classpath b/plugins/com.cisco.yangide.ext.model.editor/.classpath
new file mode 100644 (file)
index 0000000..16d067f
--- /dev/null
+++ b/plugins/com.cisco.yangide.ext.model.editor/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="src" path="src"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry kind="output" path="bin"/>
+</classpath>

diff --git a/plugins/com.cisco.yangide.ext.model.editor/.gitignore b/plugins/com.cisco.yangide.ext.model.editor/.gitignore
index b77461b06d5f0ae999ce03d9e0b1dc644cabe5b1..731eb433c5fbf213fcb10543efb586f044f69823 100644 (file)
--- a/plugins/com.cisco.yangide.ext.model.editor/.gitignore
+++ b/plugins/com.cisco.yangide.ext.model.editor/.gitignore
@@ -1,3 +1,2 @@
 /target/
 /.settings/
-.classpath
\ No newline at end of file

diff --git a/plugins/com.cisco.yangide.ext.model/.classpath b/plugins/com.cisco.yangide.ext.model/.classpath
new file mode 100644 (file)
index 0000000..065ac06
--- /dev/null
+++ b/plugins/com.cisco.yangide.ext.model/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="src" path="src"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry kind="output" path="bin"/>
+</classpath>

diff --git a/plugins/com.cisco.yangide.ext.model/.gitignore b/plugins/com.cisco.yangide.ext.model/.gitignore
index b77461b06d5f0ae999ce03d9e0b1dc644cabe5b1..731eb433c5fbf213fcb10543efb586f044f69823 100644 (file)
--- a/plugins/com.cisco.yangide.ext.model/.gitignore
+++ b/plugins/com.cisco.yangide.ext.model/.gitignore
@@ -1,3 +1,2 @@
 /target/
 /.settings/
-.classpath
\ No newline at end of file

diff --git a/plugins/com.cisco.yangide.ext.refactoring/.classpath b/plugins/com.cisco.yangide.ext.refactoring/.classpath
new file mode 100644 (file)
index 0000000..387a55d
--- /dev/null
+++ b/plugins/com.cisco.yangide.ext.refactoring/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="src" path="src"/>
+       <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="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry kind="output" path="target/classes"/>
+</classpath>

diff --git a/plugins/com.cisco.yangide.ext.refactoring/.gitignore b/plugins/com.cisco.yangide.ext.refactoring/.gitignore
index b77461b06d5f0ae999ce03d9e0b1dc644cabe5b1..731eb433c5fbf213fcb10543efb586f044f69823 100644 (file)
--- a/plugins/com.cisco.yangide.ext.refactoring/.gitignore
+++ b/plugins/com.cisco.yangide.ext.refactoring/.gitignore
@@ -1,3 +1,2 @@
 /target/
 /.settings/
-.classpath
\ No newline at end of file

diff --git a/plugins/com.cisco.yangide.m2e.yang.tests/.classpath b/plugins/com.cisco.yangide.m2e.yang.tests/.classpath
new file mode 100644 (file)
index 0000000..7641f12
--- /dev/null
+++ b/plugins/com.cisco.yangide.m2e.yang.tests/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry including="**/*.java" kind="src" path="src"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry kind="output" path="target/classes"/>
+</classpath>

diff --git a/plugins/com.cisco.yangide.m2e.yang.tests/.gitignore b/plugins/com.cisco.yangide.m2e.yang.tests/.gitignore
index b77461b06d5f0ae999ce03d9e0b1dc644cabe5b1..731eb433c5fbf213fcb10543efb586f044f69823 100644 (file)
--- a/plugins/com.cisco.yangide.m2e.yang.tests/.gitignore
+++ b/plugins/com.cisco.yangide.m2e.yang.tests/.gitignore
@@ -1,3 +1,2 @@
 /target/
 /.settings/
-.classpath
\ No newline at end of file

diff --git a/plugins/com.cisco.yangide.m2e.yang/.classpath b/plugins/com.cisco.yangide.m2e.yang/.classpath
new file mode 100644 (file)
index 0000000..7641f12
--- /dev/null
+++ b/plugins/com.cisco.yangide.m2e.yang/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry including="**/*.java" kind="src" path="src"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry kind="output" path="target/classes"/>
+</classpath>

diff --git a/plugins/com.cisco.yangide.m2e.yang/.gitignore b/plugins/com.cisco.yangide.m2e.yang/.gitignore
index 1a79925a44dd39e1a0dfd91e54ce3821badf244f..755cdc373dd137ffb854e4ef73ee7a477cb72e7f 100644 (file)
--- a/plugins/com.cisco.yangide.m2e.yang/.gitignore
+++ b/plugins/com.cisco.yangide.m2e.yang/.gitignore
@@ -1,4 +1,3 @@
 /bin/
 /target/
 /.settings/
-.classpath
\ No newline at end of file

diff --git a/plugins/com.cisco.yangide.ui/.classpath b/plugins/com.cisco.yangide.ui/.classpath
new file mode 100644 (file)
index 0000000..af2a43e
--- /dev/null
+++ b/plugins/com.cisco.yangide.ui/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="src" path="src"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry kind="output" path="target/classes"/>
+</classpath>

diff --git a/plugins/com.cisco.yangide.ui/.gitignore b/plugins/com.cisco.yangide.ui/.gitignore
index 1a79925a44dd39e1a0dfd91e54ce3821badf244f..755cdc373dd137ffb854e4ef73ee7a477cb72e7f 100644 (file)
--- a/plugins/com.cisco.yangide.ui/.gitignore
+++ b/plugins/com.cisco.yangide.ui/.gitignore
@@ -1,4 +1,3 @@
 /bin/
 /target/
 /.settings/
-.classpath
\ No newline at end of file

diff --git a/samples/yang-module1/.classpath b/samples/yang-module1/.classpath
new file mode 100644 (file)
index 0000000..17b023c
--- /dev/null
+++ b/samples/yang-module1/.classpath
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <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="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"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="src" output="target/classes" path="target/generated-sources/sal">
+               <attributes>
+                       <attribute name="ignore_optional_problems" value="true"/>
+                       <attribute name="optional" value="true"/>
+                       <attribute name="maven.pomderived" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+               <attributes>
+                       <attribute name="maven.pomderived" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="output" path="target/classes"/>
+</classpath>

diff --git a/samples/yang-module1/.gitignore b/samples/yang-module1/.gitignore
index b77461b06d5f0ae999ce03d9e0b1dc644cabe5b1..731eb433c5fbf213fcb10543efb586f044f69823 100644 (file)
--- a/samples/yang-module1/.gitignore
+++ b/samples/yang-module1/.gitignore
@@ -1,3 +1,2 @@
 /target/
 /.settings/
-.classpath
\ No newline at end of file

diff --git a/samples/yang-module2/.classpath b/samples/yang-module2/.classpath
new file mode 100644 (file)
index 0000000..bdc48c2
--- /dev/null
+++ b/samples/yang-module2/.classpath
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <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="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+               <attributes>
+                       <attribute name="maven.pomderived" value="true"/>
+               </attributes>
+       </classpathentry>
+       <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"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="src" output="target/classes" path="target/generated-sources/sal">
+               <attributes>
+                       <attribute name="ignore_optional_problems" value="true"/>
+                       <attribute name="optional" value="true"/>
+                       <attribute name="maven.pomderived" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry kind="output" path="target/classes"/>
+</classpath>

diff --git a/samples/yang-module2/.gitignore b/samples/yang-module2/.gitignore
index b77461b06d5f0ae999ce03d9e0b1dc644cabe5b1..731eb433c5fbf213fcb10543efb586f044f69823 100644 (file)
--- a/samples/yang-module2/.gitignore
+++ b/samples/yang-module2/.gitignore
@@ -1,3 +1,2 @@
 /target/
 /.settings/
-.classpath
\ No newline at end of file

diff --git a/tests/com.cisco.yangide.editor.test/.gitignore b/tests/com.cisco.yangide.editor.test/.gitignore
index b77461b06d5f0ae999ce03d9e0b1dc644cabe5b1..731eb433c5fbf213fcb10543efb586f044f69823 100644 (file)
--- a/tests/com.cisco.yangide.editor.test/.gitignore
+++ b/tests/com.cisco.yangide.editor.test/.gitignore
@@ -1,3 +1,2 @@
 /target/
 /.settings/
-.classpath
\ No newline at end of file

diff --git a/tests/com.cisco.yangide.ext.refactoring.test/.gitignore b/tests/com.cisco.yangide.ext.refactoring.test/.gitignore
index b77461b06d5f0ae999ce03d9e0b1dc644cabe5b1..731eb433c5fbf213fcb10543efb586f044f69823 100644 (file)
--- a/tests/com.cisco.yangide.ext.refactoring.test/.gitignore
+++ b/tests/com.cisco.yangide.ext.refactoring.test/.gitignore
@@ -1,3 +1,2 @@
 /target/
 /.settings/
-.classpath
\ No newline at end of file