Merge "Minor fixes in md-sal and config."

diff --git a/opendaylight/config/shutdown-api/pom.xml b/opendaylight/config/shutdown-api/pom.xml
index 0603b2d82d6de4e553ee66e697dcd0a33204dbf7..625ac1425ab4ba5b8db1e3c34ce6d23b8e1553fd 100644 (file)
--- a/opendaylight/config/shutdown-api/pom.xml
+++ b/opendaylight/config/shutdown-api/pom.xml
@@ -32,7 +32,8 @@
                     <instructions>
                         <Export-Package>
                             org.opendaylight.controller.config.shutdown,
-                            org.opendaylight.controller.config.yang.shutdown
+                            org.opendaylight.controller.config.yang.shutdown,
+                            org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.shutdown.rev131218
                         </Export-Package>
                     </instructions>
                 </configuration>

diff --git a/opendaylight/md-sal/sal-binding-config/pom.xml b/opendaylight/md-sal/sal-binding-config/pom.xml
index be031a74100e7cf18a7ff4cbe412332ed87e2920..852314f4d4d93905912cb844a810a6b85bd0a622 100644 (file)
--- a/opendaylight/md-sal/sal-binding-config/pom.xml
+++ b/opendaylight/md-sal/sal-binding-config/pom.xml
@@ -32,6 +32,14 @@
                         </goals>
                         <configuration>
                             <codeGenerators>
+                                <generator>
+                                    <codeGeneratorClass>
+                                        org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
+                                    </codeGeneratorClass>
+                                    <outputBaseDir>
+                                        target/generated-sources/sal
+                                    </outputBaseDir>
+                                </generator>
                                 <generator>
                                     <codeGeneratorClass>
                                         org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator