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>
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
\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
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
\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
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
\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
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
\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
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
\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
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
<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>
<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>
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>
<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>
<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>
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
- <version>${yangtools.version}</version>
+ <version>${yang.version}</version>
<executions>
<execution>
<goals>
<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>
<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>
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
- <version>${yangtools.version}</version>
+ <version>${yang.version}</version>
<executions>
<execution>
<goals>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<dependencies>
<dependency>
- <groupId>org.opendaylight.controller</groupId>
+ <groupId>org.opendaylight.yangtools</groupId>
<artifactId>ietf-inet-types</artifactId>
<version>2010.09.24-SNAPSHOT</version>
</dependency>
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>
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
- <version>${yangtools.version}</version>
+ <version>${yang.version}</version>
<executions>
<execution>
<goals>
</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>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
- org.opendaylight.controller
+ org.opendaylight.yangtools
</groupId>
<artifactId>
yang-maven-plugin
<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>
<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>
</reporting>
</project>
+
--- /dev/null
+<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>
+
\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
\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
\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
\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
\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
<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>
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
- <version>0.5.5-SNAPSHOT</version>
+ <version>${yang.version}</version>
<executions>
<execution>
<goals>
yang-maven-plugin
</artifactId>
<versionRange>
- [0.5.5,)
+ [0.5.6,)
</versionRange>
<goals>
<goal>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
\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
\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
<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>
\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
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;
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());
}
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();