Renamed maven-yang-plugin -> yang-maven-plugin.

Renamed maven-yang -> yang-maven-plugin-spi.
Renamed maven-yang-plugin-it -> yang-maven-plugin-it.

Updated '.gitignore'.

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

diff --git a/.gitignore b/.gitignore
index 90a734d7c2c3553625e11ea3f9c9c7f39129c849..beef00d016539f0af7e0cb61be0ef1028cc8db48 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,4 @@
 .classpath
 .project
-*/.settings/
+.settings
 target
-target/*
-/target/
-

diff --git a/pom.xml b/pom.xml
index e459fa3fafdcc9352e55b1963b355db0b86d0320..45ae0f6b3f4a8c19b4e6614456fe741acb15698e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -13,19 +13,19 @@
     </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-model-api</module>
-        <module>yang-model-util</module>
-        <module>yang-binding</module>
         <module>yang-ext</module>
+        <module>yang-model-api</module>
         <module>yang-model-parser-api</module>
         <module>yang-model-parser-impl</module>
-        <module>maven-yang</module>
-        <module>maven-yang-plugin</module>
-        <module>maven-yang-plugin-it</module>
+        <module>yang-maven-plugin</module>
+        <module>yang-maven-plugin-it</module>
+        <module>yang-maven-plugin-spi</module>
+        <module>yang-model-util</module>
     </modules>
 
     <dependencyManagement>

diff --git a/yang-ext/pom.xml b/yang-ext/pom.xml
index 8a548e4ad7424b7a95ed79b45085d22d07c00b5d..4b1dc23979544c1993f9a5b8c62372f150b273a1 100644 (file)
--- a/yang-ext/pom.xml
+++ b/yang-ext/pom.xml
@@ -76,13 +76,13 @@
                                 <pluginExecution>
                                     <pluginExecutionFilter>
                                         <groupId>
-                                            org.opendaylight.controller
+                                            org.opendaylight.yang
                                         </groupId>
                                         <artifactId>
                                             yang-maven-plugin
                                         </artifactId>
                                         <versionRange>
-                                            [0.5,)
+                                            [0.5.4,)
                                         </versionRange>
                                         <goals>
                                             <goal>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/maven-yang/pom.xml b/yang-maven-plugin-spi/pom.xml
similarity index 100%
rename from maven-yang/pom.xml
rename to yang-maven-plugin-spi/pom.xml

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

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

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

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

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

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

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

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

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

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