Cleanup yang-data-impl antlr configuration

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

Change-Id: I5c6ad385196f237b5a5eae110948cbf2ae2792e5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 598731773fb790c059d300266b2732278b99c11a)

diff --git a/yang/yang-data-impl/pom.xml b/yang/yang-data-impl/pom.xml
index b7586be9fc335c618d4ce169c49f015acbea79f4..3e8d3362a9723bfcc24090389251e7cc51a82317 100644 (file)
--- a/yang/yang-data-impl/pom.xml
+++ b/yang/yang-data-impl/pom.xml
@@ -32,7 +32,7 @@
                 </executions>
                 <configuration>
                     <sourceDirectory>${project.basedir}/src/main/antlr</sourceDirectory>
-                    <outputDirectory>${project.build.directory}/generated-sources/parser/org/opendaylight/yangtools/yang/data/impl/leafref</outputDirectory>
+                    <outputDirectory>${project.build.directory}/generated-sources/parser</outputDirectory>
                     <visitor>true</visitor>
                     <listener>true</listener>
                 </configuration>

diff --git a/yang/yang-data-impl/src/main/antlr/LeafRefPathLexer.g4 b/yang/yang-data-impl/src/main/antlr/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPathLexer.g4
similarity index 79%
rename from yang/yang-data-impl/src/main/antlr/LeafRefPathLexer.g4
rename to yang/yang-data-impl/src/main/antlr/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPathLexer.g4
index 3ba4c07ddfff86ad45d5667c30c9b9aec959d6fb..3d63ee9eeaa42e8e3e55fc99d7bff30711fb639e 100644 (file)
--- a/yang/yang-data-impl/src/main/antlr/LeafRefPathLexer.g4
+++ b/yang/yang-data-impl/src/main/antlr/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPathLexer.g4
@@ -1,9 +1,5 @@
 lexer grammar LeafRefPathLexer;
 
-@header {
-package org.opendaylight.yangtools.yang.data.impl.leafref;
-}
-
 COLON : ':' ;
 SLASH : '/' ;
 DOTS : '..' ;

diff --git a/yang/yang-data-impl/src/main/antlr/LeafRefPathParser.g4 b/yang/yang-data-impl/src/main/antlr/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPathParser.g4
similarity index 87%
rename from yang/yang-data-impl/src/main/antlr/LeafRefPathParser.g4
rename to yang/yang-data-impl/src/main/antlr/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPathParser.g4
index 48c5e644453c57f646fcf85ad62990628622cd67..ec60a4cc32150afbbc40a00377ac2b2d3cb31145 100644 (file)
--- a/yang/yang-data-impl/src/main/antlr/LeafRefPathParser.g4
+++ b/yang/yang-data-impl/src/main/antlr/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPathParser.g4
@@ -1,11 +1,7 @@
 parser grammar LeafRefPathParser;
 
-@header {
-package org.opendaylight.yangtools.yang.data.impl.leafref;
-}
-
-options{
- tokenVocab = LeafRefPathLexer;
+options {
+    tokenVocab = LeafRefPathLexer;
 }
 
 path_arg : absolute_path | relative_path;