Fixed artifact references in samples.

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

diff --git a/samples/yang-module1/.classpath b/samples/yang-module1/.classpath
index 1c43a3531baa7ef8da57d5e33934d0ac57a9e701..fbbc27ddcb99d4702113b1e038a4b221a2f15904 100644 (file)
--- a/samples/yang-module1/.classpath
+++ b/samples/yang-module1/.classpath
@@ -17,24 +17,25 @@
                        <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">
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
                <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"/>
-                       <attribute name="ignore_optional_problems" 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"/>
-                       <attribute name="ignore_optional_problems" value="true"/>
                </attributes>
        </classpathentry>
+       <classpathentry combineaccessrules="false" kind="src" path="/yang-module2"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/samples/yang-module1/pom.xml b/samples/yang-module1/pom.xml
index 7f7837c882235afb38647db599b3ebc159f96967..754c2981498fa30cd7225a6dc80c842946e4e950 100644 (file)
--- a/samples/yang-module1/pom.xml
+++ b/samples/yang-module1/pom.xml
@@ -4,10 +4,12 @@
        <groupId>yang-test</groupId>
        <artifactId>yang-module1</artifactId>
        <version>0.0.1-SNAPSHOT</version>
+<!-- 
        <properties>
                <maven.compiler.source>1.7</maven.compiler.source>
                <maven.compiler.target>1.7</maven.compiler.target>
        </properties>
+        -->
        <dependencies>
                <dependency>
                        <groupId>org.opendaylight.mdsal</groupId>
@@ -49,7 +51,7 @@
                        <plugin>
                                <groupId>org.opendaylight.yangtools</groupId>
                                <artifactId>yang-maven-plugin</artifactId>
-                               <version>0.6.2-Helium</version>
+                               <version>0.8.0-Beryllium</version>
                                <executions>
                                        <execution>
                                                <id>generate-sources</id>

diff --git a/samples/yang-module2/.classpath b/samples/yang-module2/.classpath
index 9959c4b81276923dbbaffc08e1d790b4e536ed04..d1b0d7ca1f9308c2197e397c73462ef02bd80623 100644 (file)
--- a/samples/yang-module2/.classpath
+++ b/samples/yang-module2/.classpath
@@ -23,5 +23,19 @@
                </attributes>
        </classpathentry>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry kind="src" output="target/classes" path="src/main/yang">
+               <attributes>
+                       <attribute name="optional" value="true"/>
+                       <attribute name="maven.pomderived" value="true"/>
+                       <attribute name="ignore_optional_problems" value="true"/>
+               </attributes>
+       </classpathentry>
+       <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"/>
 </classpath>

diff --git a/samples/yang-module2/pom.xml b/samples/yang-module2/pom.xml
index 74a29e5e83745e6de5ac3b867ead23ecc45cd548..ec18ccffe038dabc5994a2e2349781107117cd08 100644 (file)
--- a/samples/yang-module2/pom.xml
+++ b/samples/yang-module2/pom.xml
@@ -43,7 +43,7 @@
       <plugin>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yang-maven-plugin</artifactId>
-        <version>0.6.2-Helium</version>
+        <version>0.8.0-Beryllium</version>
         <executions>
           <execution>
             <id>generate-sources</id>