Migrated models to use MD-SAL provided code.

Change-Id: Ia92933803e133604b5a54b1b2c82210480ae3ffc
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>

diff --git a/model/iana/iana-afn-safi/pom.xml b/model/iana/iana-afn-safi/pom.xml
index de82000313359b0b9a45d764d11123ed969a07c5..aaa5fe00bbaf7be5be4572a72cc582a955cc1cb5 100644 (file)
--- a/model/iana/iana-afn-safi/pom.xml
+++ b/model/iana/iana-afn-safi/pom.xml
@@ -11,7 +11,7 @@
 
     <parent>
         <artifactId>model-iana</artifactId>
-        <groupId>org.opendaylight.yangtools.model</groupId>
+        <groupId>org.opendaylight.mdsal.model</groupId>
         <version>0.8.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

diff --git a/model/iana/iana-if-type-2014-05-08/pom.xml b/model/iana/iana-if-type-2014-05-08/pom.xml
index 3815db3fc5dc94d23eb673913e99850ec3c39168..f324adde3a9d8962b209f5dba25108c8f31009fb 100644 (file)
--- a/model/iana/iana-if-type-2014-05-08/pom.xml
+++ b/model/iana/iana-if-type-2014-05-08/pom.xml
@@ -11,7 +11,7 @@
 
     <parent>
         <artifactId>model-iana</artifactId>
-        <groupId>org.opendaylight.yangtools.model</groupId>
+        <groupId>org.opendaylight.mdsal.model</groupId>
         <version>0.8.0-SNAPSHOT</version>
     </parent>
 

diff --git a/model/iana/iana-if-type/pom.xml b/model/iana/iana-if-type/pom.xml
index fb011b8145af34f2a7d2894345684749d3824e7a..71581be068a726f9afdbbf4416c66c62ec80bfbd 100644 (file)
--- a/model/iana/iana-if-type/pom.xml
+++ b/model/iana/iana-if-type/pom.xml
@@ -11,7 +11,7 @@
 
     <parent>
         <artifactId>model-iana</artifactId>
-        <groupId>org.opendaylight.yangtools.model</groupId>
+        <groupId>org.opendaylight.mdsal.model</groupId>
         <version>0.8.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

diff --git a/model/iana/pom.xml b/model/iana/pom.xml
index 843c084db3211070576c3a4672ea2307132cc1e2..3c03f15112389e2f44dfdd93077733af78be8cbf 100644 (file)
--- a/model/iana/pom.xml
+++ b/model/iana/pom.xml
@@ -11,7 +11,7 @@
 
     <parent>
         <artifactId>model-parent</artifactId>
-        <groupId>org.opendaylight.yangtools.model</groupId>
+        <groupId>org.opendaylight.mdsal.model</groupId>
         <version>0.8.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -23,7 +23,7 @@
         <module>iana-afn-safi</module>
         <module>iana-if-type</module>
         <module>iana-if-type-2014-05-08</module>
-        <!-- 
+        <!--
         <module>ietf-topology-l3-unicast-igp</module>
         <module>ietf-topology-isis</module>
         <module>ietf-topology-ospf</module>

diff --git a/model/ietf/ietf-inet-types/pom.xml b/model/ietf/ietf-inet-types/pom.xml
index cad85086202a35ccbdfc659a814879c0f45f4970..c3774e6ea5e4f91f48d0d4d21bc1d7f84756eff7 100644 (file)
--- a/model/ietf/ietf-inet-types/pom.xml
+++ b/model/ietf/ietf-inet-types/pom.xml
@@ -11,7 +11,7 @@
 
     <parent>
         <artifactId>model-ietf</artifactId>
-        <groupId>org.opendaylight.yangtools.model</groupId>
+        <groupId>org.opendaylight.mdsal.model</groupId>
         <version>0.8.0-SNAPSHOT</version>
     </parent>
 

diff --git a/model/ietf/ietf-interfaces/pom.xml b/model/ietf/ietf-interfaces/pom.xml
index ac561979dc3694e62d7a5ca3dcccf259b39a0b3f..86a033354b5e4b18d51d41ea55a7a507f1e7421e 100644 (file)
--- a/model/ietf/ietf-interfaces/pom.xml
+++ b/model/ietf/ietf-interfaces/pom.xml
@@ -11,7 +11,7 @@
 
     <parent>
         <artifactId>model-ietf</artifactId>
-        <groupId>org.opendaylight.yangtools.model</groupId>
+        <groupId>org.opendaylight.mdsal.model</groupId>
         <version>0.8.0-SNAPSHOT</version>
     </parent>
 

diff --git a/model/ietf/ietf-restconf/pom.xml b/model/ietf/ietf-restconf/pom.xml
index f25ffe79468a13578d665c21f3a3e82262f7a46d..26aa887f2cbbb1c3ac82b1f4696300bd37c33ccd 100644 (file)
--- a/model/ietf/ietf-restconf/pom.xml
+++ b/model/ietf/ietf-restconf/pom.xml
@@ -12,7 +12,7 @@
 
     <parent>
         <artifactId>model-ietf</artifactId>
-        <groupId>org.opendaylight.yangtools.model</groupId>
+        <groupId>org.opendaylight.mdsal.model</groupId>
         <version>0.8.0-SNAPSHOT</version>
     </parent>
 
@@ -33,7 +33,7 @@
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-yang-types-20130715</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/model/ietf/ietf-ted/pom.xml b/model/ietf/ietf-ted/pom.xml
index f060fe23f506aefb9b2ec20a75cf1c95ed2b206d..d4630038b165f5aa8dbefbcf44398f595aabae4d 100644 (file)
--- a/model/ietf/ietf-ted/pom.xml
+++ b/model/ietf/ietf-ted/pom.xml
@@ -11,7 +11,7 @@
 
     <parent>
         <artifactId>model-ietf</artifactId>
-        <groupId>org.opendaylight.yangtools.model</groupId>
+        <groupId>org.opendaylight.mdsal.model</groupId>
         <version>0.8.0-SNAPSHOT</version>
     </parent>
 

diff --git a/model/ietf/ietf-topology-isis/pom.xml b/model/ietf/ietf-topology-isis/pom.xml
index 9063160570836bffbba39e424bb67c15d66b862b..1673df8b54008023578d39c368122b5ef84fcdc6 100644 (file)
--- a/model/ietf/ietf-topology-isis/pom.xml
+++ b/model/ietf/ietf-topology-isis/pom.xml
@@ -11,7 +11,7 @@
 
     <parent>
         <artifactId>model-ietf</artifactId>
-        <groupId>org.opendaylight.yangtools.model</groupId>
+        <groupId>org.opendaylight.mdsal.model</groupId>
         <version>0.8.0-SNAPSHOT</version>
     </parent>
 

diff --git a/model/ietf/ietf-topology-l3-unicast-igp/pom.xml b/model/ietf/ietf-topology-l3-unicast-igp/pom.xml
index 071d5aadb2168d6cb4bad1744b576bea1eb7d432..614bc218e0c219f56ad3bcf60f7624e0f31dafb9 100644 (file)
--- a/model/ietf/ietf-topology-l3-unicast-igp/pom.xml
+++ b/model/ietf/ietf-topology-l3-unicast-igp/pom.xml
@@ -12,7 +12,7 @@
 
     <parent>
         <artifactId>model-ietf</artifactId>
-        <groupId>org.opendaylight.yangtools.model</groupId>
+        <groupId>org.opendaylight.mdsal.model</groupId>
         <version>0.8.0-SNAPSHOT</version>
     </parent>
 

diff --git a/model/ietf/ietf-topology-ospf/pom.xml b/model/ietf/ietf-topology-ospf/pom.xml
index 7344aab89bbc2c977e16a7a2c32169240d26b88e..0b2f563503919f028f53986e09be7d9a42505a1d 100644 (file)
--- a/model/ietf/ietf-topology-ospf/pom.xml
+++ b/model/ietf/ietf-topology-ospf/pom.xml
@@ -11,7 +11,7 @@
 
     <parent>
         <artifactId>model-ietf</artifactId>
-        <groupId>org.opendaylight.yangtools.model</groupId>
+        <groupId>org.opendaylight.mdsal.model</groupId>
         <version>0.8.0-SNAPSHOT</version>
     </parent>
 

diff --git a/model/ietf/ietf-topology/pom.xml b/model/ietf/ietf-topology/pom.xml
index 1954710a68a5e2eafc93bfdca49174e9985961e0..d9d8bf2da2b6804f06892e3bb679464cb530dc6d 100644 (file)
--- a/model/ietf/ietf-topology/pom.xml
+++ b/model/ietf/ietf-topology/pom.xml
@@ -11,7 +11,7 @@
 
     <parent>
         <artifactId>model-ietf</artifactId>
-        <groupId>org.opendaylight.yangtools.model</groupId>
+        <groupId>org.opendaylight.mdsal.model</groupId>
         <version>0.8.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/model/ietf/ietf-yang-types-20130715/pom.xml b/model/ietf/ietf-yang-types-20130715/pom.xml
index 9d6c5eeba4220935f12b560c8989619b1f4ee7bd..de541938aad37aad1ff5e3fb4a5a7783f8923332 100644 (file)
--- a/model/ietf/ietf-yang-types-20130715/pom.xml
+++ b/model/ietf/ietf-yang-types-20130715/pom.xml
@@ -12,7 +12,7 @@
 
     <parent>
         <artifactId>model-ietf</artifactId>
-        <groupId>org.opendaylight.yangtools.model</groupId>
+        <groupId>org.opendaylight.mdsal.model</groupId>
         <version>0.8.0-SNAPSHOT</version>
     </parent>
 

diff --git a/model/ietf/ietf-yang-types/pom.xml b/model/ietf/ietf-yang-types/pom.xml
index 9c20f894354eabc56dc7dc76bc4816077ef0131a..77b8d8957485ea3a3a81a2844ec75b1a75156fa4 100644 (file)
--- a/model/ietf/ietf-yang-types/pom.xml
+++ b/model/ietf/ietf-yang-types/pom.xml
@@ -11,7 +11,7 @@
 
     <parent>
         <artifactId>model-ietf</artifactId>
-        <groupId>org.opendaylight.yangtools.model</groupId>
+        <groupId>org.opendaylight.mdsal.model</groupId>
         <version>0.8.0-SNAPSHOT</version>
     </parent>
 

diff --git a/model/ietf/pom.xml b/model/ietf/pom.xml
index 0e958f85c2a7745ba53d20513f2044af7f7b514b..0e2dbe6d6bd145e5934268a4e53a8c825889fdb9 100644 (file)
--- a/model/ietf/pom.xml
+++ b/model/ietf/pom.xml
@@ -11,7 +11,7 @@
 
     <parent>
         <artifactId>model-parent</artifactId>
-        <groupId>org.opendaylight.yangtools.model</groupId>
+        <groupId>org.opendaylight.mdsal.model</groupId>
         <version>0.8.0-SNAPSHOT</version>
     </parent>
 

diff --git a/model/l2-types/pom.xml b/model/l2-types/pom.xml
index 0b27bcd067fdd24707e30a7b9063554f4817010d..9474d76d6a9570f7fcff84d3f8be0dc757b535b0 100644 (file)
--- a/model/l2-types/pom.xml
+++ b/model/l2-types/pom.xml
@@ -11,7 +11,7 @@
 
     <parent>
         <artifactId>model-parent</artifactId>
-        <groupId>org.opendaylight.yangtools.model</groupId>
+        <groupId>org.opendaylight.mdsal.model</groupId>
         <version>0.8.0-SNAPSHOT</version>
     </parent>
 

diff --git a/model/pom.xml b/model/pom.xml
index cc77098d0d383cd59d080e156e7791cc9f7c9c95..a8b731ecdce9a7ccb0aa35d6d4eaeafed63dfae6 100644 (file)
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -10,12 +10,12 @@
 <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-parent</artifactId>
+        <groupId>org.opendaylight.mdsal</groupId>
+        <artifactId>binding-parent</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../common/parent</relativePath>
+        <relativePath>../binding/binding-parent</relativePath>
     </parent>
-    <groupId>org.opendaylight.yangtools.model</groupId>
+    <groupId>org.opendaylight.mdsal.model</groupId>
     <!--<version>0.8.0-SNAPSHOT</version>-->
     <modelVersion>4.0.0</modelVersion>
     <artifactId>model-parent</artifactId>
@@ -30,52 +30,6 @@
         <module>l2-types</module>
     </modules>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate-sources</goal>
-                        </goals>
-                        <configuration>
-                            <yangFilesRootDir>src/main/yang</yangFilesRootDir>
-                            <codeGenerators>
-                                <generator>
-                                    <codeGeneratorClass>
-                                        org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
-                                    </codeGeneratorClass>
-                                    <outputBaseDir>
-                                        target/generated-sources/sal
-                                    </outputBaseDir>
-                                </generator>
-                                <generator>
-                                    <codeGeneratorClass>org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl</codeGeneratorClass>
-                                    <outputBaseDir>target/site/restconf</outputBaseDir>
-                                </generator>
-                                <generator>
-                                    <codeGeneratorClass>org.opendaylight.yangtools.yang.wadl.generator.maven.WadlGenerator</codeGeneratorClass>
-                                    <outputBaseDir>target/site/restconf</outputBaseDir>
-                                </generator>
-                            </codeGenerators>
-                            <inspectDependencies>true</inspectDependencies>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.yangtools</groupId>
-                        <artifactId>maven-sal-api-gen-plugin</artifactId>
-                        <version>0.8.0-SNAPSHOT</version>
-                        <type>jar</type>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

diff --git a/model/yang-ext/pom.xml b/model/yang-ext/pom.xml
index 3cbe1766fd3c7eda4480c989a2f8fc6c6df366b0..753be010fd9c62d40c14921b6cb8f5c017f0a6f2 100644 (file)
--- a/model/yang-ext/pom.xml
+++ b/model/yang-ext/pom.xml
@@ -11,7 +11,7 @@
 
     <parent>
         <artifactId>model-parent</artifactId>
-        <groupId>org.opendaylight.yangtools.model</groupId>
+        <groupId>org.opendaylight.mdsal.model</groupId>
         <version>0.8.0-SNAPSHOT</version>
     </parent>
 

diff --git a/pom.xml b/pom.xml
index 9dc02fe6baeeeeb485b0a1be0eac261a8aeb5533..c2d8b5b7e6423a1efbd9d11d2bc84cc05e3507d8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -33,6 +33,7 @@
       <module>common/parent</module>
       <module>common/artifacts</module>
       <module>binding</module>
+      <module>model</module>
     </modules>
 
     <build>