Cleanup yang-xpath-impl antlr configuration

This fixes up a long-standing issue with how antlr is configured,
fixing javadoc plugin interaction in the process.

Change-Id: I4c94aa50c44dc5fc6268d94739e50ef27e868cde
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 7c2f7b53352ed27c745e661579132eea66f4c25e)

diff --git a/yang/yang-xpath-impl/pom.xml b/yang/yang-xpath-impl/pom.xml
index 2fb91aa8ca5e07629fe961debb40bf0ea4680139..1332f2e47d405ce51cf8cde6ac3ac564177d4168 100644 (file)
--- a/yang/yang-xpath-impl/pom.xml
+++ b/yang/yang-xpath-impl/pom.xml
@@ -67,8 +67,8 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <sourceDirectory>src/main/antlr</sourceDirectory>
-                    <outputDirectory>${project.build.directory}/generated-sources/antlr/org/opendaylight/yangtools/yang/xpath/impl</outputDirectory>
+                    <sourceDirectory>${project.basedir}/src/main/antlr</sourceDirectory>
+                    <outputDirectory>${project.build.directory}/generated-sources/antlr</outputDirectory>
                     <visitor>false</visitor>
                     <listener>false</listener>
                 </configuration>

diff --git a/yang/yang-xpath-impl/src/main/antlr/instanceIdentifier.g4 b/yang/yang-xpath-impl/src/main/antlr/org/opendaylight/yangtools/yang/xpath/impl/instanceIdentifier.g4
similarity index 96%
rename from yang/yang-xpath-impl/src/main/antlr/instanceIdentifier.g4
rename to yang/yang-xpath-impl/src/main/antlr/org/opendaylight/yangtools/yang/xpath/impl/instanceIdentifier.g4
index eea2ee43ec1d6d3c4b2ed6ed6574ba94c2d417a3..200130599be60a5f788315d8d692fb32859ae4f4 100644 (file)
--- a/yang/yang-xpath-impl/src/main/antlr/instanceIdentifier.g4
+++ b/yang/yang-xpath-impl/src/main/antlr/org/opendaylight/yangtools/yang/xpath/impl/instanceIdentifier.g4
@@ -1,9 +1,5 @@
 grammar instanceIdentifier;
 
-@header {
-package org.opendaylight.yangtools.yang.xpath.impl;
-}
-
 /*
  * YANG 1.1 instance-identifier grammar, as defined in
  * https://tools.ietf.org/html/rfc7950#section-9.13

diff --git a/yang/yang-xpath-impl/src/main/antlr/xpath.g4 b/yang/yang-xpath-impl/src/main/antlr/org/opendaylight/yangtools/yang/xpath/impl/xpath.g4
similarity index 98%
rename from yang/yang-xpath-impl/src/main/antlr/xpath.g4
rename to yang/yang-xpath-impl/src/main/antlr/org/opendaylight/yangtools/yang/xpath/impl/xpath.g4
index 1b948673a49af8491ab48283bd73b7ea8bf8a55e..4bf327cfe167085ddba680497d03ac6296d7436a 100644 (file)
--- a/yang/yang-xpath-impl/src/main/antlr/xpath.g4
+++ b/yang/yang-xpath-impl/src/main/antlr/org/opendaylight/yangtools/yang/xpath/impl/xpath.g4
@@ -1,9 +1,5 @@
 grammar xpath;
 
-@header {
-package org.opendaylight.yangtools.yang.xpath.impl;
-}
-
 /*
 XPath 1.0 grammar. Should conform to the official spec at
 http://www.w3.org/TR/1999/REC-xpath-19991116. The grammar