From: Michael Vorburger <vorburger@redhat.com>
Date: Tue, 1 Nov 2016 20:44:28 +0000 (+0100)
Subject: target-ide/ support by resourceBaseDir using ${project.build.directory}
X-Git-Tag: release/carbon~403
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=02342ea8755cd02a50295c0e412a542024761b9c

target-ide/ support by resourceBaseDir using ${project.build.directory}

without explicitly setting this,
org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
defaults to hard-coded target/generated-sources/spi for
META-INF/services/org.opendaylight.yangtools.yang.binding.YangModelBindingProvider
instead of target-ide.

Minor: Also add target-ide/ to .gitignore of this git repository.

Change-Id: I330646f5a4e71cda021697410d452298a4127f4f
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
---

diff --git a/opendaylight/md-sal/sal-binding-config/pom.xml b/opendaylight/md-sal/sal-binding-config/pom.xml
index a182f9279a..7112344e2c 100644
--- a/opendaylight/md-sal/sal-binding-config/pom.xml
+++ b/opendaylight/md-sal/sal-binding-config/pom.xml
@@ -66,6 +66,7 @@
                 <generator>
                   <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
                   <outputBaseDir>${salGeneratorPath}</outputBaseDir>
+                  <resourceBaseDir>${project.build.directory}/generated-sources/spi</resourceBaseDir>
                 </generator>
                 <generator>
                   <codeGeneratorClass>org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator</codeGeneratorClass>
diff --git a/opendaylight/md-sal/sal-dom-config/pom.xml b/opendaylight/md-sal/sal-dom-config/pom.xml
index 4a5625e309..0bfc3205fe 100644
--- a/opendaylight/md-sal/sal-dom-config/pom.xml
+++ b/opendaylight/md-sal/sal-dom-config/pom.xml
@@ -63,6 +63,7 @@
                 <generator>
                   <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
                   <outputBaseDir>${salGeneratorPath}</outputBaseDir>
+                  <resourceBaseDir>${project.build.directory}/generated-sources/spi</resourceBaseDir>
                 </generator>
                 <generator>
                   <codeGeneratorClass>org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator</codeGeneratorClass>