Merge "Bumped version of YANG tools to 0.5.2-SNAPSHOT"

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/pom.xml
index 8d846a13e60f3efa658eb56a08590c264edc5ed3..2e406da497131c66f059c6ae67caba46aa851505 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>yang</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.5.1-SNAPSHOT</version>
+        <version>0.5.2-SNAPSHOT</version>
         <relativePath>../../yang/pom.xml</relativePath>
     </parent>
     <artifactId>yang-maven-plugin-it</artifactId>

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/AdditionalConfig/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/AdditionalConfig/pom.xml
index 8bd2289b116e37f0523f993028525e293113031c..3ac7ec6eee95f4f2a766a12f461c97a12a283f47 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/AdditionalConfig/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/AdditionalConfig/pom.xml
@@ -10,7 +10,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>yang-maven-plugin-spi</artifactId>
-            <version>0.5.1-SNAPSHOT</version>
+            <version>0.5.2-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
@@ -19,7 +19,7 @@
             <plugin>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.1-SNAPSHOT</version>
+                <version>0.5.2-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
@@ -56,7 +56,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
-                        <version>0.5.1-SNAPSHOT</version>
+                        <version>0.5.2-SNAPSHOT</version>
                         <type>test-jar</type>
                     </dependency>
                 </dependencies>

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Correct/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Correct/pom.xml
index ce9389f64b9d197079aaa9f9aaf6f04d3c981c18..a397cf75123e1a974c9abbd45142397c689275cc 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Correct/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Correct/pom.xml
@@ -10,7 +10,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>yang-maven-plugin-spi</artifactId>
-            <version>0.5.1-SNAPSHOT</version>
+            <version>0.5.2-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
@@ -19,7 +19,7 @@
             <plugin>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.1-SNAPSHOT</version>
+                <version>0.5.2-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
@@ -43,7 +43,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
-                        <version>0.5.1-SNAPSHOT</version>
+                        <version>0.5.2-SNAPSHOT</version>
                         <type>test-jar</type>
                     </dependency>
                 </dependencies>

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest1/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest1/pom.xml
index e1591b573399bf538b0849256f95ede52d5a236c..07b69878a9e7aa6cd70803d4808278c81a2dc1e9 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest1/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest1/pom.xml
@@ -11,7 +11,7 @@
             <plugin>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.1-SNAPSHOT</version>
+                <version>0.5.2-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
@@ -35,7 +35,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
-                        <version>0.5.1-SNAPSHOT</version>
+                        <version>0.5.2-SNAPSHOT</version>
                         <type>test-jar</type>
                     </dependency>
                 </dependencies>

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest2/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest2/pom.xml
index ed1fbf7c56ab895e5cc2e20435c282295ac5e86f..e094aed92a8bac3e66021989c8c289cf5539fb99 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest2/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest2/pom.xml
@@ -11,7 +11,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>generator-test1</artifactId>
-            <version>0.5.1-SNAPSHOT</version>
+            <version>0.5.2-SNAPSHOT</version>
             <scope>system</scope>
             <systemPath>${project.basedir}/../GenerateTest1/target/generator-test1-0.5.1-SNAPSHOT.jar</systemPath>
         </dependency>
@@ -22,7 +22,7 @@
             <plugin>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.1-SNAPSHOT</version>
+                <version>0.5.2-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
@@ -49,7 +49,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
-                        <version>0.5.1-SNAPSHOT</version>
+                        <version>0.5.2-SNAPSHOT</version>
                         <type>test-jar</type>
                     </dependency>
                 </dependencies>

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Generator/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Generator/pom.xml
index c64a857c1e408e26a4b627e6cbde080897920d04..dd98fea4cd3589a9e240dbceb92198a685fe5edc 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Generator/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Generator/pom.xml
@@ -13,7 +13,7 @@
             <plugin>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.1-SNAPSHOT</version>
+                <version>0.5.2-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
@@ -40,7 +40,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
-                        <version>0.5.1-SNAPSHOT</version>
+                        <version>0.5.2-SNAPSHOT</version>
                         <type>test-jar</type>
                     </dependency>
                 </dependencies>

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/MissingYangInDep/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/MissingYangInDep/pom.xml
index 1b73c76bb7ede04f97cb2336b8af1937257acf9a..aa0db753d7c58595c127e5db9cb2cbea045af7d3 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/MissingYangInDep/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/MissingYangInDep/pom.xml
@@ -12,7 +12,7 @@
             <plugin>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.1-SNAPSHOT</version>
+                <version>0.5.2-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
@@ -49,7 +49,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
-                        <version>0.5.1-SNAPSHOT</version>
+                        <version>0.5.2-SNAPSHOT</version>
                         <type>test-jar</type>
                     </dependency>
                 </dependencies>

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoGenerators/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoGenerators/pom.xml
index 9a43e893b5fb049e4eb25192d5732581418cadc6..8333b02ffc6d970508910dfa7cc8bef955bc5129 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoGenerators/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoGenerators/pom.xml
@@ -11,7 +11,7 @@
             <plugin>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.1-SNAPSHOT</version>
+                <version>0.5.2-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
@@ -39,7 +39,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
-                        <version>0.5.1-SNAPSHOT</version>
+                        <version>0.5.2-SNAPSHOT</version>
                         <type>test-jar</type>
                     </dependency>
                 </dependencies>

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoOutputDir/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoOutputDir/pom.xml
index 54bace053c57808918bb5ed9e9c29612ca9b0829..eea103cf4eb4e675a9053eac0735fdec5298dc22 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoOutputDir/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoOutputDir/pom.xml
@@ -12,7 +12,7 @@
             <plugin>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.1-SNAPSHOT</version>
+                <version>0.5.2-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
@@ -36,7 +36,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
-                        <version>0.5.1-SNAPSHOT</version>
+                        <version>0.5.2-SNAPSHOT</version>
                         <type>test-jar</type>
                     </dependency>
                 </dependencies>

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoYangFiles/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoYangFiles/pom.xml
index b2eeb6f66ad73e5eac7454aa37c201fd9044eca3..54056d5ca47459c96ee72b2fa0a5e482009c8600 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoYangFiles/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoYangFiles/pom.xml
@@ -12,7 +12,7 @@
             <plugin>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.1-SNAPSHOT</version>
+                <version>0.5.2-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
@@ -39,7 +39,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
-                        <version>0.5.1-SNAPSHOT</version>
+                        <version>0.5.2-SNAPSHOT</version>
                         <type>test-jar</type>
                     </dependency>
                 </dependencies>

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/UnknownGenerator/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/UnknownGenerator/pom.xml
index 96a75b969caa606bd4e41c5a8c85c22fc3d327ee..65ea6aa68e947e4c749aaf369d2af5ac20e895b1 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/UnknownGenerator/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/UnknownGenerator/pom.xml
@@ -12,7 +12,7 @@
             <plugin>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.1-SNAPSHOT</version>
+                <version>0.5.2-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
@@ -47,7 +47,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
-                        <version>0.5.1-SNAPSHOT</version>
+                        <version>0.5.2-SNAPSHOT</version>
                         <type>test-jar</type>
                     </dependency>
                 </dependencies>

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/YangRootNotExist/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/YangRootNotExist/pom.xml
index 09df6ab23ddc4834a15d26208a5d4ba24857319d..08c0e7b3ca67e055007f13ce75915a7f6692f401 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/YangRootNotExist/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/YangRootNotExist/pom.xml
@@ -12,7 +12,7 @@
             <plugin>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.1-SNAPSHOT</version>
+                <version>0.5.2-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/pom.xml
index 5afd588541382de8584324e028cd9f1a6d222ebb..297b8b49dee4014a7b96fd76ab8f38a3d4cca278 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>yang</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.5.1-SNAPSHOT</version>
+        <version>0.5.2-SNAPSHOT</version>
         <relativePath>../../yang/pom.xml</relativePath>
     </parent>
 

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang/pom.xml
index ae24c1848e5de587089796141056178da0d8b5af..bb6de3f3c70936bf91904aa4958e30ca7a7cda8b 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>yang</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.5.1-SNAPSHOT</version>
+        <version>0.5.2-SNAPSHOT</version>
         <relativePath>../../yang/pom.xml</relativePath>
     </parent>
     <artifactId>yang-maven-plugin-spi</artifactId>

diff --git a/opendaylight/sal/yang-prototype/code-generator/pom.xml b/opendaylight/sal/yang-prototype/code-generator/pom.xml
index 9edca3cd228b5cfd8caeead7dcd2b01a8d1376dd..eb30ea3b3b7b4c5b60966561e4bce6a429554471 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/pom.xml
@@ -17,7 +17,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- version of YANG tools dependencies -->
-        <yang.version>0.5.1-SNAPSHOT</yang.version>
+        <yang.version>0.5.2-SNAPSHOT</yang.version>
     </properties>
 
     <modules>

diff --git a/opendaylight/sal/yang-prototype/code-generator/samples/modeling-sample/pom.xml b/opendaylight/sal/yang-prototype/code-generator/samples/modeling-sample/pom.xml
new file mode 100644 (file)
index 0000000..260303e
--- /dev/null
+++ b/opendaylight/sal/yang-prototype/code-generator/samples/modeling-sample/pom.xml
@@ -0,0 +1,116 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <artifactId>binding-generator</artifactId>
+               <groupId>org.opendaylight.controller</groupId>
+               <version>0.5.1-SNAPSHOT</version>
+       </parent>
+       <artifactId>modeling-sample</artifactId>
+
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.opendaylight.controller</groupId>
+                               <artifactId>yang-maven-plugin</artifactId>
+                               <version>0.5.1-SNAPSHOT</version>
+                               <executions>
+                                       <execution>
+                                               <goals>
+                                                       <goal>generate-sources</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <yangFilesRootDir>src/main/yang</yangFilesRootDir>
+                                                       <codeGenerators>
+                                                               <generator>
+                                                                       <codeGeneratorClass>
+                                                                               org.opendaylight.controller.maven.sal.api.gen.plugin.CodeGeneratorImpl
+                                                                       </codeGeneratorClass>
+                                                                       <outputBaseDir>
+                                                                               target/generated-sources/sal
+                                                                       </outputBaseDir>
+                                                               </generator>
+                                                       </codeGenerators>
+                                                       <inspectDependencies>false</inspectDependencies>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+
+                               <dependencies>
+                                       <dependency>
+                                               <groupId>org.opendaylight.controller</groupId>
+                                               <artifactId>maven-sal-api-gen-plugin</artifactId>
+                                               <version>0.5.1-SNAPSHOT</version>
+                                               <type>jar</type>
+                                       </dependency>
+                               </dependencies>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.codehaus.mojo</groupId>
+                               <artifactId>build-helper-maven-plugin</artifactId>
+                               <version>1.7</version>
+                               <executions>
+                                       <execution>
+                                               <phase>generate-sources</phase>
+                                               <goals>
+                                                       <goal>add-source</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <sources>
+                                                               <source>target/generated-sources/sal</source>
+                                                       </sources>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+               </plugins>
+               <pluginManagement>
+                       <plugins>
+                               <!--This plugin's configuration is used to store Eclipse m2e settings 
+                                       only. It has no influence on the Maven build itself. -->
+                               <plugin>
+                                       <groupId>org.eclipse.m2e</groupId>
+                                       <artifactId>lifecycle-mapping</artifactId>
+                                       <version>1.0.0</version>
+                                       <configuration>
+                                               <lifecycleMappingMetadata>
+                                                       <pluginExecutions>
+                                                               <pluginExecution>
+                                                                       <pluginExecutionFilter>
+                                                                               <groupId>
+                                                                                       org.opendaylight.controller
+                                                                               </groupId>
+                                                                               <artifactId>
+                                                                                       yang-maven-plugin
+                                                                               </artifactId>
+                                                                               <versionRange>
+                                                                                       [0.5,)
+                                                                               </versionRange>
+                                                                               <goals>
+                                                                                       <goal>
+                                                                                               generate-sources
+                                                                                       </goal>
+                                                                               </goals>
+                                                                       </pluginExecutionFilter>
+                                                                       <action>
+                                                                               <ignore></ignore>
+                                                                       </action>
+                                                               </pluginExecution>
+                                                       </pluginExecutions>
+                                               </lifecycleMappingMetadata>
+                                       </configuration>
+                               </plugin>
+                       </plugins>
+               </pluginManagement>
+       </build>
+       <dependencies>
+               <dependency>
+                       <groupId>org.opendaylight.controller</groupId>
+                       <artifactId>yang-binding</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.opendaylight.controller</groupId>
+                       <artifactId>yang-common</artifactId>
+               </dependency>
+       </dependencies>
+</project>
\ No newline at end of file

diff --git a/opendaylight/sal/yang-prototype/code-generator/samples/modeling-sample/src/main/yang/sample.yang b/opendaylight/sal/yang-prototype/code-generator/samples/modeling-sample/src/main/yang/sample.yang
new file mode 100644 (file)
index 0000000..3ecdc0a
--- /dev/null
+++ b/opendaylight/sal/yang-prototype/code-generator/samples/modeling-sample/src/main/yang/sample.yang
@@ -0,0 +1,62 @@
+module sample {
+    yang-version 1;
+    namespace "sample";
+    prefix "s";
+
+    revision 2013-06-13 {
+       description "Initial demo";
+    }
+    
+
+
+    // Simple Type definition
+    
+    typedef foo-name {
+        type string;
+    }
+    
+    // Storage / data structure
+    
+    container topologies {
+        list topology {
+            leaf foo-name {
+                type string;
+            }
+        }
+    }
+    
+    
+    // Notification / Event
+    
+    notification packet-in {
+        leaf node {
+            type string;
+        }
+        leaf port {
+            type uint16;
+        }
+        leaf content {
+            type binary;
+        }
+    }
+    
+    // RPC
+    
+    rpc packet-out {
+        input {
+            leaf node {
+                type string;
+            }
+            leaf port {
+                type uint16;
+            }
+            leaf content {
+                type binary;
+            }
+        }
+        output {
+            
+        }
+    }    
+
+}
\ No newline at end of file

diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-api/pom.xml b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-api/pom.xml
index 547d83adc8ed617db4d421e3835f1911b5bc5b39..53ca93140676641d935bb4ab8081e66b88ddbc30 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-api/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-api/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>yang</artifactId>
-    <version>0.5.1-SNAPSHOT</version>
+    <version>0.5.2-SNAPSHOT</version>
     <relativePath>../../yang/pom.xml</relativePath>
   </parent>
   <artifactId>yang-model-parser-api</artifactId>

diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/pom.xml b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/pom.xml
index 16a746905e0fc2d5f192b05ee404aad18aa5ee44..b83d63f9b08f576c977a082164a6558c3cfd507c 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/pom.xml
@@ -4,7 +4,7 @@
        <parent>\r
                <groupId>org.opendaylight.controller</groupId>\r
                <artifactId>yang</artifactId>\r
-               <version>0.5.1-SNAPSHOT</version>\r
+               <version>0.5.2-SNAPSHOT</version>\r
                <relativePath>../../yang/pom.xml</relativePath>\r
        </parent>\r
        <artifactId>yang-model-parser-impl</artifactId>\r

diff --git a/opendaylight/sal/yang-prototype/yang/pom.xml b/opendaylight/sal/yang-prototype/yang/pom.xml
index e79e70028b6cdacdbd8ffc0130ad6a9669ab137c..4e15f8d47c632c43e11742a6d7a943162a4eac71 100644 (file)
--- a/opendaylight/sal/yang-prototype/yang/pom.xml
+++ b/opendaylight/sal/yang-prototype/yang/pom.xml
@@ -6,7 +6,7 @@
                <artifactId>yang-prototype</artifactId>
                <version>0.5-SNAPSHOT</version>
        </parent>
-       <version>0.5.1-SNAPSHOT</version>
+       <version>0.5.2-SNAPSHOT</version>
        <artifactId>yang</artifactId>
        <packaging>pom</packaging>
 

diff --git a/opendaylight/sal/yang-prototype/yang/yang-binding/pom.xml b/opendaylight/sal/yang-prototype/yang/yang-binding/pom.xml
index f7df24f53f9a69ecf3e709de1bdf608fe4eddf99..6362eb9accfab637b27f998f4c37674fab548399 100644 (file)
--- a/opendaylight/sal/yang-prototype/yang/yang-binding/pom.xml
+++ b/opendaylight/sal/yang-prototype/yang/yang-binding/pom.xml
@@ -3,7 +3,7 @@
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>yang</artifactId>\r
-    <version>0.5.1-SNAPSHOT</version>\r
+    <version>0.5.2-SNAPSHOT</version>\r
   </parent>\r
   <artifactId>yang-binding</artifactId>\r
 </project>
\ No newline at end of file

diff --git a/opendaylight/sal/yang-prototype/yang/yang-common/pom.xml b/opendaylight/sal/yang-prototype/yang/yang-common/pom.xml
index 987b9b11a18a11ffb901a2adff7e8e764e8ebc3a..7f5538692567b6d2ef44383fd78567f4bed3d742 100644 (file)
--- a/opendaylight/sal/yang-prototype/yang/yang-common/pom.xml
+++ b/opendaylight/sal/yang-prototype/yang/yang-common/pom.xml
@@ -3,7 +3,7 @@
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>yang</artifactId>\r
-    <version>0.5.1-SNAPSHOT</version>\r
+    <version>0.5.2-SNAPSHOT</version>\r
   </parent>\r
   <artifactId>yang-common</artifactId>\r
   <dependencies>\r

diff --git a/opendaylight/sal/yang-prototype/yang/yang-data-api/pom.xml b/opendaylight/sal/yang-prototype/yang/yang-data-api/pom.xml
index 749c9c66f439eabddf25c5da6ad3798c02003132..02562172e89099ae8fbf8f80851f2f02708da2ae 100644 (file)
--- a/opendaylight/sal/yang-prototype/yang/yang-data-api/pom.xml
+++ b/opendaylight/sal/yang-prototype/yang/yang-data-api/pom.xml
@@ -3,7 +3,7 @@
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>yang</artifactId>\r
-    <version>0.5.1-SNAPSHOT</version>\r
+    <version>0.5.2-SNAPSHOT</version>\r
   </parent>\r
   <artifactId>yang-data-api</artifactId>\r
   \r

diff --git a/opendaylight/sal/yang-prototype/yang/yang-data-util/pom.xml b/opendaylight/sal/yang-prototype/yang/yang-data-util/pom.xml
index 15b391f5b896146565a785fa8e459435dfb43be4..bce9e9134698189cec00228ac5a4cae4e05a7dc6 100644 (file)
--- a/opendaylight/sal/yang-prototype/yang/yang-data-util/pom.xml
+++ b/opendaylight/sal/yang-prototype/yang/yang-data-util/pom.xml
@@ -3,7 +3,7 @@
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>yang</artifactId>\r
-    <version>0.5.1-SNAPSHOT</version>\r
+    <version>0.5.2-SNAPSHOT</version>\r
   </parent>\r
   <artifactId>yang-data-util</artifactId>\r
   <dependencies>\r

diff --git a/opendaylight/sal/yang-prototype/yang/yang-model-api/pom.xml b/opendaylight/sal/yang-prototype/yang/yang-model-api/pom.xml
index 3eabd7ff9f4aec09ddb4964f7b8fce95187347e3..fc601e32b442e5b9ae043815d513a22cad81078a 100644 (file)
--- a/opendaylight/sal/yang-prototype/yang/yang-model-api/pom.xml
+++ b/opendaylight/sal/yang-prototype/yang/yang-model-api/pom.xml
@@ -3,7 +3,7 @@
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>yang</artifactId>\r
-    <version>0.5.1-SNAPSHOT</version>\r
+    <version>0.5.2-SNAPSHOT</version>\r
   </parent>\r
   <artifactId>yang-model-api</artifactId>\r
   <dependencies>\r

diff --git a/opendaylight/sal/yang-prototype/yang/yang-model-util/pom.xml b/opendaylight/sal/yang-prototype/yang/yang-model-util/pom.xml
index 3390837be919feae17cd0484802402b7fda0f0e9..d95b23957b15a7f2e4d181aff7144545aba5d0d6 100644 (file)
--- a/opendaylight/sal/yang-prototype/yang/yang-model-util/pom.xml
+++ b/opendaylight/sal/yang-prototype/yang/yang-model-util/pom.xml
@@ -3,7 +3,7 @@
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>yang</artifactId>\r
-    <version>0.5.1-SNAPSHOT</version>\r
+    <version>0.5.2-SNAPSHOT</version>\r
   </parent>\r
   <artifactId>yang-model-util</artifactId>\r
   <dependencies>\r