From dff8181ffc7175b74be00ee6f983a9838d3dce89 Mon Sep 17 00:00:00 2001
From: Tony Tkacik <ttkacik@cisco.com>
Date: Fri, 21 Aug 2015 12:38:02 +0200
Subject: [PATCH] Migrated models to use MD-SAL provided code.

Change-Id: Ia92933803e133604b5a54b1b2c82210480ae3ffc
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
---
 model/iana/iana-afn-safi/pom.xml              |  2 +-
 model/iana/iana-if-type-2014-05-08/pom.xml    |  2 +-
 model/iana/iana-if-type/pom.xml               |  2 +-
 model/iana/pom.xml                            |  4 +-
 model/ietf/ietf-inet-types/pom.xml            |  2 +-
 model/ietf/ietf-interfaces/pom.xml            |  2 +-
 model/ietf/ietf-restconf/pom.xml              |  4 +-
 model/ietf/ietf-ted/pom.xml                   |  2 +-
 model/ietf/ietf-topology-isis/pom.xml         |  2 +-
 .../ietf/ietf-topology-l3-unicast-igp/pom.xml |  2 +-
 model/ietf/ietf-topology-ospf/pom.xml         |  2 +-
 model/ietf/ietf-topology/pom.xml              |  2 +-
 model/ietf/ietf-yang-types-20130715/pom.xml   |  2 +-
 model/ietf/ietf-yang-types/pom.xml            |  2 +-
 model/ietf/pom.xml                            |  2 +-
 model/l2-types/pom.xml                        |  2 +-
 model/pom.xml                                 | 54 ++-----------------
 model/yang-ext/pom.xml                        |  2 +-
 pom.xml                                       |  1 +
 19 files changed, 24 insertions(+), 69 deletions(-)

diff --git a/model/iana/iana-afn-safi/pom.xml b/model/iana/iana-afn-safi/pom.xml
index de82000313..aaa5fe00bb 100644
--- 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 3815db3fc5..f324adde3a 100644
--- 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 fb011b8145..71581be068 100644
--- 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 843c084db3..3c03f15112 100644
--- 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 cad8508620..c3774e6ea5 100644
--- 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 ac561979dc..86a033354b 100644
--- 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 f25ffe7946..26aa887f2c 100644
--- 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 f060fe23f5..d4630038b1 100644
--- 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 9063160570..1673df8b54 100644
--- 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 071d5aadb2..614bc218e0 100644
--- 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 7344aab89b..0b2f563503 100644
--- 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 1954710a68..d9d8bf2da2 100644
--- 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 9d6c5eeba4..de541938aa 100644
--- 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 9c20f89435..77b8d89574 100644
--- 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 0e958f85c2..0e2dbe6d6b 100644
--- 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 0b27bcd067..9474d76d6a 100644
--- 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 cc77098d0d..a8b731ecdc 100644
--- 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 3cbe1766fd..753be010fd 100644
--- 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 9dc02fe6ba..c2d8b5b7e6 100644
--- 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>
-- 
2.36.6