From bd97f2b4c1592f0584665f90868348ff9fd74e63 Mon Sep 17 00:00:00 2001
From: Tony Tkacik <ttkacik@cisco.com>
Date: Wed, 26 Aug 2015 18:18:23 +0200
Subject: [PATCH] Fixed Export-Package sections after rename.

Change-Id: I6b7fc00f53167d398bac35010fb03a81aa1f5912
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
---
 binding/mdsal-binding-dom-adapter/pom.xml        | 12 ------------
 binding/mdsal-binding-dom-codec/pom.xml          |  1 +
 binding/mdsal-binding-generator-api/pom.xml      |  5 -----
 binding/mdsal-binding-java-api-generator/pom.xml |  9 ---------
 dom/mdsal-dom-broker/pom.xml                     | 16 +---------------
 dom/mdsal-dom-inmemory-datastore/pom.xml         | 10 +---------
 6 files changed, 3 insertions(+), 50 deletions(-)

diff --git a/binding/mdsal-binding-dom-adapter/pom.xml b/binding/mdsal-binding-dom-adapter/pom.xml
index fcb7802206..166268ca88 100644
--- a/binding/mdsal-binding-dom-adapter/pom.xml
+++ b/binding/mdsal-binding-dom-adapter/pom.xml
@@ -99,18 +99,6 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-            <Export-Package>
-                            org.opendaylight.mdsal.sal.binding.impl,
-                            org.opendaylight.mdsal.md.sal.binding.impl,
-                            org.opendaylight.mdsal.md.sal.binding.compat,
-                            org.opendaylight.mdsal.md.sal.binding.spi,
-                            org.opendaylight.mdsal.sal.binding.codegen.impl,
-            </Export-Package>
-          </instructions>
-        </configuration>
       </plugin>
 
       <plugin>
diff --git a/binding/mdsal-binding-dom-codec/pom.xml b/binding/mdsal-binding-dom-codec/pom.xml
index de0bbc9844..8251719759 100644
--- a/binding/mdsal-binding-dom-codec/pom.xml
+++ b/binding/mdsal-binding-dom-codec/pom.xml
@@ -77,6 +77,7 @@
                     <instructions>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
                         <Export-Package>
+                            org.opendaylight.mdsal.binding.dom.codec.*,
                             org.opendaylight.yangtools.binding.data.codec.*,
                             org.opendaylight.yangtools.binding.data.codec.gen.impl.*,
                             org.opendaylight.yangtools.binding.data.codec.impl.*,
diff --git a/binding/mdsal-binding-generator-api/pom.xml b/binding/mdsal-binding-generator-api/pom.xml
index b6ce1ed3e8..c5abb68b7a 100644
--- a/binding/mdsal-binding-generator-api/pom.xml
+++ b/binding/mdsal-binding-generator-api/pom.xml
@@ -38,11 +38,6 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                    </instructions>
-                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/binding/mdsal-binding-java-api-generator/pom.xml b/binding/mdsal-binding-java-api-generator/pom.xml
index f10ae14054..45c469a660 100644
--- a/binding/mdsal-binding-java-api-generator/pom.xml
+++ b/binding/mdsal-binding-java-api-generator/pom.xml
@@ -41,15 +41,6 @@
                 <groupId>org.eclipse.xtend</groupId>
                 <artifactId>xtend-maven-plugin</artifactId>
             </plugin>
-<!--      <plugin>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>enforce</id>
-            <phase>none</phase>
-          </execution>
-        </executions>
-      </plugin> -->
         </plugins>
     </build>
 
diff --git a/dom/mdsal-dom-broker/pom.xml b/dom/mdsal-dom-broker/pom.xml
index 0b26401961..93ca728123 100644
--- a/dom/mdsal-dom-broker/pom.xml
+++ b/dom/mdsal-dom-broker/pom.xml
@@ -76,21 +76,7 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-            <Bundle-Activator>org.opendaylight.mdsal.sal.dom.broker.osgi.SchemaServiceActivator</Bundle-Activator>
-            <Export-Package>
-                            <!--  Legacy code -->
-                            org.opendaylight.mdsal.sal.dom.broker,
-                            org.opendaylight.mdsal.sal.dom.broker.impl,
-                            org.opendaylight.mdsal.sal.dom.broker.osgi,
-                            org.opendaylight.mdsal.sal.dom.broker.util,
-                            org.opendaylight.mdsal.sal.dom.broker.spi,
-                            <!--sal.broker.impl is exported for sal-netconf-connector to use SchemaAwareRpcRegistry.-->
-                            <!-- TODO Remove sal.broker.impl from export when SchemaAwareRpcRegistry is not used in connector anymore -->
-                            org.opendaylight.mdsal.md.sal.dom.broker.impl,
-                            org.opendaylight.mdsal.md.sal.dom.broker.impl.*,
-            </Export-Package>
-            <Import-Package>*</Import-Package>
+            <Bundle-Activator>org.opendaylight.mdsal.dom.broker.osgi.SchemaServiceActivator</Bundle-Activator>
           </instructions>
         </configuration>
       </plugin>
diff --git a/dom/mdsal-dom-inmemory-datastore/pom.xml b/dom/mdsal-dom-inmemory-datastore/pom.xml
index efeeadacc5..fac397fac1 100644
--- a/dom/mdsal-dom-inmemory-datastore/pom.xml
+++ b/dom/mdsal-dom-inmemory-datastore/pom.xml
@@ -87,16 +87,8 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-
-            <Export-Package>org.opendaylight.mdsal.md.sal.dom.store.impl.*</Export-Package>
-
-            <Import-Package>*</Import-Package>
-          </instructions>
-        </configuration>
       </plugin>
+
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-- 
2.36.6