Updated pom files, added concepts component

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

diff --git a/code-generator/binding-generator-util/pom.xml b/code-generator/binding-generator-util/pom.xml
index 33be499ffc1397224ef5cc98e7b52812278cb402..9d82149800016c2d5ef39dd6613feb15c3316b1b 100644 (file)
--- a/code-generator/binding-generator-util/pom.xml
+++ b/code-generator/binding-generator-util/pom.xml
@@ -42,12 +42,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                    </instructions>
-                </configuration>
             </plugin>
         </plugins>
     </build>

diff --git a/code-generator/pom.xml b/code-generator/pom.xml
index 834a326949939c21a6338bb7c6c4c665cb01e73e..0e18ee615ecf0b093adfa45f5a7b8e1507f9d7fc 100644 (file)
--- a/code-generator/pom.xml
+++ b/code-generator/pom.xml
@@ -30,6 +30,7 @@
 
     <dependencyManagement>
         <dependencies>
+            <!-- Local Dependencies --> 
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>binding-model-api</artifactId>
@@ -65,6 +66,7 @@
                 <artifactId>maven-sal-api-gen-plugin</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <!-- YANG Utilities and Parser -->
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-common</artifactId>
@@ -120,30 +122,8 @@
     </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>
-        </plugins>
         <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>${maven.jar.version}</version>
-                    <configuration>
-                        <archive>
-                            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-                        </archive>
-                    </configuration>
-                </plugin>
+            <plugins> 
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
@@ -186,5 +166,4 @@
             </plugins>
         </pluginManagement>
     </build>
-
 </project>

diff --git a/model/iana/iana-afn-safi/pom.xml b/model/iana/iana-afn-safi/pom.xml
index 407af961c6d9f8814d2b3cd532f1492d38141f84..279daac1d6c2c2fca2df87181faca4bc12d51a3b 100644 (file)
--- a/model/iana/iana-afn-safi/pom.xml
+++ b/model/iana/iana-afn-safi/pom.xml
@@ -9,7 +9,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>iana-afn-safi</artifactId>
-    <version>2013.07.04-SNAPSHOT</version>
+    <version>2013.07.04.0-SNAPSHOT</version>
 
     <build>
         <plugins>

diff --git a/model/iana/iana-if-type/pom.xml b/model/iana/iana-if-type/pom.xml
index 29d8921d639d088478cace38a5fba8fcfaa9e7d2..2f74617ea7402c018acf9c7f0cf6588eb2c3d43d 100644 (file)
--- a/model/iana/iana-if-type/pom.xml
+++ b/model/iana/iana-if-type/pom.xml
@@ -9,7 +9,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>iana-if-type</artifactId>
-    <version>2013.07.04-SNAPSHOT</version>
+    <version>2013.07.04.0-SNAPSHOT</version>
 
     <build>
         <plugins>

diff --git a/model/ietf/ietf-inet-types/pom.xml b/model/ietf/ietf-inet-types/pom.xml
index d206fdbc28f1947055548d70428368589d64b8f0..67ae5075aeb92e363b8e6704d373d83b9ff25ac4 100644 (file)
--- a/model/ietf/ietf-inet-types/pom.xml
+++ b/model/ietf/ietf-inet-types/pom.xml
@@ -9,7 +9,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ietf-inet-types</artifactId>
-    <version>2010.09.24-SNAPSHOT</version>
+    <version>2010.09.24.0-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 

diff --git a/model/ietf/ietf-netconf/pom.xml b/model/ietf/ietf-netconf/pom.xml
new file mode 100644 (file)
index 0000000..9b5af77
--- /dev/null
+++ b/model/ietf/ietf-netconf/pom.xml
@@ -0,0 +1,30 @@
+<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>
+        <artifactId>model-ietf</artifactId>
+        <groupId>org.opendaylight.yangtools.model</groupId>
+        <version>0.5.8-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>ietf-netconf</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <name>${project.artifactId}</name>
+    <description>${project.artifactId}</description>
+
+    <packaging>bundle</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.yangtools.model</groupId>
+            <artifactId>ietf-inet-types</artifactId>
+            <version>2010.09.24-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools.model</groupId>
+            <artifactId>ietf-yang-types</artifactId>
+            <version>2010.09.24-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+</project>

diff --git a/model/ietf/ietf-ted/pom.xml b/model/ietf/ietf-ted/pom.xml
index 42f9941ea376091a6a2ce0b2cfe46249b71ce462..7bc5b934e3407c092a211b87adde83b3b73c9508 100644 (file)
--- a/model/ietf/ietf-ted/pom.xml
+++ b/model/ietf/ietf-ted/pom.xml
@@ -9,7 +9,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ietf-ted</artifactId>
-    <version>2013.07.12-SNAPSHOT</version>
+    <version>2013.07.12.0-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 

diff --git a/model/ietf/ietf-topology-isis/pom.xml b/model/ietf/ietf-topology-isis/pom.xml
index 8774e63ef5ca95854e8af1e7bd1d792f63174afd..56dc6b2b68ad1dd0453a650f4c72bacb418c054a 100644 (file)
--- a/model/ietf/ietf-topology-isis/pom.xml
+++ b/model/ietf/ietf-topology-isis/pom.xml
@@ -9,7 +9,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ietf-topology-isis</artifactId>
-    <version>2013.07.12-SNAPSHOT</version>
+    <version>2013.07.12.0-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 

diff --git a/model/ietf/ietf-topology-l3-unicast-igp/pom.xml b/model/ietf/ietf-topology-l3-unicast-igp/pom.xml
index eac5382eac071ff612eb6abe5df02e9fa6f961d6..231e7673d2f11b8604f1741bf5c1a345d19a755f 100644 (file)
--- a/model/ietf/ietf-topology-l3-unicast-igp/pom.xml
+++ b/model/ietf/ietf-topology-l3-unicast-igp/pom.xml
@@ -9,7 +9,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ietf-topology-l3-unicast-igp</artifactId>
-    <version>2013.07.12-SNAPSHOT</version>
+    <version>2013.07.12.0-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 

diff --git a/model/ietf/ietf-topology-ospf/pom.xml b/model/ietf/ietf-topology-ospf/pom.xml
index b81ffe19fe98b1ebc631ceb2081976f6ffd752f0..417c09080205e1af3d8387d2f5dbab14eb48b1ed 100644 (file)
--- a/model/ietf/ietf-topology-ospf/pom.xml
+++ b/model/ietf/ietf-topology-ospf/pom.xml
@@ -9,7 +9,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ietf-topology-ospf</artifactId>
-    <version>2013.07.12-SNAPSHOT</version>
+    <version>2013.07.12.0-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 

diff --git a/model/ietf/ietf-topology/pom.xml b/model/ietf/ietf-topology/pom.xml
index 38f6f02c82d2f6d6cd4e043d0717a97556284e09..5abaff0407970728a37687afbc7d324062d339c0 100644 (file)
--- a/model/ietf/ietf-topology/pom.xml
+++ b/model/ietf/ietf-topology/pom.xml
@@ -9,7 +9,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ietf-topology</artifactId>
-    <version>2013.07.12-SNAPSHOT</version>
+    <version>2013.07.12.0-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 
@@ -17,12 +17,12 @@
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
-            <version>2010.09.24-SNAPSHOT</version>
+            <version>2010.09.24.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-yang-types</artifactId>
-            <version>2010.09.24-SNAPSHOT</version>
+            <version>2010.09.24.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

diff --git a/model/ietf/ietf-yang-types/pom.xml b/model/ietf/ietf-yang-types/pom.xml
index 7e5656b047f057ff949482bd5e2042720f34381e..0066ab7b01a0907635264f5791af3cf7fa2c8fca 100644 (file)
--- a/model/ietf/ietf-yang-types/pom.xml
+++ b/model/ietf/ietf-yang-types/pom.xml
@@ -9,7 +9,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ietf-yang-types</artifactId>
-    <version>2010.09.24-SNAPSHOT</version>
+    <version>2010.09.24.0-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 

diff --git a/model/ietf/pom.xml b/model/ietf/pom.xml
index b05fdb1afae57f4b51ba00c7e85fdd142ccacb61..d9f61e63bd5cd4d7a5cfa60b9c5ac7ee63a2fb2b 100644 (file)
--- a/model/ietf/pom.xml
+++ b/model/ietf/pom.xml
@@ -18,6 +18,7 @@
         <module>ietf-yang-types</module>
         <module>ietf-ted</module>
         <module>ietf-topology</module>
+        <!--module>ietf-netconf</module -->
         <!-- 
         <module>ietf-topology-l3-unicast-igp</module>
         <module>ietf-topology-isis</module>

diff --git a/model/l2-types/pom.xml b/model/l2-types/pom.xml
index d0e65fbe7eeae5df607cf2aba6f69490cc87dd87..dfb535a1a900865a33e04a3501f6cd4fa1afddaf 100644 (file)
--- a/model/l2-types/pom.xml
+++ b/model/l2-types/pom.xml
@@ -9,7 +9,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>opendaylight-l2-types</artifactId>
-    <version>2013.08.27-SNAPSHOT</version>
+    <version>2013.08.27.0-SNAPSHOT</version>
 
     <build>
         <plugins>

diff --git a/model/pom.xml b/model/pom.xml
index 9a9f755699c0864dd5802def97242dd007bdfb8a..81b813165a151a0be0d303e02b8bc1315151f23d 100644 (file)
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -21,6 +21,7 @@
     </properties>
 
     <modules>
+        <module>yang-ext</module>
         <module>iana</module>
         <module>ietf</module>
         <!-- <module>model-topology-bgp</module> -->
@@ -84,31 +85,6 @@
         </plugins>
         <pluginManagement>
             <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>${maven.jar.version}</version>
-                    <configuration>
-                        <archive>
-                            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-                        </archive>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-bundle-plugin</artifactId>
-                    <version>${maven.bundle.version}</version>
-                    <extensions>true</extensions>
-                    <executions>
-                        <execution>
-                            <id>bundle-manifest</id>
-                            <phase>process-classes</phase>
-                            <goals>
-                                <goal>manifest</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
                 <!--This plugin's configuration is used to store Eclipse 
                     m2e settings only. It has no influence on the Maven build itself. -->
                 <plugin>

diff --git a/model/yang-ext/pom.xml b/model/yang-ext/pom.xml
new file mode 100644 (file)
index 0000000..4612d66
--- /dev/null
+++ b/model/yang-ext/pom.xml
@@ -0,0 +1,144 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+    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.yangtools.model</groupId>\r
+        <artifactId>model-parent</artifactId>\r
+        <version>0.5.8-SNAPSHOT</version>\r
+    </parent>\r
+\r
+    <modelVersion>4.0.0</modelVersion>\r
+    <artifactId>yang-ext</artifactId>\r
+    <version>2013.09.07.0-SNAPSHOT</version>\r
+    <name>${project.artifactId}</name>\r
+    <description>${project.artifactId}</description>\r
+\r
+    <build>\r
+        <plugins>\r
+            <plugin>\r
+                <groupId>org.apache.maven.plugins</groupId>\r
+                <artifactId>maven-jar-plugin</artifactId>\r
+                <version>${maven.jar.version}</version>\r
+                <configuration>\r
+                    <archive>\r
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>\r
+                    </archive>\r
+                </configuration>\r
+            </plugin>\r
+            <plugin>\r
+                <groupId>org.apache.felix</groupId>\r
+                <artifactId>maven-bundle-plugin</artifactId>\r
+                <extensions>true</extensions>\r
+                <configuration>\r
+                    <instructions>\r
+                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>\r
+                    </instructions>\r
+                </configuration>\r
+            </plugin>\r
+            <plugin>\r
+                <groupId>org.opendaylight.yangtools</groupId>\r
+                <artifactId>yang-maven-plugin</artifactId>\r
+                <version>${yang.version}</version>\r
+                <executions>\r
+                    <execution>\r
+                        <goals>\r
+                            <goal>generate-sources</goal>\r
+                        </goals>\r
+                        <configuration>\r
+                            <yangFilesRootDir>src/main/yang</yangFilesRootDir>\r
+                            <codeGenerators>\r
+                                <generator>\r
+                                    <codeGeneratorClass>\r
+                                        org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl\r
+                                    </codeGeneratorClass>\r
+                                    <outputBaseDir>\r
+                                        target/generated-sources/sal\r
+                                    </outputBaseDir>\r
+                                </generator>\r
+                            </codeGenerators>\r
+                            <inspectDependencies>true</inspectDependencies>\r
+                        </configuration>\r
+                    </execution>\r
+                </executions>\r
+                <dependencies>\r
+                    <dependency>\r
+                        <groupId>org.opendaylight.yangtools</groupId>\r
+                        <artifactId>maven-sal-api-gen-plugin</artifactId>\r
+                        <version>0.5.8-SNAPSHOT</version>\r
+                        <type>jar</type>\r
+                    </dependency>\r
+                </dependencies>\r
+            </plugin>\r
+            <plugin>\r
+                <groupId>org.codehaus.mojo</groupId>\r
+                <artifactId>build-helper-maven-plugin</artifactId>\r
+                <version>1.7</version>\r
+                <executions>\r
+                    <execution>\r
+                        <phase>generate-sources</phase>\r
+                        <goals>\r
+                            <goal>add-source</goal>\r
+                        </goals>\r
+                        <configuration>\r
+                            <sources>\r
+                                <source>target/generated-sources/sal</source>\r
+                            </sources>\r
+                        </configuration>\r
+                    </execution>\r
+                </executions>\r
+            </plugin>\r
+        </plugins>\r
+        <pluginManagement>\r
+            <plugins>\r
+                <!--This plugin's configuration is used to store Eclipse \r
+                    m2e settings only. It has no influence on the Maven build itself. -->\r
+                <plugin>\r
+                    <groupId>org.eclipse.m2e</groupId>\r
+                    <artifactId>lifecycle-mapping</artifactId>\r
+                    <version>1.0.0</version>\r
+                    <configuration>\r
+                        <lifecycleMappingMetadata>\r
+                            <pluginExecutions>\r
+                                <pluginExecution>\r
+                                    <pluginExecutionFilter>\r
+                                        <groupId>\r
+                                            org.opendaylight.yangtools\r
+                                        </groupId>\r
+                                        <artifactId>\r
+                                            yang-maven-plugin\r
+                                        </artifactId>\r
+                                        <versionRange>\r
+                                            [0.5,)\r
+                                        </versionRange>\r
+                                        <goals>\r
+                                            <goal>\r
+                                                generate-sources\r
+                                            </goal>\r
+                                        </goals>\r
+                                    </pluginExecutionFilter>\r
+                                    <action>\r
+                                        <ignore></ignore>\r
+                                    </action>\r
+                                </pluginExecution>\r
+                            </pluginExecutions>\r
+                        </lifecycleMappingMetadata>\r
+                    </configuration>\r
+                </plugin>\r
+            </plugins>\r
+        </pluginManagement>\r
+    </build>\r
+\r
+    <dependencies>\r
+        <dependency>\r
+            <groupId>org.opendaylight.yangtools</groupId>\r
+            <artifactId>yang-binding</artifactId>\r
+            <version>${yang.version}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.opendaylight.yangtools</groupId>\r
+            <artifactId>yang-common</artifactId>\r
+            <version>${yang.version}</version>\r
+        </dependency>\r
+    </dependencies>\r
+\r
+</project>\r

diff --git a/model/yang-ext/src/main/yang/yang-ext.yang b/model/yang-ext/src/main/yang/yang-ext.yang
new file mode 100644 (file)
index 0000000..9677a73
--- /dev/null
+++ b/model/yang-ext/src/main/yang/yang-ext.yang
@@ -0,0 +1,72 @@
+module yang-ext {\r
+    yang-version 1;\r
+    namespace "urn:opendaylight:yang:extension:yang-ext";\r
+    prefix "ext";\r
+    \r
+    contact "Anton Tkacik <ttkacik@cisco.com>";\r
+\r
+    revision "2013-07-09" {\r
+        description "";\r
+    }\r
+\r
+    // Augmentation name\r
+\r
+    extension "augment-identifier" {\r
+        description \r
+           "YANG language extension which assigns an identifier to \r
+            augmentation. Augment identifier is used to identify\r
+            specific augment statement by name. \r
+\r
+            The identifier syntax is defined formally defined by the rule\r
+            'identifier' in Section 12 of RFC 6020.\r
+\r
+            All augment identifiers defined in a namespace MUST be unique.\r
+            The namespace of augment identifiers is shared by module and\r
+            its submodules. \r
+            ";\r
+            /*\r
+                Discussion:\r
+                This extension allows for ease of development / debug\r
+                of YANG modules and it is suitable for code generation,\r
+                where each augment statement is nicely identified by\r
+                unique name instead of combination of augment target\r
+                and when condition. \r
+            */\r
+        argument "identifier";\r
+    }\r
+\r
+\r
+    // Context-aware RPCs\r
+\r
+    grouping rpc-context-ref {\r
+        description \r
+           "A reference to RPC context.";\r
+        leaf context-instance {\r
+            type instance-identifier;\r
+            description "Pointer to the context. ";\r
+        }\r
+    }\r
+\r
+    extension "rpc-context-instance" {\r
+        description\r
+           "YANG language extension which defines enclosing (parent) \r
+            schema node as referencable context for RPCs.\r
+\r
+            The argument is identity which is used to identify RPC context\r
+            type.";\r
+\r
+        argument "context-type";\r
+    }\r
+\r
+    extension "context-reference" {\r
+        argument "context-type";\r
+    }\r
+\r
+    extension "context-instance" {\r
+        argument "context-type";\r
+    }\r
+    \r
+    extension "instance-target" {\r
+       argument "path";\r
+    }\r
+}
\ No newline at end of file

diff --git a/yang/yang-binding/pom.xml b/yang/yang-binding/pom.xml
index b70f942d3ff02751ce5c117e3413c407e20fcf4f..2f6bdbbb28ffacae2f71fbe5f6fa5d7a2b3e95f2 100644 (file)
--- a/yang/yang-binding/pom.xml
+++ b/yang/yang-binding/pom.xml
@@ -11,30 +11,4 @@
     <artifactId>yang-binding</artifactId>\r
     <name>${project.artifactId}</name>\r
     <description>Java binding for YANG</description>\r
-\r
-    <build>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-jar-plugin</artifactId>\r
-                <version>${maven.jar.version}</version>\r
-                <configuration>\r
-                    <archive>\r
-                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>\r
-                    </archive>\r
-                </configuration>\r
-            </plugin>\r
-            <plugin>\r
-                <groupId>org.apache.felix</groupId>\r
-                <artifactId>maven-bundle-plugin</artifactId>\r
-                <extensions>true</extensions>\r
-                <configuration>\r
-                    <instructions>\r
-                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>\r
-                    </instructions>\r
-                </configuration>\r
-            </plugin>\r
-        </plugins>\r
-    </build>\r
-\r
 </project>\r