Merge "Changed logging level from debug to trace in YangParserListenerImpl."

diff --git a/pom.xml b/pom.xml
index 3937f34a668c10ea992c3961567f6375dc1cfff9..932f08d1afbfd6ac4c45a5d0780e691560ddc1d8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,108 +1,193 @@
-<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">
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>yangtools</artifactId>
-    <groupId>org.opendaylight.yangtools</groupId>
-    <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>
-    </properties>
-
-    <modules>
-       <module>yang</module>
-        <module>code-generator</module>
-        <module>model</module>
-    </modules>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>4.10</version>
-                <scope>test</scope>
-                <optional>true</optional>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>1.7.2</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <distributionManagement>
-        <!-- OpenDayLight Released artifact -->
-        <repository>
-            <id>opendaylight-release</id>
-            <url>${nexusproxy}/repositories/opendaylight.release/</url>
-        </repository>
-        <!-- OpenDayLight Snapshot artifact -->
-        <snapshotRepository>
-            <id>opendaylight-snapshot</id>
-            <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
-        </snapshotRepository>
-        <site>
-            <id>${project.artifactId}-site</id>
-            <url>./</url>
-        </site>
-    </distributionManagement>
-
-    <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>
+<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
+    <modelVersion>4.0.0</modelVersion>\r
+    <artifactId>yangtools</artifactId>\r
+    <groupId>org.opendaylight.yangtools</groupId>\r
+    <version>0.5-SNAPSHOT</version>\r
+    <packaging>pom</packaging>\r
+\r
+    <properties>\r
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
+        <slf4j.version>1.7.2</slf4j.version>\r
+        <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>\r
+        <yang.version>0.5.7-SNAPSHOT</yang.version>\r
+        <maven.bundle.version>2.4.0</maven.bundle.version>\r
+    </properties>\r
+\r
+    <modules>\r
+        <module>yang</module>\r
+        <module>code-generator</module>\r
+        <module>model</module>\r
+    </modules>\r
+\r
+    <pluginRepositories>\r
+        <!-- Maven repo2 mirror -->\r
+        <!-- http://repo2.maven.org/maven2 -->\r
+        <pluginRepository>\r
+            <id>central2</id>\r
+            <name>central2</name>\r
+            <url>${nexusproxy}/repositories/central2/</url>\r
+        </pluginRepository>\r
+        <!-- Maven repo1 mirror -->\r
+        <!-- http://repo1.maven.org/maven2 -->\r
+        <pluginRepository>\r
+            <id>central</id>\r
+            <name>central</name>\r
+            <url>${nexusproxy}/repositories/central/</url>\r
+        </pluginRepository>\r
+    </pluginRepositories>\r
+\r
+\r
+    <repositories>\r
+        <!-- EBR release -->\r
+        <!-- http://repository.springsource.com/maven/bundles/release -->\r
+        <repository>\r
+            <id>ebr-bundles-release</id>\r
+            <name>ebr-bundles-release</name>\r
+            <url>${nexusproxy}/repositories/ebr-bundles-release/</url>\r
+        </repository>\r
+        <!-- EBR external -->\r
+        <!-- http://repository.springsource.com/maven/bundles/external -->\r
+        <repository>\r
+            <id>ebr-bundles-external</id>\r
+            <name>ebr-bundles-external</name>\r
+            <url>${nexusproxy}/repositories/ebr-bundles-external/</url>\r
+        </repository>\r
+        <!-- Maven repo2 mirror -->\r
+        <!-- http://repo2.maven.org/maven2 -->\r
+        <repository>\r
+            <id>central2</id>\r
+            <name>central2</name>\r
+            <url>${nexusproxy}/repositories/central2/</url>\r
+        </repository>\r
+        <!-- Maven repo1 mirror -->\r
+        <!-- http://repo1.maven.org/maven2 -->\r
+        <repository>\r
+            <id>central</id>\r
+            <name>central</name>\r
+            <url>${nexusproxy}/repositories/central/</url>\r
+        </repository>\r
+        <!-- Pax mirror -->\r
+        <!-- https://oss.sonatype.org/content/repositories/ops4j-releases -->\r
+        <repository>\r
+            <id>ops4j-releases</id>\r
+            <name>ops4j-releases</name>\r
+            <url>${nexusproxy}/repositories/ops4j-releases/</url>\r
+        </repository>\r
+        <!-- Third Packages hosted in local maven because not available in \r
+            other places -->\r
+        <repository>\r
+            <id>thirdparty</id>\r
+            <name>thirdparty</name>\r
+            <url>${nexusproxy}/repositories/thirdparty/</url>\r
+        </repository>\r
+        <!-- Jboss mirror -->\r
+        <!-- https://repository.jboss.org/nexus/content/repositories/releases -->\r
+        <repository>\r
+            <id>jboss.releases</id>\r
+            <name>jboss.releases</name>\r
+            <url>${nexusproxy}/repositories/jboss.releases/</url>\r
+        </repository>\r
+        <!-- OpenDayLight Released artifact -->\r
+        <repository>\r
+            <id>opendaylight-release</id>\r
+            <name>opendaylight-release</name>\r
+            <url>${nexusproxy}/repositories/opendaylight.release/</url>\r
+        </repository>\r
+        <!-- OpenDayLight Snapshot artifact -->\r
+        <repository>\r
+            <id>opendaylight-snapshot</id>\r
+            <name>opendaylight-snapshot</name>\r
+            <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>\r
+        </repository>\r
+    </repositories>\r
+\r
+\r
+    <dependencyManagement>\r
+        <dependencies>\r
+            <dependency>\r
+                <groupId>junit</groupId>\r
+                <artifactId>junit</artifactId>\r
+                <version>4.10</version>\r
+                <scope>test</scope>\r
+                <optional>true</optional>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>org.slf4j</groupId>\r
+                <artifactId>slf4j-api</artifactId>\r
+                <version>1.7.2</version>\r
+            </dependency>\r
+        </dependencies>\r
+    </dependencyManagement>\r
+\r
+    <distributionManagement>\r
+        <!-- OpenDayLight Released artifact -->\r
+        <repository>\r
+            <id>opendaylight-release</id>\r
+            <url>${nexusproxy}/repositories/opendaylight.release/</url>\r
+        </repository>\r
+        <!-- OpenDayLight Snapshot artifact -->\r
+        <snapshotRepository>\r
+            <id>opendaylight-snapshot</id>\r
+            <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>\r
+        </snapshotRepository>\r
+        <site>\r
+            <id>${project.artifactId}-site</id>\r
+            <url>./</url>\r
+        </site>\r
+    </distributionManagement>\r
+\r
+    <build>\r
+        <plugins>\r
+            <plugin>\r
+                <groupId>org.apache.maven.plugins</groupId>\r
+                <artifactId>maven-compiler-plugin</artifactId>\r
+                <version>2.0</version>\r
+                <inherited>true</inherited>\r
+                <configuration>\r
+                    <source>1.7</source>\r
+                    <target>1.7</target>\r
+                </configuration>\r
+            </plugin>\r
+            <plugin>\r
+                <groupId>org.apache.maven.plugins</groupId>\r
+                <artifactId>maven-javadoc-plugin</artifactId>\r
+                <version>2.9.1</version>\r
+                <configuration>\r
+                    <stylesheet>maven</stylesheet>\r
+                </configuration>\r
+                <executions>\r
+                    <execution>\r
+                        <goals>\r
+                            <goal>aggregate</goal>\r
+                        </goals>\r
+                        <phase>site</phase>\r
+                    </execution>\r
+                </executions>\r
+            </plugin>\r
+        </plugins>\r
+    </build>\r
+\r
+    <reporting>\r
+        <plugins>\r
+            <plugin>\r
+                <groupId>org.codehaus.mojo</groupId>\r
+                <artifactId>findbugs-maven-plugin</artifactId>\r
+                <version>2.4.0</version>\r
+                <configuration>\r
+                    <effort>Max</effort>\r
+                    <threshold>Low</threshold>\r
+                    <goal>site</goal>\r
+                </configuration>\r
+            </plugin>\r
+            <plugin>\r
+                <groupId>org.codehaus.mojo</groupId>\r
+                <artifactId>jdepend-maven-plugin</artifactId>\r
+                <version>2.0-beta-2</version>\r
+            </plugin>\r
+        </plugins>\r
+    </reporting>\r
+\r
+</project>\r
 

diff --git a/yang/yang-binding/pom.xml b/yang/yang-binding/pom.xml
index 4d389d4c28413f5fc693604a264a9a3e5b088220..28eb9532241f793836b43c9995d80289f9249278 100644 (file)
--- a/yang/yang-binding/pom.xml
+++ b/yang/yang-binding/pom.xml
@@ -1,15 +1,32 @@
 <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
+       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</groupId>\r
-        <artifactId>yang</artifactId>\r
-        <version>0.5.7-SNAPSHOT</version>\r
-    </parent>\r
+       <parent>\r
+               <groupId>org.opendaylight.yangtools</groupId>\r
+               <artifactId>yang</artifactId>\r
+               <version>0.5.7-SNAPSHOT</version>\r
+       </parent>\r
+       <packaging>bundle</packaging>\r
+       <modelVersion>4.0.0</modelVersion>\r
+       <artifactId>yang-binding</artifactId>\r
+       <name>${project.artifactId}</name>\r
+       <description>Java binding for YANG</description>\r
 \r
-    <modelVersion>4.0.0</modelVersion>\r
-    <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.felix</groupId>\r
+                               <artifactId>maven-bundle-plugin</artifactId>\r
+                               <version>${maven.bundle.version}</version>\r
+                               <extensions>true</extensions>\r
+                               <configuration>\r
+                                       <instructions>\r
+                                               <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>\r
+                                       </instructions>\r
+                                       <manifestLocation>${project.basedir}/META-INF</manifestLocation>\r
+                               </configuration>\r
+                       </plugin>\r
+               </plugins>\r
+       </build>\r
 </project>\r

diff --git a/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/NotificationListener.java b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/NotificationListener.java
index 8c87adb578887395ed13c99ec550bbf513840db9..fbf27e4b8f0fb2f3d605b132b5a690b8b0ac2f19 100644 (file)
--- a/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/NotificationListener.java
+++ b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/NotificationListener.java
@@ -10,8 +10,6 @@ package org.opendaylight.yangtools.yang.binding;
 /**\r
  * Marker interface for generated notification listener interfaces\r
  *\r
- *\r
- *\r
  */\r
 public interface NotificationListener {\r
 \r

diff --git a/yang/yang-common/pom.xml b/yang/yang-common/pom.xml
index 00d8e3bee733373af0d48a9d5971c27f589630dd..0cbdf56482c354e33e3661f3ba11545fd7582e98 100644 (file)
--- a/yang/yang-common/pom.xml
+++ b/yang/yang-common/pom.xml
@@ -1,22 +1,40 @@
 <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
+       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</groupId>\r
-        <artifactId>yang</artifactId>\r
-        <version>0.5.7-SNAPSHOT</version>\r
-    </parent>\r
+       <parent>\r
+               <groupId>org.opendaylight.yangtools</groupId>\r
+               <artifactId>yang</artifactId>\r
+               <version>0.5.7-SNAPSHOT</version>\r
+       </parent>\r
+       <packaging>bundle</packaging>\r
 \r
-    <modelVersion>4.0.0</modelVersion>\r
-    <artifactId>yang-common</artifactId>\r
-    <name>${project.artifactId}</name>\r
-    <description>${project.artifactId}</description>\r
+       <modelVersion>4.0.0</modelVersion>\r
+       <artifactId>yang-common</artifactId>\r
+       <name>${project.artifactId}</name>\r
+       <description>${project.artifactId}</description>\r
 \r
-    <dependencies>\r
-        <dependency>\r
-            <groupId>org.slf4j</groupId>\r
-            <artifactId>slf4j-api</artifactId>\r
-        </dependency>\r
-    </dependencies>\r
+       <dependencies>\r
+               <dependency>\r
+                       <groupId>org.slf4j</groupId>\r
+                       <artifactId>slf4j-api</artifactId>\r
+               </dependency>\r
+       </dependencies>\r
 \r
+\r
+       <build>\r
+               <plugins>\r
+                       <plugin>\r
+                               <groupId>org.apache.felix</groupId>\r
+                               <artifactId>maven-bundle-plugin</artifactId>\r
+                               <version>${maven.bundle.version}</version>\r
+                               <extensions>true</extensions>\r
+                               <configuration>\r
+                                       <instructions>\r
+                                               <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>\r
+                                       </instructions>\r
+                                       <manifestLocation>${project.basedir}/META-INF</manifestLocation>\r
+                               </configuration>\r
+                       </plugin>\r
+               </plugins>\r
+       </build>\r
 </project>\r