Updated yangtools version to 0.5.6-SNAPSHOT.

Moved all yang-* modules under yang directory. Updated poms.
Fixed bug in yang uses processing.

Change-Id: I4b65a92d4e827bf05aa95ef234394c0eed49c0a9
Signed-off-by: Martin Vitez <mvitez@cisco.com>

diff --git a/code-generator/binding-generator-api/pom.xml b/code-generator/binding-generator-api/pom.xml
index 544942be82c5b8866e4dab633aba157276ae8c59..695fccfc863044d18f263b0f29c6820f85461441 100644 (file)
--- a/code-generator/binding-generator-api/pom.xml
+++ b/code-generator/binding-generator-api/pom.xml
@@ -2,9 +2,9 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
 \r
     <parent>\r
-        <groupId>org.opendaylight.controller</groupId>\r
+        <groupId>org.opendaylight.yangtools</groupId>\r
         <artifactId>binding-generator</artifactId>\r
-        <version>0.5.5-SNAPSHOT</version>\r
+        <version>0.5.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
@@ -12,7 +12,7 @@
 \r
     <dependencies>\r
         <dependency>\r
-            <groupId>org.opendaylight.controller</groupId>\r
+            <groupId>org.opendaylight.yangtools</groupId>\r
             <artifactId>binding-model-api</artifactId>\r
         </dependency>\r
         <dependency>\r

diff --git a/code-generator/binding-generator-impl/pom.xml b/code-generator/binding-generator-impl/pom.xml
index cbecf02846695a1b07430f20383f3920aa65825d..2bee8052e07fe552e4fdadad6c56b629621f9150 100644 (file)
--- a/code-generator/binding-generator-impl/pom.xml
+++ b/code-generator/binding-generator-impl/pom.xml
@@ -2,9 +2,9 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
 \r
     <parent>\r
-        <groupId>org.opendaylight.controller</groupId>\r
+        <groupId>org.opendaylight.yangtools</groupId>\r
         <artifactId>binding-generator</artifactId>\r
-        <version>0.5.5-SNAPSHOT</version>\r
+        <version>0.5.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
@@ -12,20 +12,20 @@
 \r
     <dependencies>\r
         <dependency>\r
-            <groupId>org.opendaylight.controller</groupId>\r
+            <groupId>org.opendaylight.yangtools</groupId>\r
             <artifactId>binding-generator-util</artifactId>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.opendaylight.yangtools</groupId>\r
             <artifactId>yang-parser-impl</artifactId>\r
-            <version>${yangtools.version}</version>\r
+            <version>${yang.version}</version>\r
         </dependency>\r
         <dependency>\r
-            <groupId>org.opendaylight.controller</groupId>\r
+            <groupId>org.opendaylight.yangtools</groupId>\r
             <artifactId>binding-generator-api</artifactId>\r
         </dependency>\r
         <dependency>\r
-            <groupId>org.opendaylight.controller</groupId>\r
+            <groupId>org.opendaylight.yangtools</groupId>\r
             <artifactId>binding-generator-spi</artifactId>\r
         </dependency>\r
         <dependency>\r

diff --git a/code-generator/binding-generator-spi/pom.xml b/code-generator/binding-generator-spi/pom.xml
index b011da3785283f5be299b2085efbfd6faeb15e98..01a82ffb9f9dcc3a5cf36425dac03d04c2164af5 100644 (file)
--- a/code-generator/binding-generator-spi/pom.xml
+++ b/code-generator/binding-generator-spi/pom.xml
@@ -2,9 +2,9 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
 \r
     <parent>\r
-        <groupId>org.opendaylight.controller</groupId>\r
+        <groupId>org.opendaylight.yangtools</groupId>\r
         <artifactId>binding-generator</artifactId>\r
-        <version>0.5.5-SNAPSHOT</version>\r
+        <version>0.5.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
@@ -12,7 +12,7 @@
 \r
     <dependencies>\r
         <dependency>\r
-            <groupId>org.opendaylight.controller</groupId>\r
+            <groupId>org.opendaylight.yangtools</groupId>\r
             <artifactId>binding-model-api</artifactId>\r
         </dependency>\r
         <dependency>\r

diff --git a/code-generator/binding-generator-util/pom.xml b/code-generator/binding-generator-util/pom.xml
index c707151cdc37eb3d3b3687702fc824d46555bdb2..8e3c71a8c21a98f2ae6c1779238f1826e8cccebf 100644 (file)
--- a/code-generator/binding-generator-util/pom.xml
+++ b/code-generator/binding-generator-util/pom.xml
@@ -2,9 +2,9 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
 \r
     <parent>\r
-        <groupId>org.opendaylight.controller</groupId>\r
+        <groupId>org.opendaylight.yangtools</groupId>\r
         <artifactId>binding-generator</artifactId>\r
-        <version>0.5.5-SNAPSHOT</version>\r
+        <version>0.5.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
@@ -12,7 +12,7 @@
 \r
     <dependencies>\r
         <dependency>\r
-            <groupId>org.opendaylight.controller</groupId>\r
+            <groupId>org.opendaylight.yangtools</groupId>\r
             <artifactId>binding-model-api</artifactId>\r
         </dependency>\r
         <dependency>\r

diff --git a/code-generator/binding-java-api-generator/pom.xml b/code-generator/binding-java-api-generator/pom.xml
index afc16f676d9c337bb4be10e8a23054f71bb93f0a..2e71966a1b2cf2f761a153482c432ceced548a44 100644 (file)
--- a/code-generator/binding-java-api-generator/pom.xml
+++ b/code-generator/binding-java-api-generator/pom.xml
@@ -2,9 +2,9 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
 \r
     <parent>\r
-        <groupId>org.opendaylight.controller</groupId>\r
+        <groupId>org.opendaylight.yangtools</groupId>\r
         <artifactId>binding-generator</artifactId>\r
-        <version>0.5.5-SNAPSHOT</version>\r
+        <version>0.5.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
@@ -46,16 +46,16 @@
 \r
     <dependencies>\r
         <dependency>\r
-            <groupId>org.opendaylight.controller</groupId>\r
+            <groupId>org.opendaylight.yangtools</groupId>\r
             <artifactId>binding-model-api</artifactId>\r
         </dependency>\r
         <dependency>\r
-            <groupId>org.opendaylight.controller</groupId>\r
+            <groupId>org.opendaylight.yangtools</groupId>\r
             <artifactId>binding-generator-impl</artifactId>\r
             <scope>test</scope>\r
         </dependency>\r
         <dependency>\r
-            <groupId>org.opendaylight.controller</groupId>\r
+            <groupId>org.opendaylight.yangtools</groupId>\r
             <artifactId>binding-generator-util</artifactId>\r
         </dependency>\r
         <dependency>\r

diff --git a/code-generator/binding-model-api/pom.xml b/code-generator/binding-model-api/pom.xml
index 48e1b4d385bd0700d267567e87e19d8c72016e30..334515197114afdd52ff1e0829a0f210c5fe9972 100644 (file)
--- a/code-generator/binding-model-api/pom.xml
+++ b/code-generator/binding-model-api/pom.xml
@@ -2,9 +2,9 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
 \r
     <parent>\r
-        <groupId>org.opendaylight.controller</groupId>\r
+        <groupId>org.opendaylight.yangtools</groupId>\r
         <artifactId>binding-generator</artifactId>\r
-        <version>0.5.5-SNAPSHOT</version>\r
+        <version>0.5.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/code-generator/maven-sal-api-gen-plugin/pom.xml b/code-generator/maven-sal-api-gen-plugin/pom.xml
index 11ed764d90ff6e6712c979f861f4cee8606a1c10..224baf86230c1c1faf57600d31804dcf735279f4 100644 (file)
--- a/code-generator/maven-sal-api-gen-plugin/pom.xml
+++ b/code-generator/maven-sal-api-gen-plugin/pom.xml
@@ -3,8 +3,8 @@
 
     <parent>
         <artifactId>binding-generator</artifactId>
-        <groupId>org.opendaylight.controller</groupId>
-        <version>0.5.5-SNAPSHOT</version>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <version>0.5.6-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -16,19 +16,19 @@
             <artifactId>yang-maven-plugin-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>binding-model-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>binding-generator-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>binding-generator-impl</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>binding-java-api-generator</artifactId>
         </dependency>
     </dependencies>

diff --git a/code-generator/pom.xml b/code-generator/pom.xml
index c0edbdd94ac64ea405e8d92fa2a20900decdb3c3..1fc0a38d2dc57ab1aa5a210ad33785758d9b4975 100644 (file)
--- a/code-generator/pom.xml
+++ b/code-generator/pom.xml
@@ -2,22 +2,18 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>yang-prototype</artifactId>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools</artifactId>
         <version>0.5-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <version>0.5.5-SNAPSHOT</version>
+    <version>0.5.6-SNAPSHOT</version>
     <artifactId>binding-generator</artifactId>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
     <modules>
         <module>binding-model-api</module>
         <module>binding-generator-api</module>
@@ -31,90 +27,90 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opendaylight.controller</groupId>
+                <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>binding-model-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.controller</groupId>
+                <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>binding-generator-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.controller</groupId>
+                <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>binding-generator-spi</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.controller</groupId>
+                <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>binding-generator-util</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.controller</groupId>
+                <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>binding-generator-impl</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.controller</groupId>
+                <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>binding-java-api-generator</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.controller</groupId>
+                <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>maven-sal-api-gen-plugin</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-common</artifactId>
-                <version>${yangtools.version}</version>
+                <version>${yang.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-data-api</artifactId>
-                <version>${yangtools.version}</version>
+                <version>${yang.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-data-util</artifactId>
-                <version>${yangtools.version}</version>
+                <version>${yang.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-model-api</artifactId>
-                <version>${yangtools.version}</version>
+                <version>${yang.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-model-util</artifactId>
-                <version>${yangtools.version}</version>
+                <version>${yang.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-binding</artifactId>
-                <version>${yangtools.version}</version>
+                <version>${yang.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-model-parser-api</artifactId>
-                <version>${yangtools.version}</version>
+                <version>${yang.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-model-parser-impl
                 </artifactId>
-                <version>${yangtools.version}</version>
+                <version>${yang.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>${yangtools.version}</version>
+                <version>${yang.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin-spi</artifactId>
-                <version>${yangtools.version}</version>
+                <version>${yang.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/code-generator/samples/maven-code-gen-sample/pom.xml b/code-generator/samples/maven-code-gen-sample/pom.xml
index a5714439c95a9fae8287da71886251fc394114d1..01546945a50a114ffdf6b3362f751cc6927f41db 100644 (file)
--- a/code-generator/samples/maven-code-gen-sample/pom.xml
+++ b/code-generator/samples/maven-code-gen-sample/pom.xml
@@ -3,8 +3,8 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>binding-generator</artifactId>
-        <groupId>org.opendaylight.controller</groupId>
-        <version>0.5.5-SNAPSHOT</version>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <version>0.5.6-SNAPSHOT</version>
     </parent>
     <artifactId>maven-code-gen-sample</artifactId>
 
@@ -13,7 +13,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>${yangtools.version}</version>
+                <version>${yang.version}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -38,9 +38,9 @@
 
                 <dependencies>
                     <dependency>
-                        <groupId>org.opendaylight.controller</groupId>
+                        <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
-                        <version>0.5.5-SNAPSHOT</version>
+                        <version>0.5.6-SNAPSHOT</version>
                         <type>jar</type>
                     </dependency>
                 </dependencies>

diff --git a/code-generator/samples/modeling-sample/pom.xml b/code-generator/samples/modeling-sample/pom.xml
index 6d895390a60859cbcb406ff1ac5ced0cab5f52bf..742ac4ec06c5b939c389d2ee3bb9e322939927b5 100644 (file)
--- a/code-generator/samples/modeling-sample/pom.xml
+++ b/code-generator/samples/modeling-sample/pom.xml
@@ -3,8 +3,8 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>binding-generator</artifactId>
-        <groupId>org.opendaylight.controller</groupId>
-        <version>0.5.5-SNAPSHOT</version>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <version>0.5.6-SNAPSHOT</version>
     </parent>
     <artifactId>modeling-sample</artifactId>
 
@@ -13,7 +13,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>${yangtools.version}</version>
+                <version>${yang.version}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -38,9 +38,9 @@
 
                 <dependencies>
                     <dependency>
-                        <groupId>org.opendaylight.controller</groupId>
+                        <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
-                        <version>0.5.5-SNAPSHOT</version>
+                        <version>0.5.6-SNAPSHOT</version>
                         <type>jar</type>
                     </dependency>
                 </dependencies>

diff --git a/model/ietf/ietf-inet-types/pom.xml b/model/ietf/ietf-inet-types/pom.xml
index 06d1189aa0434bc2fb0670d574b2ef4530889618..e2bac1a86d9658888c6ff9bc00ab9babbbb256bb 100644 (file)
--- a/model/ietf/ietf-inet-types/pom.xml
+++ b/model/ietf/ietf-inet-types/pom.xml
@@ -3,8 +3,8 @@
 
     <parent>
         <artifactId>model-ietf</artifactId>
-        <groupId>org.opendaylight.controller</groupId>
-        <version>0.5-SNAPSHOT</version>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <version>0.5.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/model/ietf/ietf-yang-types/pom.xml b/model/ietf/ietf-yang-types/pom.xml
index 1ad4e4a78e9196a4088a4f0e50b3922bb6c883ff..6222c39eb99b7b98a65367e8f1c5abc46fa0f4c2 100644 (file)
--- a/model/ietf/ietf-yang-types/pom.xml
+++ b/model/ietf/ietf-yang-types/pom.xml
@@ -3,8 +3,8 @@
 
     <parent>
         <artifactId>model-ietf</artifactId>
-        <groupId>org.opendaylight.controller</groupId>
-        <version>0.5-SNAPSHOT</version>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <version>0.5.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/model/ietf/pom.xml b/model/ietf/pom.xml
index a5b87b03eac2ee87402afad912d44a25a8c0bc7d..995dfbddc67bbea2ec68e8e66d275741f926922e 100644 (file)
--- a/model/ietf/pom.xml
+++ b/model/ietf/pom.xml
@@ -3,8 +3,8 @@
 
     <parent>
         <artifactId>model-parent</artifactId>
-        <groupId>org.opendaylight.controller</groupId>
-        <version>0.5-SNAPSHOT</version>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <version>0.5.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/model/model-openflow/pom.xml b/model/model-openflow/pom.xml
index 76337cdfebda11c277d22a405d91b2354289244b..63513ba0f47c05cf9b5f3986c819f09b7328eb18 100644 (file)
--- a/model/model-openflow/pom.xml
+++ b/model/model-openflow/pom.xml
@@ -3,8 +3,8 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>model-parent</artifactId>
-        <groupId>org.opendaylight.controller</groupId>
-        <version>0.5-SNAPSHOT</version>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <version>0.5.1-SNAPSHOT</version>
     </parent>
     <artifactId>model-openflow</artifactId>
-</project>
\ No newline at end of file
+</project>

diff --git a/model/model-topology-bgp/pom.xml b/model/model-topology-bgp/pom.xml
index f3b6ad97678ea295e37738a5b78ca73b5077a939..764a10de7e8a1f9c760c0eb0701a449daef656b6 100644 (file)
--- a/model/model-topology-bgp/pom.xml
+++ b/model/model-topology-bgp/pom.xml
@@ -3,8 +3,8 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>model-parent</artifactId>
-        <groupId>org.opendaylight.controller</groupId>
-        <version>0.5-SNAPSHOT</version>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <version>0.5.1-SNAPSHOT</version>
     </parent>
     <artifactId>model-topology-bgp</artifactId>
-</project>
\ No newline at end of file
+</project>

diff --git a/model/model-topology/pom.xml b/model/model-topology/pom.xml
index f1c32350cc3e5e32d105073327562c9b8f6b66c8..8098023444b23f55ac0e598731077b4ca88d612c 100644 (file)
--- a/model/model-topology/pom.xml
+++ b/model/model-topology/pom.xml
@@ -3,8 +3,8 @@
 
     <parent>
         <artifactId>model-parent</artifactId>
-        <groupId>org.opendaylight.controller</groupId>
-        <version>0.5-SNAPSHOT</version>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <version>0.5.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -12,7 +12,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>ietf-inet-types</artifactId>
             <version>2010.09.24-SNAPSHOT</version>
         </dependency>

diff --git a/model/pom.xml b/model/pom.xml
index 1bbc2f6c772269f3416bcc33b340d04a559cb7ef..06fa951eb69482abfdedb4855cf58a75a5061eb6 100644 (file)
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -2,13 +2,14 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <artifactId>yang-prototype</artifactId>
-        <groupId>org.opendaylight.controller</groupId>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools</artifactId>
         <version>0.5-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>model-parent</artifactId>
+    <version>0.5.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
@@ -25,7 +26,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>${yangtools.version}</version>
+                <version>${yang.version}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -49,9 +50,9 @@
                 </executions>
                 <dependencies>
                     <dependency>
-                        <groupId>org.opendaylight.controller</groupId>
+                        <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
-                        <version>0.5.5-SNAPSHOT</version>
+                        <version>0.5.6-SNAPSHOT</version>
                         <type>jar</type>
                     </dependency>
                 </dependencies>
@@ -89,7 +90,7 @@
                                 <pluginExecution>
                                     <pluginExecutionFilter>
                                         <groupId>
-                                            org.opendaylight.controller
+                                            org.opendaylight.yangtools
                                         </groupId>
                                         <artifactId>
                                             yang-maven-plugin
@@ -119,12 +120,12 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-binding</artifactId>
-            <version>${yangtools.version}</version>
+            <version>${yang.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
-            <version>${yangtools.version}</version>
+            <version>${yang.version}</version>
         </dependency>
     </dependencies>
 

diff --git a/pom.xml b/pom.xml
index b482b419cfa3eddd991bc80bb6f9cf9525c7ba11..d11ab703abc4f9357d4304e6a416e7ff1bb15b4c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,84 +4,24 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>yangtools</artifactId>
     <groupId>org.opendaylight.yangtools</groupId>
-    <version>0.5.5-SNAPSHOT</version>
+    <version>0.5-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <slf4j.version>1.7.2</slf4j.version>
         <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
+        <yang.version>0.5.6-SNAPSHOT</yang.version>
     </properties>
 
     <modules>
-        <module>yang-binding</module>
-        <module>yang-common</module>
-        <module>yang-data-api</module>
-        <module>yang-data-util</module>
-        <module>yang-data-impl</module>
-        <module>yang-ext</module>
-        <module>yang-model-api</module>
-        <module>yang-maven-plugin</module>
-        <module>yang-maven-plugin-it</module>
-        <module>yang-maven-plugin-spi</module>
-        <module>yang-model-util</module>
-        <module>yang-parser-api</module>
-        <module>yang-parser-impl</module>
+        <module>code-generator</module>
+        <module>model</module>
+        <module>yang</module>
     </modules>
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-common</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-data-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-data-util</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-model-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-model-util</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-binding</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-parser-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-parser-impl
-                </artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin-spi</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
@@ -166,3 +106,4 @@
     </reporting>
 
 </project>
+

diff --git a/yang/pom.xml b/yang/pom.xml
new file mode 100644 (file)
index 0000000..36b21f9
--- /dev/null
+++ b/yang/pom.xml
@@ -0,0 +1,139 @@
+<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">
+
+    <parent>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools</artifactId>
+        <version>0.5-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>yang</artifactId>
+    <version>0.5.6-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>yang-binding</module>
+        <module>yang-common</module>
+        <module>yang-data-api</module>
+        <module>yang-data-util</module>
+        <module>yang-data-impl</module>
+        <module>yang-ext</module>
+        <module>yang-model-api</module>
+        <module>yang-maven-plugin</module>
+        <module>yang-maven-plugin-it</module>
+        <module>yang-maven-plugin-spi</module>
+        <module>yang-model-util</module>
+        <module>yang-parser-api</module>
+        <module>yang-parser-impl</module>
+    </modules>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-data-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-data-util</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-model-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-model-util</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-binding</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-parser-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-parser-impl
+                </artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-maven-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-maven-plugin-spi</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.0</version>
+                <inherited>true</inherited>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.9.1</version>
+                <configuration>
+                    <stylesheet>maven</stylesheet>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>aggregate</goal>
+                        </goals>
+                        <phase>site</phase>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>findbugs-maven-plugin</artifactId>
+                <version>2.4.0</version>
+                <configuration>
+                    <effort>Max</effort>
+                    <threshold>Low</threshold>
+                    <goal>site</goal>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jdepend-maven-plugin</artifactId>
+                <version>2.0-beta-2</version>
+            </plugin>
+        </plugins>
+    </reporting>
+
+</project>
+

diff --git a/src/site/site.xml b/yang/src/site/site.xml
similarity index 100%
rename from src/site/site.xml
rename to yang/src/site/site.xml

diff --git a/yang-binding/pom.xml b/yang/yang-binding/pom.xml
similarity index 82%
rename from yang-binding/pom.xml
rename to yang/yang-binding/pom.xml
index 0e117802049f2c773d5068db0efd8e95e3b90636..bc13ac7210ef739d6fd4c4dac909417185dcec40 100644 (file)
--- a/yang-binding/pom.xml
+++ b/yang/yang-binding/pom.xml
@@ -3,8 +3,8 @@
 \r
     <parent>\r
         <groupId>org.opendaylight.yangtools</groupId>\r
-        <artifactId>yangtools</artifactId>\r
-        <version>0.5.5-SNAPSHOT</version>\r
+        <artifactId>yang</artifactId>\r
+        <version>0.5.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Augmentable.java b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Augmentable.java
similarity index 100%
rename from yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Augmentable.java
rename to yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Augmentable.java

diff --git a/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Augmentation.java b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Augmentation.java
similarity index 100%
rename from yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Augmentation.java
rename to yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Augmentation.java

diff --git a/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/BaseIdentity.java b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/BaseIdentity.java
similarity index 100%
rename from yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/BaseIdentity.java
rename to yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/BaseIdentity.java

diff --git a/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/DataObject.java b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/DataObject.java
similarity index 100%
rename from yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/DataObject.java
rename to yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/DataObject.java

diff --git a/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/DataRoot.java b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/DataRoot.java
similarity index 100%
rename from yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/DataRoot.java
rename to yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/DataRoot.java

diff --git a/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifier.java b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifier.java
similarity index 100%
rename from yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifier.java
rename to yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifier.java

diff --git a/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Notification.java b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Notification.java
similarity index 100%
rename from yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Notification.java
rename to yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Notification.java

diff --git a/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/NotificationListener.java b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/NotificationListener.java
similarity index 100%
rename from yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/NotificationListener.java
rename to yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/NotificationListener.java

diff --git a/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/RpcService.java b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/RpcService.java
similarity index 100%
rename from yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/RpcService.java
rename to yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/RpcService.java

diff --git a/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/package-info.java b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/package-info.java
similarity index 100%
rename from yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/package-info.java
rename to yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/package-info.java

diff --git a/yang-common/pom.xml b/yang/yang-common/pom.xml
similarity index 85%
rename from yang-common/pom.xml
rename to yang/yang-common/pom.xml
index 3db082c88d218cd54c9a5979d2884ef1e5d1ffa6..0ce18ccd7c3ecf77dbb498520eb34b563896fc9e 100644 (file)
--- a/yang-common/pom.xml
+++ b/yang/yang-common/pom.xml
@@ -3,8 +3,8 @@
 \r
     <parent>\r
         <groupId>org.opendaylight.yangtools</groupId>\r
-        <artifactId>yangtools</artifactId>\r
-        <version>0.5.5-SNAPSHOT</version>\r
+        <artifactId>yang</artifactId>\r
+        <version>0.5.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java
similarity index 100%
rename from yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java
rename to yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java

diff --git a/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcError.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcError.java
similarity index 100%
rename from yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcError.java
rename to yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcError.java

diff --git a/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcResult.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcResult.java
similarity index 100%
rename from yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcResult.java
rename to yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcResult.java

diff --git a/yang-data-api/pom.xml b/yang/yang-data-api/pom.xml
similarity index 86%
rename from yang-data-api/pom.xml
rename to yang/yang-data-api/pom.xml
index 7430189c8f5369c9650c2088d134d49e5fb8fd0b..b6433b4c56b4a9f0e7b2227cbd8c62920b932286 100644 (file)
--- a/yang-data-api/pom.xml
+++ b/yang/yang-data-api/pom.xml
@@ -3,8 +3,8 @@
 \r
     <parent>\r
         <groupId>org.opendaylight.yangtools</groupId>\r
-        <artifactId>yangtools</artifactId>\r
-        <version>0.5.5-SNAPSHOT</version>\r
+        <artifactId>yang</artifactId>\r
+        <version>0.5.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/CompositeNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/CompositeNode.java
similarity index 100%
rename from yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/CompositeNode.java
rename to yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/CompositeNode.java

diff --git a/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/ModifyAction.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/ModifyAction.java
similarity index 100%
rename from yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/ModifyAction.java
rename to yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/ModifyAction.java

diff --git a/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableCompositeNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableCompositeNode.java
similarity index 100%
rename from yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableCompositeNode.java
rename to yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableCompositeNode.java

diff --git a/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableNode.java
similarity index 100%
rename from yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableNode.java
rename to yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableNode.java

diff --git a/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableSimpleNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableSimpleNode.java
similarity index 100%
rename from yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableSimpleNode.java
rename to yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableSimpleNode.java

diff --git a/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/Node.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/Node.java
similarity index 100%
rename from yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/Node.java
rename to yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/Node.java

diff --git a/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModification.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModification.java
similarity index 100%
rename from yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModification.java
rename to yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModification.java

diff --git a/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModificationBuilder.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModificationBuilder.java
similarity index 100%
rename from yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModificationBuilder.java
rename to yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModificationBuilder.java

diff --git a/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/SimpleNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/SimpleNode.java
similarity index 100%
rename from yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/SimpleNode.java
rename to yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/SimpleNode.java

diff --git a/yang-data-impl/pom.xml b/yang/yang-data-impl/pom.xml
similarity index 94%
rename from yang-data-impl/pom.xml
rename to yang/yang-data-impl/pom.xml
index 0cab68938471d71bbe6d2406232dca6170df2457..afdf56381b2e820acb062f75217637ef6be6f573 100644 (file)
--- a/yang-data-impl/pom.xml
+++ b/yang/yang-data-impl/pom.xml
@@ -3,8 +3,8 @@
 \r
     <parent>\r
         <groupId>org.opendaylight.yangtools</groupId>\r
-        <artifactId>yangtools</artifactId>\r
-        <version>0.5.5-SNAPSHOT</version>\r
+        <artifactId>yang</artifactId>\r
+        <version>0.5.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/AbstractNodeTO.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/AbstractNodeTO.java
similarity index 100%
rename from yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/AbstractNodeTO.java
rename to yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/AbstractNodeTO.java

diff --git a/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeModificationTOImpl.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeModificationTOImpl.java
similarity index 100%
rename from yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeModificationTOImpl.java
rename to yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeModificationTOImpl.java

diff --git a/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeTOImpl.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeTOImpl.java
similarity index 100%
rename from yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeTOImpl.java
rename to yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeTOImpl.java

diff --git a/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMap.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMap.java
similarity index 100%
rename from yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMap.java
rename to yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMap.java

diff --git a/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableCompositeNodeTOImpl.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableCompositeNodeTOImpl.java
similarity index 100%
rename from yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableCompositeNodeTOImpl.java
rename to yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableCompositeNodeTOImpl.java

diff --git a/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableSimpleNodeTOImpl.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableSimpleNodeTOImpl.java
similarity index 100%
rename from yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableSimpleNodeTOImpl.java
rename to yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableSimpleNodeTOImpl.java

diff --git a/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeFactory.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeFactory.java
similarity index 100%
rename from yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeFactory.java
rename to yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeFactory.java

diff --git a/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImpl.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImpl.java
similarity index 100%
rename from yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImpl.java
rename to yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImpl.java

diff --git a/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeUtils.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeUtils.java
similarity index 100%
rename from yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeUtils.java
rename to yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeUtils.java

diff --git a/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeModificationTOImpl.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeModificationTOImpl.java
similarity index 100%
rename from yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeModificationTOImpl.java
rename to yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeModificationTOImpl.java

diff --git a/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeTOImpl.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeTOImpl.java
similarity index 100%
rename from yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeTOImpl.java
rename to yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeTOImpl.java

diff --git a/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/IgnoreWhiteCharsDiffListener.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/IgnoreWhiteCharsDiffListener.java
similarity index 100%
rename from yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/IgnoreWhiteCharsDiffListener.java
rename to yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/IgnoreWhiteCharsDiffListener.java

diff --git a/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMapTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMapTest.java
similarity index 100%
rename from yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMapTest.java
rename to yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMapTest.java

diff --git a/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/MemoryConsumption.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/MemoryConsumption.java
similarity index 100%
rename from yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/MemoryConsumption.java
rename to yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/MemoryConsumption.java

diff --git a/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/MyNodeBuilder.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/MyNodeBuilder.java
similarity index 100%
rename from yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/MyNodeBuilder.java
rename to yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/MyNodeBuilder.java

diff --git a/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeFactoryTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeFactoryTest.java
similarity index 100%
rename from yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeFactoryTest.java
rename to yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeFactoryTest.java

diff --git a/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeHelper.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeHelper.java
similarity index 100%
rename from yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeHelper.java
rename to yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeHelper.java

diff --git a/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImplTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImplTest.java
similarity index 100%
rename from yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImplTest.java
rename to yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImplTest.java

diff --git a/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeUtilsTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeUtilsTest.java
similarity index 100%
rename from yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeUtilsTest.java
rename to yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeUtilsTest.java

diff --git a/yang-data-impl/src/test/resources/MyXmlGenerator.groovy b/yang/yang-data-impl/src/test/resources/MyXmlGenerator.groovy
similarity index 100%
rename from yang-data-impl/src/test/resources/MyXmlGenerator.groovy
rename to yang/yang-data-impl/src/test/resources/MyXmlGenerator.groovy

diff --git a/yang-data-impl/src/test/resources/config01.xml b/yang/yang-data-impl/src/test/resources/config01.xml
similarity index 100%
rename from yang-data-impl/src/test/resources/config01.xml
rename to yang/yang-data-impl/src/test/resources/config01.xml

diff --git a/yang-data-impl/src/test/resources/config02.xml b/yang/yang-data-impl/src/test/resources/config02.xml
similarity index 100%
rename from yang-data-impl/src/test/resources/config02.xml
rename to yang/yang-data-impl/src/test/resources/config02.xml

diff --git a/yang-data-impl/src/test/resources/controller-network.xsd b/yang/yang-data-impl/src/test/resources/controller-network.xsd
similarity index 100%
rename from yang-data-impl/src/test/resources/controller-network.xsd
rename to yang/yang-data-impl/src/test/resources/controller-network.xsd

diff --git a/yang-data-impl/src/test/resources/controller-network.yang b/yang/yang-data-impl/src/test/resources/controller-network.yang
similarity index 100%
rename from yang-data-impl/src/test/resources/controller-network.yang
rename to yang/yang-data-impl/src/test/resources/controller-network.yang

diff --git a/yang-data-impl/src/test/resources/ietf-inet-types@2010-09-24.xsd b/yang/yang-data-impl/src/test/resources/ietf-inet-types@2010-09-24.xsd
similarity index 100%
rename from yang-data-impl/src/test/resources/ietf-inet-types@2010-09-24.xsd
rename to yang/yang-data-impl/src/test/resources/ietf-inet-types@2010-09-24.xsd

diff --git a/yang-data-impl/src/test/resources/ietf-inet-types@2010-09-24.yang b/yang/yang-data-impl/src/test/resources/ietf-inet-types@2010-09-24.yang
similarity index 100%
rename from yang-data-impl/src/test/resources/ietf-inet-types@2010-09-24.yang
rename to yang/yang-data-impl/src/test/resources/ietf-inet-types@2010-09-24.yang

diff --git a/yang-data-impl/src/test/resources/log4j-test.xml b/yang/yang-data-impl/src/test/resources/log4j-test.xml
similarity index 100%
rename from yang-data-impl/src/test/resources/log4j-test.xml
rename to yang/yang-data-impl/src/test/resources/log4j-test.xml

diff --git a/yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02-shadow.xml b/yang/yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02-shadow.xml
similarity index 100%
rename from yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02-shadow.xml
rename to yang/yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02-shadow.xml

diff --git a/yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02.groovy b/yang/yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02.groovy
similarity index 100%
rename from yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02.groovy
rename to yang/yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02.groovy

diff --git a/yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02g-shadow.xml b/yang/yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02g-shadow.xml
similarity index 100%
rename from yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02g-shadow.xml
rename to yang/yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02g-shadow.xml

diff --git a/yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/mutableNodesConfig.xml b/yang/yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/mutableNodesConfig.xml
similarity index 100%
rename from yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/mutableNodesConfig.xml
rename to yang/yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/mutableNodesConfig.xml

diff --git a/yang-data-util/pom.xml b/yang/yang-data-util/pom.xml
similarity index 86%
rename from yang-data-util/pom.xml
rename to yang/yang-data-util/pom.xml
index c306d7eebdcfba55af0866e6088f6ea683723bab..7cd0d94458cc6cf0fa7f38682b3c7773bb65a9c0 100644 (file)
--- a/yang-data-util/pom.xml
+++ b/yang/yang-data-util/pom.xml
@@ -3,8 +3,8 @@
 \r
     <parent>\r
         <groupId>org.opendaylight.yangtools</groupId>\r
-        <artifactId>yangtools</artifactId>\r
-        <version>0.5.5-SNAPSHOT</version>\r
+        <artifactId>yang</artifactId>\r
+        <version>0.5.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractContainerNode.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractContainerNode.java
similarity index 100%
rename from yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractContainerNode.java
rename to yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractContainerNode.java

diff --git a/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractNode.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractNode.java
similarity index 100%
rename from yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractNode.java
rename to yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractNode.java

diff --git a/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/Nodes.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/Nodes.java
similarity index 100%
rename from yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/Nodes.java
rename to yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/Nodes.java

diff --git a/yang-ext/pom.xml b/yang/yang-ext/pom.xml
similarity index 95%
rename from yang-ext/pom.xml
rename to yang/yang-ext/pom.xml
index 647efd79e2bcc5509b4b090fde3fc5d2eddbca2b..8021be8d84300fab41696b2ed40f1e1fe0150ee4 100644 (file)
--- a/yang-ext/pom.xml
+++ b/yang/yang-ext/pom.xml
@@ -3,8 +3,8 @@
 
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yangtools</artifactId>
-        <version>0.5.5-SNAPSHOT</version>
+        <artifactId>yang</artifactId>
+        <version>0.5.6-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -18,7 +18,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.5-SNAPSHOT</version>
+                <version>${yang.version}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -74,7 +74,7 @@
                                             yang-maven-plugin
                                         </artifactId>
                                         <versionRange>
-                                            [0.5.5,)
+                                            [0.5.6,)
                                         </versionRange>
                                         <goals>
                                             <goal>

diff --git a/yang-ext/src/main/yang/yang-ext.yang b/yang/yang-ext/src/main/yang/yang-ext.yang
similarity index 100%
rename from yang-ext/src/main/yang/yang-ext.yang
rename to yang/yang-ext/src/main/yang/yang-ext.yang

diff --git a/yang-maven-plugin-it/.gitignore b/yang/yang-maven-plugin-it/.gitignore
similarity index 100%
rename from yang-maven-plugin-it/.gitignore
rename to yang/yang-maven-plugin-it/.gitignore

diff --git a/yang-maven-plugin-it/pom.xml b/yang/yang-maven-plugin-it/pom.xml
similarity index 93%
rename from yang-maven-plugin-it/pom.xml
rename to yang/yang-maven-plugin-it/pom.xml
index 85d6419aae709f1716483cd43d0d7d86f01710fd..67727f7c98c76c8d581514056a8ac9cdd668e835 100644 (file)
--- a/yang-maven-plugin-it/pom.xml
+++ b/yang/yang-maven-plugin-it/pom.xml
@@ -3,8 +3,8 @@
 
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yangtools</artifactId>
-        <version>0.5.5-SNAPSHOT</version>
+        <artifactId>yang</artifactId>
+        <version>0.5.6-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java b/yang/yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java
similarity index 100%
rename from yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java
rename to yang/yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java

diff --git a/yang-maven-plugin-it/src/test/resources/AdditionalConfig/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/AdditionalConfig/pom.xml
similarity index 93%
rename from yang-maven-plugin-it/src/test/resources/AdditionalConfig/pom.xml
rename to yang/yang-maven-plugin-it/src/test/resources/AdditionalConfig/pom.xml
index 0e54326fb29b3b8cac605abe10f71ac0f99a8d03..d4ffd3739f384f64c23f1ba783bd11b198d95357 100644 (file)
--- a/yang-maven-plugin-it/src/test/resources/AdditionalConfig/pom.xml
+++ b/yang/yang-maven-plugin-it/src/test/resources/AdditionalConfig/pom.xml
@@ -3,14 +3,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.opendaylight.yangtools</groupId>
-    <version>0.5.5-SNAPSHOT</version>
+    <version>0.5.6-SNAPSHOT</version>
     <artifactId>test</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-maven-plugin-spi</artifactId>
-            <version>0.5.5-SNAPSHOT</version>
+            <version>0.5.6-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
@@ -19,7 +19,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.5-SNAPSHOT</version>
+                <version>0.5.6-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
@@ -56,7 +56,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
-                        <version>0.5.5-SNAPSHOT</version>
+                        <version>0.5.6-SNAPSHOT</version>
                         <type>test-jar</type>
                     </dependency>
                 </dependencies>

diff --git a/yang-maven-plugin-it/src/test/resources/Correct/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/Correct/pom.xml
similarity index 91%
rename from yang-maven-plugin-it/src/test/resources/Correct/pom.xml
rename to yang/yang-maven-plugin-it/src/test/resources/Correct/pom.xml
index ec4d1b34f034e261cbece2d637a1f10afaeae6f1..9d33b137233f5f8de38f211dbd9c052bfb8112b6 100644 (file)
--- a/yang-maven-plugin-it/src/test/resources/Correct/pom.xml
+++ b/yang/yang-maven-plugin-it/src/test/resources/Correct/pom.xml
@@ -3,14 +3,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.opendaylight.yangtools</groupId>
-    <version>0.5.5-SNAPSHOT</version>
+    <version>0.5.6-SNAPSHOT</version>
     <artifactId>test</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-maven-plugin-spi</artifactId>
-            <version>0.5.5-SNAPSHOT</version>
+            <version>0.5.6-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
@@ -19,7 +19,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.5-SNAPSHOT</version>
+                <version>0.5.6-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
@@ -43,7 +43,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
-                        <version>0.5.5-SNAPSHOT</version>
+                        <version>0.5.6-SNAPSHOT</version>
                         <type>test-jar</type>
                     </dependency>
                 </dependencies>

diff --git a/yang-maven-plugin-it/src/test/resources/GenerateTest1/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/GenerateTest1/pom.xml
similarity index 92%
rename from yang-maven-plugin-it/src/test/resources/GenerateTest1/pom.xml
rename to yang/yang-maven-plugin-it/src/test/resources/GenerateTest1/pom.xml
index 2eab92c8644f1180b289e9874f4e8c911aeb6fa5..8370846fdb09ba778ccac83bb0f67f847338d40e 100644 (file)
--- a/yang-maven-plugin-it/src/test/resources/GenerateTest1/pom.xml
+++ b/yang/yang-maven-plugin-it/src/test/resources/GenerateTest1/pom.xml
@@ -4,14 +4,14 @@
 
     <groupId>org.opendaylight.yangtools</groupId>
     <artifactId>generator-test1</artifactId>
-    <version>0.5.5-SNAPSHOT</version>
+    <version>0.5.6-SNAPSHOT</version>
 
     <build>
         <plugins>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.5-SNAPSHOT</version>
+                <version>0.5.6-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
@@ -35,7 +35,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
-                        <version>0.5.5-SNAPSHOT</version>
+                        <version>0.5.6-SNAPSHOT</version>
                         <type>test-jar</type>
                     </dependency>
                 </dependencies>

diff --git a/yang-maven-plugin-it/src/test/resources/GenerateTest1/src/main/resources/testfile1.yang b/yang/yang-maven-plugin-it/src/test/resources/GenerateTest1/src/main/resources/testfile1.yang
similarity index 100%
rename from yang-maven-plugin-it/src/test/resources/GenerateTest1/src/main/resources/testfile1.yang
rename to yang/yang-maven-plugin-it/src/test/resources/GenerateTest1/src/main/resources/testfile1.yang

diff --git a/yang-maven-plugin-it/src/test/resources/GenerateTest1/src/main/resources/testfile2.yang b/yang/yang-maven-plugin-it/src/test/resources/GenerateTest1/src/main/resources/testfile2.yang
similarity index 100%
rename from yang-maven-plugin-it/src/test/resources/GenerateTest1/src/main/resources/testfile2.yang
rename to yang/yang-maven-plugin-it/src/test/resources/GenerateTest1/src/main/resources/testfile2.yang

diff --git a/yang-maven-plugin-it/src/test/resources/GenerateTest1/src/main/resources/testfile3.yang b/yang/yang-maven-plugin-it/src/test/resources/GenerateTest1/src/main/resources/testfile3.yang
similarity index 100%
rename from yang-maven-plugin-it/src/test/resources/GenerateTest1/src/main/resources/testfile3.yang
rename to yang/yang-maven-plugin-it/src/test/resources/GenerateTest1/src/main/resources/testfile3.yang

diff --git a/yang-maven-plugin-it/src/test/resources/GenerateTest2/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/GenerateTest2/pom.xml
similarity index 90%
rename from yang-maven-plugin-it/src/test/resources/GenerateTest2/pom.xml
rename to yang/yang-maven-plugin-it/src/test/resources/GenerateTest2/pom.xml
index 0ab278048cdbf6f3710d55d6eb3be0013a628f54..8a4077578b8e806eafc0be2889ab95e54f68027a 100644 (file)
--- a/yang-maven-plugin-it/src/test/resources/GenerateTest2/pom.xml
+++ b/yang/yang-maven-plugin-it/src/test/resources/GenerateTest2/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.opendaylight.yangtools</groupId>
-    <version>0.5.5-SNAPSHOT</version>
+    <version>0.5.6-SNAPSHOT</version>
     <artifactId>generator-test2</artifactId>
 
 
@@ -11,9 +11,9 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>generator-test1</artifactId>
-            <version>0.5.5-SNAPSHOT</version>
+            <version>0.5.6-SNAPSHOT</version>
             <scope>system</scope>
-            <systemPath>${project.basedir}/../GenerateTest1/target/generator-test1-0.5.5-SNAPSHOT.jar</systemPath>
+            <systemPath>${project.basedir}/../GenerateTest1/target/generator-test1-0.5.6-SNAPSHOT.jar</systemPath>
         </dependency>
     </dependencies>
 
@@ -22,7 +22,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.5-SNAPSHOT</version>
+                <version>0.5.6-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
@@ -49,7 +49,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
-                        <version>0.5.5-SNAPSHOT</version>
+                        <version>0.5.6-SNAPSHOT</version>
                         <type>test-jar</type>
                     </dependency>
                 </dependencies>

diff --git a/yang-maven-plugin-it/src/test/resources/GenerateTest2/yang/private.yang b/yang/yang-maven-plugin-it/src/test/resources/GenerateTest2/yang/private.yang
similarity index 100%
rename from yang-maven-plugin-it/src/test/resources/GenerateTest2/yang/private.yang
rename to yang/yang-maven-plugin-it/src/test/resources/GenerateTest2/yang/private.yang

diff --git a/yang-maven-plugin-it/src/test/resources/Generator/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/Generator/pom.xml
similarity index 93%
rename from yang-maven-plugin-it/src/test/resources/Generator/pom.xml
rename to yang/yang-maven-plugin-it/src/test/resources/Generator/pom.xml
index b66968cfc76872299b34dac4ef04ed5adc276ba4..8ab82e6b67273021ab6c2d4fcd48114cf70aaed5 100644 (file)
--- a/yang-maven-plugin-it/src/test/resources/Generator/pom.xml
+++ b/yang/yang-maven-plugin-it/src/test/resources/Generator/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>binding-generator</artifactId>
         <groupId>org.opendaylight.yangtools</groupId>
-        <version>0.5.5-SNAPSHOT</version>
+        <version>0.5.6-SNAPSHOT</version>
     </parent>
     <artifactId>test</artifactId>
 
@@ -13,7 +13,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.5-SNAPSHOT</version>
+                <version>0.5.6-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
@@ -40,7 +40,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
-                        <version>0.5.5-SNAPSHOT</version>
+                        <version>0.5.6-SNAPSHOT</version>
                         <type>test-jar</type>
                     </dependency>
                 </dependencies>

diff --git a/yang-maven-plugin-it/src/test/resources/MissingYangInDep/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/MissingYangInDep/pom.xml
similarity index 94%
rename from yang-maven-plugin-it/src/test/resources/MissingYangInDep/pom.xml
rename to yang/yang-maven-plugin-it/src/test/resources/MissingYangInDep/pom.xml
index eba42be8d2f088084b4d8897a0a48a96500f3f54..0a5ee371bfe09423b60bd27f72512c83cd2d3bee 100644 (file)
--- a/yang-maven-plugin-it/src/test/resources/MissingYangInDep/pom.xml
+++ b/yang/yang-maven-plugin-it/src/test/resources/MissingYangInDep/pom.xml
@@ -3,16 +3,15 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.opendaylight.yangtools</groupId>
-    <version>0.5.5-SNAPSHOT</version>
+    <version>0.5.6-SNAPSHOT</version>
     <artifactId>generator-test2</artifactId>
 
-
     <build>
         <plugins>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.5-SNAPSHOT</version>
+                <version>0.5.6-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
@@ -49,7 +48,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
-                        <version>0.5.5-SNAPSHOT</version>
+                        <version>0.5.6-SNAPSHOT</version>
                         <type>test-jar</type>
                     </dependency>
                 </dependencies>

diff --git a/yang-maven-plugin-it/src/test/resources/MissingYangInDep/yang/private.yang b/yang/yang-maven-plugin-it/src/test/resources/MissingYangInDep/yang/private.yang
similarity index 100%
rename from yang-maven-plugin-it/src/test/resources/MissingYangInDep/yang/private.yang
rename to yang/yang-maven-plugin-it/src/test/resources/MissingYangInDep/yang/private.yang

diff --git a/yang-maven-plugin-it/src/test/resources/NoGenerators/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/NoGenerators/pom.xml
similarity index 93%
rename from yang-maven-plugin-it/src/test/resources/NoGenerators/pom.xml
rename to yang/yang-maven-plugin-it/src/test/resources/NoGenerators/pom.xml
index 4df740d7df67e3d17f70a1822268b49a72a4e696..0756c370e91d2f151d530e6813821ff27c55df2f 100644 (file)
--- a/yang-maven-plugin-it/src/test/resources/NoGenerators/pom.xml
+++ b/yang/yang-maven-plugin-it/src/test/resources/NoGenerators/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
 
         <groupId>org.opendaylight.yangtools</groupId>
-        <version>0.5.5-SNAPSHOT</version>
+        <version>0.5.6-SNAPSHOT</version>
     <artifactId>test</artifactId>
 
     <build>
@@ -11,7 +11,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.5-SNAPSHOT</version>
+                <version>0.5.6-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
@@ -39,7 +39,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
-                        <version>0.5.5-SNAPSHOT</version>
+                        <version>0.5.6-SNAPSHOT</version>
                         <type>test-jar</type>
                     </dependency>
                 </dependencies>

diff --git a/yang-maven-plugin-it/src/test/resources/NoOutputDir/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/NoOutputDir/pom.xml
similarity index 92%
rename from yang-maven-plugin-it/src/test/resources/NoOutputDir/pom.xml
rename to yang/yang-maven-plugin-it/src/test/resources/NoOutputDir/pom.xml
index 96f1247c45304b6506636b0a5bf2be86e4302e72..e080e73b5276bf8fb169093a432af220c1767386 100644 (file)
--- a/yang-maven-plugin-it/src/test/resources/NoOutputDir/pom.xml
+++ b/yang/yang-maven-plugin-it/src/test/resources/NoOutputDir/pom.xml
@@ -4,14 +4,14 @@
 
     <groupId>org.opendaylight.yangtools</groupId>
     <artifactId>test</artifactId>
-    <version>0.5.5-SNAPSHOT</version>
+    <version>0.5.6-SNAPSHOT</version>
 
     <build>
         <plugins>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.5-SNAPSHOT</version>
+                <version>0.5.6-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
@@ -35,7 +35,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
-                        <version>0.5.5-SNAPSHOT</version>
+                        <version>0.5.6-SNAPSHOT</version>
                         <type>test-jar</type>
                     </dependency>
                 </dependencies>

diff --git a/yang-maven-plugin-it/src/test/resources/NoYangFiles/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/NoYangFiles/pom.xml
similarity index 92%
rename from yang-maven-plugin-it/src/test/resources/NoYangFiles/pom.xml
rename to yang/yang-maven-plugin-it/src/test/resources/NoYangFiles/pom.xml
index 150d2e830c3755549a1e41cbf5a06a69c55737c8..4bb875b1f2f88ef730b154ce3dda68ff0d9bc4ec 100644 (file)
--- a/yang-maven-plugin-it/src/test/resources/NoYangFiles/pom.xml
+++ b/yang/yang-maven-plugin-it/src/test/resources/NoYangFiles/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.opendaylight.yangtools</groupId>
-    <version>0.5.5-SNAPSHOT</version>
+    <version>0.5.6-SNAPSHOT</version>
     <artifactId>test</artifactId>
 
     <build>
@@ -11,7 +11,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.5-SNAPSHOT</version>
+                <version>0.5.6-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
@@ -38,7 +38,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
-                        <version>0.5.5-SNAPSHOT</version>
+                        <version>0.5.6-SNAPSHOT</version>
                         <type>test-jar</type>
                     </dependency>
                 </dependencies>

diff --git a/yang-maven-plugin-it/src/test/resources/UnknownGenerator/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/UnknownGenerator/pom.xml
similarity index 94%
rename from yang-maven-plugin-it/src/test/resources/UnknownGenerator/pom.xml
rename to yang/yang-maven-plugin-it/src/test/resources/UnknownGenerator/pom.xml
index 0762f5c99279fb74109cfc1a9c635b54a380e990..3b80af703a9cb56048acfd0f9b2a5bc133cfc8fb 100644 (file)
--- a/yang-maven-plugin-it/src/test/resources/UnknownGenerator/pom.xml
+++ b/yang/yang-maven-plugin-it/src/test/resources/UnknownGenerator/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.opendaylight.yangtools</groupId>
-    <version>0.5.5-SNAPSHOT</version>
+    <version>0.5.6-SNAPSHOT</version>
 
     <artifactId>test</artifactId>
 
@@ -12,7 +12,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.5-SNAPSHOT</version>
+                <version>0.5.6-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
@@ -47,7 +47,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
-                        <version>0.5.5-SNAPSHOT</version>
+                        <version>0.5.6-SNAPSHOT</version>
                         <type>test-jar</type>
                     </dependency>
                 </dependencies>

diff --git a/yang-maven-plugin-it/src/test/resources/YangRootNotExist/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/YangRootNotExist/pom.xml
similarity index 94%
rename from yang-maven-plugin-it/src/test/resources/YangRootNotExist/pom.xml
rename to yang/yang-maven-plugin-it/src/test/resources/YangRootNotExist/pom.xml
index 57368b077be40b6ecebc3c3ceb894eb9010e5646..2b97b0c161af509c90a36140e7216d4079c2f466 100644 (file)
--- a/yang-maven-plugin-it/src/test/resources/YangRootNotExist/pom.xml
+++ b/yang/yang-maven-plugin-it/src/test/resources/YangRootNotExist/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.opendaylight.yangtools</groupId>
-    <version>0.5.5-SNAPSHOT</version>
+    <version>0.5.6-SNAPSHOT</version>
 
     <artifactId>test</artifactId>
 
@@ -12,7 +12,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.5-SNAPSHOT</version>
+                <version>0.5.6-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>

diff --git a/yang-maven-plugin-it/src/test/resources/files/testfile1.yang b/yang/yang-maven-plugin-it/src/test/resources/files/testfile1.yang
similarity index 100%
rename from yang-maven-plugin-it/src/test/resources/files/testfile1.yang
rename to yang/yang-maven-plugin-it/src/test/resources/files/testfile1.yang

diff --git a/yang-maven-plugin-it/src/test/resources/files/testfile2.yang b/yang/yang-maven-plugin-it/src/test/resources/files/testfile2.yang
similarity index 100%
rename from yang-maven-plugin-it/src/test/resources/files/testfile2.yang
rename to yang/yang-maven-plugin-it/src/test/resources/files/testfile2.yang

diff --git a/yang-maven-plugin-it/src/test/resources/files/testfile3.yang b/yang/yang-maven-plugin-it/src/test/resources/files/testfile3.yang
similarity index 100%
rename from yang-maven-plugin-it/src/test/resources/files/testfile3.yang
rename to yang/yang-maven-plugin-it/src/test/resources/files/testfile3.yang

diff --git a/yang-maven-plugin-spi/pom.xml b/yang/yang-maven-plugin-spi/pom.xml
similarity index 94%
rename from yang-maven-plugin-spi/pom.xml
rename to yang/yang-maven-plugin-spi/pom.xml
index db2333712547cc7cf89243ced00f79fa84c417b6..80a0e2f79fe4f45b8fbc3864cb36c9ae3ecb1f99 100644 (file)
--- a/yang-maven-plugin-spi/pom.xml
+++ b/yang/yang-maven-plugin-spi/pom.xml
@@ -3,8 +3,8 @@
 
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yangtools</artifactId>
-        <version>0.5.5-SNAPSHOT</version>
+        <artifactId>yang</artifactId>
+        <version>0.5.6-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/CodeGenerator.java b/yang/yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/CodeGenerator.java
similarity index 100%
rename from yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/CodeGenerator.java
rename to yang/yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/CodeGenerator.java

diff --git a/yang-maven-plugin-spi/src/test/java/org/opendaylight/yangtools/yang2sources/spi/CodeGeneratorTestImpl.java b/yang/yang-maven-plugin-spi/src/test/java/org/opendaylight/yangtools/yang2sources/spi/CodeGeneratorTestImpl.java
similarity index 100%
rename from yang-maven-plugin-spi/src/test/java/org/opendaylight/yangtools/yang2sources/spi/CodeGeneratorTestImpl.java
rename to yang/yang-maven-plugin-spi/src/test/java/org/opendaylight/yangtools/yang2sources/spi/CodeGeneratorTestImpl.java

diff --git a/yang-maven-plugin/pom.xml b/yang/yang-maven-plugin/pom.xml
similarity index 97%
rename from yang-maven-plugin/pom.xml
rename to yang/yang-maven-plugin/pom.xml
index 1ab0c91b77e118d8cac94141410e5491fa65bd4b..687681dcb73223005a8900b6a71759a47c517e01 100644 (file)
--- a/yang-maven-plugin/pom.xml
+++ b/yang/yang-maven-plugin/pom.xml
@@ -3,8 +3,8 @@
 
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yangtools</artifactId>
-        <version>0.5.5-SNAPSHOT</version>
+        <artifactId>yang</artifactId>
+        <version>0.5.6-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ConfigArg.java b/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ConfigArg.java
similarity index 100%
rename from yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ConfigArg.java
rename to yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ConfigArg.java

diff --git a/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/Util.java b/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/Util.java
similarity index 100%
rename from yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/Util.java
rename to yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/Util.java

diff --git a/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojo.java b/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojo.java
similarity index 100%
rename from yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojo.java
rename to yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojo.java

diff --git a/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java b/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java
similarity index 100%
rename from yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java
rename to yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java

diff --git a/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java b/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java
similarity index 100%
rename from yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java
rename to yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java

diff --git a/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/UtilTest.java b/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/UtilTest.java
similarity index 100%
rename from yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/UtilTest.java
rename to yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/UtilTest.java

diff --git a/yang-maven-plugin/src/test/resources/yang/mock.yang b/yang/yang-maven-plugin/src/test/resources/yang/mock.yang
similarity index 100%
rename from yang-maven-plugin/src/test/resources/yang/mock.yang
rename to yang/yang-maven-plugin/src/test/resources/yang/mock.yang

diff --git a/yang-model-api/pom.xml b/yang/yang-model-api/pom.xml
similarity index 86%
rename from yang-model-api/pom.xml
rename to yang/yang-model-api/pom.xml
index d402534aab2fc54a8489fa44b01291745b095475..3b05b73bdc71c9d41659c60b25c773c2131cd270 100644 (file)
--- a/yang-model-api/pom.xml
+++ b/yang/yang-model-api/pom.xml
@@ -3,8 +3,8 @@
 \r
     <parent>\r
         <groupId>org.opendaylight.yangtools</groupId>\r
-        <artifactId>yangtools</artifactId>\r
-        <version>0.5.5-SNAPSHOT</version>\r
+        <artifactId>yang</artifactId>\r
+        <version>0.5.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnyXmlSchemaNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnyXmlSchemaNode.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnyXmlSchemaNode.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnyXmlSchemaNode.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationSchema.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationSchema.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationSchema.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationSchema.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationTarget.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationTarget.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationTarget.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationTarget.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceCaseNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceCaseNode.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceCaseNode.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceCaseNode.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceNode.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceNode.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceNode.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ConstraintDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ConstraintDefinition.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ConstraintDefinition.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ConstraintDefinition.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ConstraintMetaDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ConstraintMetaDefinition.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ConstraintMetaDefinition.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ConstraintMetaDefinition.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ContainerSchemaNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ContainerSchemaNode.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ContainerSchemaNode.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ContainerSchemaNode.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataNodeContainer.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataNodeContainer.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataNodeContainer.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataNodeContainer.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataSchemaNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataSchemaNode.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataSchemaNode.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataSchemaNode.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Deviation.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Deviation.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Deviation.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Deviation.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ExtensionDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ExtensionDefinition.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ExtensionDefinition.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ExtensionDefinition.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/FeatureDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/FeatureDefinition.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/FeatureDefinition.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/FeatureDefinition.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/GroupingDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/GroupingDefinition.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/GroupingDefinition.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/GroupingDefinition.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/IdentitySchemaNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/IdentitySchemaNode.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/IdentitySchemaNode.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/IdentitySchemaNode.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafListSchemaNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafListSchemaNode.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafListSchemaNode.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafListSchemaNode.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafSchemaNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafSchemaNode.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafSchemaNode.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafSchemaNode.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ListSchemaNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ListSchemaNode.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ListSchemaNode.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ListSchemaNode.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Module.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Module.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Module.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Module.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleImport.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleImport.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleImport.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleImport.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/MustDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/MustDefinition.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/MustDefinition.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/MustDefinition.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NotificationDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NotificationDefinition.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NotificationDefinition.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NotificationDefinition.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/RevisionAwareXPath.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/RevisionAwareXPath.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/RevisionAwareXPath.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/RevisionAwareXPath.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/RpcDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/RpcDefinition.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/RpcDefinition.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/RpcDefinition.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaContext.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaContext.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaContext.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaContext.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaNode.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaNode.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaNode.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Status.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Status.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Status.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Status.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/TypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/TypeDefinition.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/TypeDefinition.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/TypeDefinition.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UnknownSchemaNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UnknownSchemaNode.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UnknownSchemaNode.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UnknownSchemaNode.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UsesNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UsesNode.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UsesNode.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UsesNode.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BinaryTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BinaryTypeDefinition.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BinaryTypeDefinition.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BinaryTypeDefinition.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BitsTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BitsTypeDefinition.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BitsTypeDefinition.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BitsTypeDefinition.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BooleanTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BooleanTypeDefinition.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BooleanTypeDefinition.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BooleanTypeDefinition.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/DecimalTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/DecimalTypeDefinition.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/DecimalTypeDefinition.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/DecimalTypeDefinition.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EmptyTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EmptyTypeDefinition.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EmptyTypeDefinition.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EmptyTypeDefinition.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EnumTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EnumTypeDefinition.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EnumTypeDefinition.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EnumTypeDefinition.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityTypeDefinition.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityTypeDefinition.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityTypeDefinition.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityrefTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityrefTypeDefinition.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityrefTypeDefinition.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityrefTypeDefinition.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/InstanceIdentifierTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/InstanceIdentifierTypeDefinition.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/InstanceIdentifierTypeDefinition.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/InstanceIdentifierTypeDefinition.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IntegerTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IntegerTypeDefinition.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IntegerTypeDefinition.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IntegerTypeDefinition.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LeafrefTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LeafrefTypeDefinition.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LeafrefTypeDefinition.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LeafrefTypeDefinition.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LengthConstraint.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LengthConstraint.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LengthConstraint.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LengthConstraint.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/PatternConstraint.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/PatternConstraint.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/PatternConstraint.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/PatternConstraint.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/RangeConstraint.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/RangeConstraint.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/RangeConstraint.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/RangeConstraint.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/StringTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/StringTypeDefinition.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/StringTypeDefinition.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/StringTypeDefinition.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnionTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnionTypeDefinition.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnionTypeDefinition.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnionTypeDefinition.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnknownTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnknownTypeDefinition.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnknownTypeDefinition.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnknownTypeDefinition.java

diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnsignedIntegerTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnsignedIntegerTypeDefinition.java
similarity index 100%
rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnsignedIntegerTypeDefinition.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnsignedIntegerTypeDefinition.java

diff --git a/yang-model-util/pom.xml b/yang/yang-model-util/pom.xml
similarity index 86%
rename from yang-model-util/pom.xml
rename to yang/yang-model-util/pom.xml
index f7edc4fafe2fb7f6a93c0c1cbaf464c90f275ce9..07fe859dcea17c248bc69b0d50f7571920c0e04a 100644 (file)
--- a/yang-model-util/pom.xml
+++ b/yang/yang-model-util/pom.xml
@@ -3,8 +3,8 @@
 \r
     <parent>\r
         <groupId>org.opendaylight.yangtools</groupId>\r
-        <artifactId>yangtools</artifactId>\r
-        <version>0.5.5-SNAPSHOT</version>\r
+        <artifactId>yang</artifactId>\r
+        <version>0.5.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractSignedInteger.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractSignedInteger.java
similarity index 100%
rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractSignedInteger.java
rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractSignedInteger.java

diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractUnsignedInteger.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractUnsignedInteger.java
similarity index 100%
rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractUnsignedInteger.java
rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractUnsignedInteger.java

diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseConstraints.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseConstraints.java
similarity index 100%
rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseConstraints.java
rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseConstraints.java

diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java
similarity index 100%
rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java
rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java

diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BinaryType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BinaryType.java
similarity index 100%
rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BinaryType.java
rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BinaryType.java

diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitsType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitsType.java
similarity index 100%
rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitsType.java
rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitsType.java

diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BooleanType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BooleanType.java
similarity index 100%
rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BooleanType.java
rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BooleanType.java

diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/DataNodeIterator.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/DataNodeIterator.java
similarity index 100%
rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/DataNodeIterator.java
rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/DataNodeIterator.java

diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Decimal64.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Decimal64.java
similarity index 100%
rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Decimal64.java
rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Decimal64.java

diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EmptyType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EmptyType.java
similarity index 100%
rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EmptyType.java
rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EmptyType.java

diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EnumerationType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EnumerationType.java
similarity index 100%
rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EnumerationType.java
rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EnumerationType.java

diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ExtendedType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ExtendedType.java
similarity index 100%
rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ExtendedType.java
rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ExtendedType.java

diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/IdentityrefType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/IdentityrefType.java
similarity index 100%
rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/IdentityrefType.java
rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/IdentityrefType.java

diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/InstanceIdentifier.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/InstanceIdentifier.java
similarity index 100%
rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/InstanceIdentifier.java
rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/InstanceIdentifier.java

diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int16.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int16.java
similarity index 100%
rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int16.java
rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int16.java

diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int32.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int32.java
similarity index 100%
rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int32.java
rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int32.java

diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int64.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int64.java
similarity index 100%
rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int64.java
rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int64.java

diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int8.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int8.java
similarity index 100%
rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int8.java
rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int8.java

diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Leafref.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Leafref.java
similarity index 100%
rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Leafref.java
rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Leafref.java

diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/RevisionAwareXPathImpl.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/RevisionAwareXPathImpl.java
similarity index 100%
rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/RevisionAwareXPathImpl.java
rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/RevisionAwareXPathImpl.java

diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java
similarity index 100%
rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java
rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java

diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java
similarity index 100%
rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java
rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java

diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint16.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint16.java
similarity index 100%
rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint16.java
rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint16.java

diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint32.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint32.java
similarity index 100%
rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint32.java
rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint32.java

diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint64.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint64.java
similarity index 100%
rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint64.java
rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint64.java

diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint8.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint8.java
similarity index 100%
rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint8.java
rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint8.java

diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnionType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnionType.java
similarity index 100%
rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnionType.java
rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnionType.java

diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnknownType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnknownType.java
similarity index 100%
rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnknownType.java
rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnknownType.java

diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/YangTypesConverter.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/YangTypesConverter.java
similarity index 100%
rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/YangTypesConverter.java
rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/YangTypesConverter.java

diff --git a/yang-parser-api/pom.xml b/yang/yang-parser-api/pom.xml
similarity index 88%
rename from yang-parser-api/pom.xml
rename to yang/yang-parser-api/pom.xml
index 221704d7cdbfa08a66e2f5e586ebccb537fccaf9..72ee1797e2cef83f18b7b0ed8ebd6a30c6ac2555 100644 (file)
--- a/yang-parser-api/pom.xml
+++ b/yang/yang-parser-api/pom.xml
@@ -3,8 +3,8 @@
 
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yangtools</artifactId>
-        <version>0.5.5-SNAPSHOT</version>
+        <artifactId>yang</artifactId>
+        <version>0.5.6-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangModelParser.java b/yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangModelParser.java
similarity index 100%
rename from yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangModelParser.java
rename to yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangModelParser.java

diff --git a/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/package-info.java b/yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/package-info.java
similarity index 100%
rename from yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/package-info.java
rename to yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/package-info.java

diff --git a/yang-parser-impl/pom.xml b/yang/yang-parser-impl/pom.xml
similarity index 95%
rename from yang-parser-impl/pom.xml
rename to yang/yang-parser-impl/pom.xml
index ef46888190216111a6f7a367ead2360033c84882..b8f2df1c1be12426ef4af60c307305adb1903a20 100644 (file)
--- a/yang-parser-impl/pom.xml
+++ b/yang/yang-parser-impl/pom.xml
@@ -3,8 +3,8 @@
 \r
     <parent>\r
         <groupId>org.opendaylight.yangtools</groupId>\r
-        <artifactId>yangtools</artifactId>\r
-        <version>0.5.5-SNAPSHOT</version>\r
+        <artifactId>yang</artifactId>\r
+        <version>0.5.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/yang-parser-impl/src/main/antlr/YangLexer.g4 b/yang/yang-parser-impl/src/main/antlr/YangLexer.g4
similarity index 100%
rename from yang-parser-impl/src/main/antlr/YangLexer.g4
rename to yang/yang-parser-impl/src/main/antlr/YangLexer.g4

diff --git a/yang-parser-impl/src/main/antlr/YangParser.g4 b/yang/yang-parser-impl/src/main/antlr/YangParser.g4
similarity index 100%
rename from yang-parser-impl/src/main/antlr/YangParser.g4
rename to yang/yang-parser-impl/src/main/antlr/YangParser.g4

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractDataNodeContainerBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractDataNodeContainerBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractDataNodeContainerBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractDataNodeContainerBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractSchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractSchemaNodeBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractSchemaNodeBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractSchemaNodeBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractTypeAwareBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractTypeAwareBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractTypeAwareBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractTypeAwareBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AugmentationSchemaBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AugmentationSchemaBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AugmentationSchemaBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AugmentationSchemaBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AugmentationTargetBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AugmentationTargetBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AugmentationTargetBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AugmentationTargetBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/Builder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/Builder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/Builder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/Builder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataNodeContainerBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataNodeContainerBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataNodeContainerBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataNodeContainerBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataSchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataSchemaNodeBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataSchemaNodeBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataSchemaNodeBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/GroupingBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/GroupingBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/GroupingBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/GroupingBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/GroupingMember.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/GroupingMember.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/GroupingMember.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/GroupingMember.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/SchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/SchemaNodeBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/SchemaNodeBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/SchemaNodeBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeAwareBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeAwareBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeAwareBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeAwareBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeDefinitionBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeDefinitionBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeDefinitionBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeDefinitionBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/UsesNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/UsesNodeBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/UsesNodeBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/UsesNodeBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java
similarity index 98%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java
index b4d2fa77738ff7e8a0ded08f8c79270516b049c6..2cc67615c6d31a21fa311d0ffc94f9fbb7180db4 100644 (file)
--- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java
@@ -54,6 +54,8 @@ public final class AugmentationSchemaBuilderImpl extends AbstractDataNodeContain
     private final Set<UsesNodeBuilder> usesNodes = new HashSet<UsesNodeBuilder>();
     private boolean resolved;
 
+    private final static SchemaPath path = new SchemaPath(Collections.<QName> emptyList(), true);
+
     AugmentationSchemaBuilderImpl(final String moduleName, final int line, final String augmentTargetStr) {
         super(moduleName, line, null);
         this.augmentTargetStr = augmentTargetStr;
@@ -82,19 +84,16 @@ public final class AugmentationSchemaBuilderImpl extends AbstractDataNodeContain
         usesNodes.add(usesBuilder);
     }
 
-    /**
-     * Always returns null.
-     */
     @Override
     public SchemaPath getPath() {
-        return null;
+        return path;
     }
 
     @Override
     public AugmentationSchema build() {
         if (!built) {
             // process uses
-            for(UsesNodeBuilder use : usesNodes) {
+            for (UsesNodeBuilder use : usesNodes) {
                 addedChildNodes.addAll(use.getTargetChildren());
                 addedUnknownNodes.addAll(use.getTargetUnknownNodes());
             }

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ConstraintsBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ConstraintsBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ConstraintsBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ConstraintsBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/DeviationBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/DeviationBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/DeviationBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/DeviationBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingBuilderImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingBuilderImpl.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingBuilderImpl.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingBuilderImpl.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImpl.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImpl.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImpl.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnionTypeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnionTypeBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnionTypeBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnionTypeBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeBuilderImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeBuilderImpl.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeBuilderImpl.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeBuilderImpl.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/SchemaContextImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/SchemaContextImpl.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/SchemaContextImpl.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/SchemaContextImpl.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangErrorListener.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangErrorListener.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangErrorListener.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangErrorListener.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java
similarity index 99%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java
index 5dfbe8bf60ea82de602da87596340b7a17d94053..98fdc57f71355450d5c0d14a4abefd8528f97852 100644 (file)
--- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java
@@ -806,11 +806,10 @@ public final class YangParserImpl implements YangModelParser {
         URI namespace = null;
         Date revision = null;
         String prefix = null;
-        if (parent instanceof ModuleBuilder) {
-            ModuleBuilder m = (ModuleBuilder) parent;
-            namespace = m.getNamespace();
-            revision = m.getRevision();
-            prefix = m.getPrefix();
+        if (parent instanceof ModuleBuilder || parent instanceof AugmentationSchemaBuilder) {
+            namespace = module.getNamespace();
+            revision = module.getRevision();
+            prefix = module.getPrefix();
         } else {
             QName parentQName = parent.getQName();
             namespace = parentQName.getNamespace();

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/BitImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/BitImpl.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/BitImpl.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/BitImpl.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/Comparators.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/Comparators.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/Comparators.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/Comparators.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySort.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySort.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySort.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySort.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/MustDefinitionImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/MustDefinitionImpl.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/MustDefinitionImpl.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/MustDefinitionImpl.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserListenerUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserListenerUtils.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserListenerUtils.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserListenerUtils.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserUtils.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserUtils.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserUtils.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/RefineHolder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/RefineHolder.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/RefineHolder.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/RefineHolder.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/RefineUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/RefineUtils.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/RefineUtils.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/RefineUtils.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TopologicalSort.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TopologicalSort.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TopologicalSort.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TopologicalSort.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeConstraints.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeConstraints.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeConstraints.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeConstraints.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeUtils.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeUtils.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeUtils.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/UnknownBoundaryNumber.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/UnknownBoundaryNumber.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/UnknownBoundaryNumber.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/UnknownBoundaryNumber.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/YangParseException.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/YangParseException.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/YangParseException.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/YangParseException.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/YangValidationException.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/YangValidationException.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/YangValidationException.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/YangValidationException.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/BasicValidations.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/BasicValidations.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/BasicValidations.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/BasicValidations.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/ValidationUtil.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/ValidationUtil.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/ValidationUtil.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/ValidationUtil.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/YangModelBasicValidationListener.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/YangModelBasicValidationListener.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/YangModelBasicValidationListener.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/YangModelBasicValidationListener.java

diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/YangModelBasicValidator.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/YangModelBasicValidator.java
similarity index 100%
rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/YangModelBasicValidator.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/YangModelBasicValidator.java

diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/AugmentTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/AugmentTest.java
similarity index 100%
rename from yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/AugmentTest.java
rename to yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/AugmentTest.java

diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/GroupingTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/GroupingTest.java
similarity index 100%
rename from yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/GroupingTest.java
rename to yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/GroupingTest.java

diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TestUtils.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TestUtils.java
similarity index 100%
rename from yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TestUtils.java
rename to yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TestUtils.java

diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TypesResolutionTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TypesResolutionTest.java
similarity index 100%
rename from yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TypesResolutionTest.java
rename to yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TypesResolutionTest.java

diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserNegativeTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserNegativeTest.java
similarity index 100%
rename from yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserNegativeTest.java
rename to yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserNegativeTest.java

diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserSimpleTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserSimpleTest.java
similarity index 100%
rename from yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserSimpleTest.java
rename to yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserSimpleTest.java

diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java
similarity index 100%
rename from yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java
rename to yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java

diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserWithContextTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserWithContextTest.java
similarity index 100%
rename from yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserWithContextTest.java
rename to yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserWithContextTest.java

diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySortTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySortTest.java
similarity index 100%
rename from yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySortTest.java
rename to yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySortTest.java

diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/TopologicalSortTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/TopologicalSortTest.java
similarity index 100%
rename from yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/TopologicalSortTest.java
rename to yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/TopologicalSortTest.java

diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationListTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationListTest.java
similarity index 100%
rename from yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationListTest.java
rename to yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationListTest.java

diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationModuleTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationModuleTest.java
similarity index 100%
rename from yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationModuleTest.java
rename to yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationModuleTest.java

diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationSubModuleTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationSubModuleTest.java
similarity index 100%
rename from yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationSubModuleTest.java
rename to yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationSubModuleTest.java

diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationTest.java
similarity index 100%
rename from yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationTest.java
rename to yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationTest.java

diff --git a/yang-parser-impl/src/test/resources/context-augment-test/test1.yang b/yang/yang-parser-impl/src/test/resources/context-augment-test/test1.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/context-augment-test/test1.yang
rename to yang/yang-parser-impl/src/test/resources/context-augment-test/test1.yang

diff --git a/yang-parser-impl/src/test/resources/context-augment-test/test2.yang b/yang/yang-parser-impl/src/test/resources/context-augment-test/test2.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/context-augment-test/test2.yang
rename to yang/yang-parser-impl/src/test/resources/context-augment-test/test2.yang

diff --git a/yang-parser-impl/src/test/resources/context-augment-test/test3.yang b/yang/yang-parser-impl/src/test/resources/context-augment-test/test3.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/context-augment-test/test3.yang
rename to yang/yang-parser-impl/src/test/resources/context-augment-test/test3.yang

diff --git a/yang-parser-impl/src/test/resources/context-augment-test/test4.yang b/yang/yang-parser-impl/src/test/resources/context-augment-test/test4.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/context-augment-test/test4.yang
rename to yang/yang-parser-impl/src/test/resources/context-augment-test/test4.yang

diff --git a/yang-parser-impl/src/test/resources/context-test/deviation-test.yang b/yang/yang-parser-impl/src/test/resources/context-test/deviation-test.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/context-test/deviation-test.yang
rename to yang/yang-parser-impl/src/test/resources/context-test/deviation-test.yang

diff --git a/yang-parser-impl/src/test/resources/context-test/test1.yang b/yang/yang-parser-impl/src/test/resources/context-test/test1.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/context-test/test1.yang
rename to yang/yang-parser-impl/src/test/resources/context-test/test1.yang

diff --git a/yang-parser-impl/src/test/resources/context-test/test2.yang b/yang/yang-parser-impl/src/test/resources/context-test/test2.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/context-test/test2.yang
rename to yang/yang-parser-impl/src/test/resources/context-test/test2.yang

diff --git a/yang-parser-impl/src/test/resources/context-test/test3.yang b/yang/yang-parser-impl/src/test/resources/context-test/test3.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/context-test/test3.yang
rename to yang/yang-parser-impl/src/test/resources/context-test/test3.yang

diff --git a/yang-parser-impl/src/test/resources/model/custom.yang b/yang/yang-parser-impl/src/test/resources/model/custom.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/model/custom.yang
rename to yang/yang-parser-impl/src/test/resources/model/custom.yang

diff --git a/yang-parser-impl/src/test/resources/model/nodes.yang b/yang/yang-parser-impl/src/test/resources/model/nodes.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/model/nodes.yang
rename to yang/yang-parser-impl/src/test/resources/model/nodes.yang

diff --git a/yang-parser-impl/src/test/resources/model/types.yang b/yang/yang-parser-impl/src/test/resources/model/types.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/model/types.yang
rename to yang/yang-parser-impl/src/test/resources/model/types.yang

diff --git a/yang-parser-impl/src/test/resources/negative-scenario/duplicity/augment0.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/augment0.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/negative-scenario/duplicity/augment0.yang
rename to yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/augment0.yang

diff --git a/yang-parser-impl/src/test/resources/negative-scenario/duplicity/augment1.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/augment1.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/negative-scenario/duplicity/augment1.yang
rename to yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/augment1.yang

diff --git a/yang-parser-impl/src/test/resources/negative-scenario/duplicity/augment2.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/augment2.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/negative-scenario/duplicity/augment2.yang
rename to yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/augment2.yang

diff --git a/yang-parser-impl/src/test/resources/negative-scenario/duplicity/container-leaf.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/container-leaf.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/negative-scenario/duplicity/container-leaf.yang
rename to yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/container-leaf.yang

diff --git a/yang-parser-impl/src/test/resources/negative-scenario/duplicity/container-list.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/container-list.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/negative-scenario/duplicity/container-list.yang
rename to yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/container-list.yang

diff --git a/yang-parser-impl/src/test/resources/negative-scenario/duplicity/container.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/container.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/negative-scenario/duplicity/container.yang
rename to yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/container.yang

diff --git a/yang-parser-impl/src/test/resources/negative-scenario/duplicity/identity.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/identity.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/negative-scenario/duplicity/identity.yang
rename to yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/identity.yang

diff --git a/yang-parser-impl/src/test/resources/negative-scenario/duplicity/typedef.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/typedef.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/negative-scenario/duplicity/typedef.yang
rename to yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/typedef.yang

diff --git a/yang-parser-impl/src/test/resources/negative-scenario/testfile0.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/testfile0.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/negative-scenario/testfile0.yang
rename to yang/yang-parser-impl/src/test/resources/negative-scenario/testfile0.yang

diff --git a/yang-parser-impl/src/test/resources/negative-scenario/testfile1.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/testfile1.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/negative-scenario/testfile1.yang
rename to yang/yang-parser-impl/src/test/resources/negative-scenario/testfile1.yang

diff --git a/yang-parser-impl/src/test/resources/negative-scenario/testfile2.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/testfile2.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/negative-scenario/testfile2.yang
rename to yang/yang-parser-impl/src/test/resources/negative-scenario/testfile2.yang

diff --git a/yang-parser-impl/src/test/resources/negative-scenario/testfile3.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/testfile3.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/negative-scenario/testfile3.yang
rename to yang/yang-parser-impl/src/test/resources/negative-scenario/testfile3.yang

diff --git a/yang-parser-impl/src/test/resources/negative-scenario/testfile4.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/testfile4.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/negative-scenario/testfile4.yang
rename to yang/yang-parser-impl/src/test/resources/negative-scenario/testfile4.yang

diff --git a/yang-parser-impl/src/test/resources/negative-scenario/testfile5.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/testfile5.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/negative-scenario/testfile5.yang
rename to yang/yang-parser-impl/src/test/resources/negative-scenario/testfile5.yang

diff --git a/yang-parser-impl/src/test/resources/negative-scenario/testfile6.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/testfile6.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/negative-scenario/testfile6.yang
rename to yang/yang-parser-impl/src/test/resources/negative-scenario/testfile6.yang

diff --git a/yang-parser-impl/src/test/resources/simple-test/cascade-uses.yang b/yang/yang-parser-impl/src/test/resources/simple-test/cascade-uses.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/simple-test/cascade-uses.yang
rename to yang/yang-parser-impl/src/test/resources/simple-test/cascade-uses.yang

diff --git a/yang-parser-impl/src/test/resources/simple-test/simple-nodes.yang b/yang/yang-parser-impl/src/test/resources/simple-test/simple-nodes.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/simple-test/simple-nodes.yang
rename to yang/yang-parser-impl/src/test/resources/simple-test/simple-nodes.yang

diff --git a/yang-parser-impl/src/test/resources/types/custom-types-test@2012-4-4.yang b/yang/yang-parser-impl/src/test/resources/types/custom-types-test@2012-4-4.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/types/custom-types-test@2012-4-4.yang
rename to yang/yang-parser-impl/src/test/resources/types/custom-types-test@2012-4-4.yang

diff --git a/yang-parser-impl/src/test/resources/types/iana-afn-safi@2012-06-04.yang b/yang/yang-parser-impl/src/test/resources/types/iana-afn-safi@2012-06-04.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/types/iana-afn-safi@2012-06-04.yang
rename to yang/yang-parser-impl/src/test/resources/types/iana-afn-safi@2012-06-04.yang

diff --git a/yang-parser-impl/src/test/resources/types/iana-if-type@2012-06-05.yang b/yang/yang-parser-impl/src/test/resources/types/iana-if-type@2012-06-05.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/types/iana-if-type@2012-06-05.yang
rename to yang/yang-parser-impl/src/test/resources/types/iana-if-type@2012-06-05.yang

diff --git a/yang-parser-impl/src/test/resources/types/iana-timezones@2012-07-09.yang b/yang/yang-parser-impl/src/test/resources/types/iana-timezones@2012-07-09.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/types/iana-timezones@2012-07-09.yang
rename to yang/yang-parser-impl/src/test/resources/types/iana-timezones@2012-07-09.yang

diff --git a/yang-parser-impl/src/test/resources/types/ietf-inet-types@2010-09-24.yang b/yang/yang-parser-impl/src/test/resources/types/ietf-inet-types@2010-09-24.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/types/ietf-inet-types@2010-09-24.yang
rename to yang/yang-parser-impl/src/test/resources/types/ietf-inet-types@2010-09-24.yang

diff --git a/yang-parser-impl/src/test/resources/types/ietf-yang-types@2010-09-24.yang b/yang/yang-parser-impl/src/test/resources/types/ietf-yang-types@2010-09-24.yang
similarity index 100%
rename from yang-parser-impl/src/test/resources/types/ietf-yang-types@2010-09-24.yang
rename to yang/yang-parser-impl/src/test/resources/types/ietf-yang-types@2010-09-24.yang