Explicitly specified Export-Package declaration in poms.

Signed-off-by: Martin Vitez <mvitez@cisco.com>

diff --git a/.gitignore b/.gitignore
index beef00d016539f0af7e0cb61be0ef1028cc8db48..dddad451c7c9e11b3c044cf8fd81d83a8c29d582 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 .project
 .settings
 target
+*.iml
+.idea

diff --git a/code-generator/binding-generator-api/pom.xml b/code-generator/binding-generator-api/pom.xml
index c76b9f3f1c742d19b2485ed582f4860d24b47611..884097563e33b9ee3f7167a29efaa0812a62a711 100644 (file)
--- a/code-generator/binding-generator-api/pom.xml
+++ b/code-generator/binding-generator-api/pom.xml
@@ -32,6 +32,7 @@
                 <configuration>\r
                     <instructions>\r
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>\r
+                        <Export-Package>org.opendaylight.yangtools.sal.binding.generator.api</Export-Package>\r
                     </instructions>\r
                 </configuration>\r
             </plugin>\r

diff --git a/code-generator/binding-generator-impl/pom.xml b/code-generator/binding-generator-impl/pom.xml
index 9f604cbb56f985eb9d889d5d4cfe965786318a4f..d4e2310a0f600334c90d2f37e0fb60d02c200b5f 100644 (file)
--- a/code-generator/binding-generator-impl/pom.xml
+++ b/code-generator/binding-generator-impl/pom.xml
@@ -21,6 +21,10 @@
                 <configuration>\r
                     <instructions>\r
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>\r
+                        <Export-Package>\r
+                            org.opendaylight.yangtools.sal.binding.generator.impl,\r
+                            org.opendaylight.yangtools.sal.binding.yang.types\r
+                        </Export-Package>\r
                     </instructions>\r
                 </configuration>\r
             </plugin>\r

diff --git a/code-generator/binding-generator-spi/pom.xml b/code-generator/binding-generator-spi/pom.xml
index 9b0f7dc30b358e752ddfaa49bb71e31329fdc8e2..17064427c7b9226d22bd872ffcd1e497941b6e8d 100644 (file)
--- a/code-generator/binding-generator-spi/pom.xml
+++ b/code-generator/binding-generator-spi/pom.xml
@@ -32,6 +32,7 @@
                 <configuration>\r
                     <instructions>\r
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>\r
+                        <Export-Package>org.opendaylight.yangtools.sal.binding.generator.spi</Export-Package>\r
                     </instructions>\r
                 </configuration>\r
             </plugin>\r

diff --git a/code-generator/binding-generator-util/pom.xml b/code-generator/binding-generator-util/pom.xml
index 149a32141dcb653117e1906df1bce6118bf70362..e48fe997ad85fe971f9c595352df751b1529f4b8 100644 (file)
--- a/code-generator/binding-generator-util/pom.xml
+++ b/code-generator/binding-generator-util/pom.xml
@@ -45,6 +45,10 @@
                 <configuration>
                     <instructions>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
+                        <Export-Package>
+                            org.opendaylight.yangtools.binding.generator.util,
+                            org.opendaylight.yangtools.binding.generator.util.generated.type.builder
+                        </Export-Package>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/code-generator/binding-java-api-generator/pom.xml b/code-generator/binding-java-api-generator/pom.xml
index 0e22d9b783c5ea73500c01d984789a5e2e34f0f8..d222807bc01787dd3feb9e603110ab080af3dcd6 100644 (file)
--- a/code-generator/binding-java-api-generator/pom.xml
+++ b/code-generator/binding-java-api-generator/pom.xml
@@ -21,6 +21,7 @@
                 <configuration>\r
                     <instructions>\r
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>\r
+                        <Export-Package>org.opendaylight.yangtools.sal.java.api.generator</Export-Package>\r
                     </instructions>\r
                 </configuration>\r
             </plugin>\r

diff --git a/code-generator/binding-model-api/pom.xml b/code-generator/binding-model-api/pom.xml
index 457bcc014650abd55423b131194023c5f9997a19..4129c67490bc2617fed9266b0d31cd31108f339e 100644 (file)
--- a/code-generator/binding-model-api/pom.xml
+++ b/code-generator/binding-model-api/pom.xml
@@ -31,6 +31,11 @@
                 <configuration>
                     <instructions>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
+                        <Export-Package>
+                            org.opendaylight.yangtools.sal.binding.model.api,
+                            org.opendaylight.yangtools.sal.binding.model.api.type,
+                            org.opendaylight.yangtools.sal.binding.model.api.type.provider
+                        </Export-Package>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/code-generator/maven-sal-api-gen-plugin/pom.xml b/code-generator/maven-sal-api-gen-plugin/pom.xml
index f5e54d53072a76cb5d79faabf95e64553431500e..67f905a6ae25965b82d6a6a5b908d37611bb58e6 100644 (file)
--- a/code-generator/maven-sal-api-gen-plugin/pom.xml
+++ b/code-generator/maven-sal-api-gen-plugin/pom.xml
@@ -44,6 +44,7 @@
                 <configuration>
                     <instructions>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
+                        <Export-Package>org.opendaylight.yangtools.maven.sal.api.gen.plugin</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/yang/yang-binding/pom.xml b/yang/yang-binding/pom.xml
index 17eb92b04aca23be8e3b986c8aebb040597e7950..edb88ba983067becfa2b054d751e629430ecd0b7 100644 (file)
--- a/yang/yang-binding/pom.xml
+++ b/yang/yang-binding/pom.xml
@@ -1,31 +1,33 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
 \r
-       <parent>\r
-               <groupId>org.opendaylight.yangtools</groupId>\r
-               <artifactId>yang</artifactId>\r
-               <version>0.5.7-SNAPSHOT</version>\r
-       </parent>\r
+    <parent>\r
+        <groupId>org.opendaylight.yangtools</groupId>\r
+        <artifactId>yang</artifactId>\r
+        <version>0.5.7-SNAPSHOT</version>\r
+    </parent>\r
 \r
-       <modelVersion>4.0.0</modelVersion>\r
-       <artifactId>yang-binding</artifactId>\r
-       <name>${project.artifactId}</name>\r
-       <description>Java binding for YANG</description>\r
+    <modelVersion>4.0.0</modelVersion>\r
+    <artifactId>yang-binding</artifactId>\r
+    <name>${project.artifactId}</name>\r
+    <description>Java binding for YANG</description>\r
     <packaging>bundle</packaging>\r
 \r
-       <build>\r
-               <plugins>\r
-                       <plugin>\r
-                               <groupId>org.apache.felix</groupId>\r
-                               <artifactId>maven-bundle-plugin</artifactId>\r
-                               <version>${maven.bundle.version}</version>\r
-                               <extensions>true</extensions>\r
-                               <configuration>\r
-                                       <instructions>\r
-                                               <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>\r
-                                       </instructions>\r
-                               </configuration>\r
-                       </plugin>\r
-               </plugins>\r
-       </build>\r
+    <build>\r
+        <plugins>\r
+            <plugin>\r
+                <groupId>org.apache.felix</groupId>\r
+                <artifactId>maven-bundle-plugin</artifactId>\r
+                <version>${maven.bundle.version}</version>\r
+                <extensions>true</extensions>\r
+                <configuration>\r
+                    <instructions>\r
+                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>\r
+                        <Export-Package>org.opendaylight.yangtools.yang.binding</Export-Package>\r
+                    </instructions>\r
+                </configuration>\r
+            </plugin>\r
+        </plugins>\r
+    </build>\r
+\r
 </project>\r

diff --git a/yang/yang-common/pom.xml b/yang/yang-common/pom.xml
index bf72cbd79a6f3276febe8929209119c4f04f9df6..b0b5c42d616133a58f9a08078cea39130b484f54 100644 (file)
--- a/yang/yang-common/pom.xml
+++ b/yang/yang-common/pom.xml
@@ -1,39 +1,41 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
 \r
-       <parent>\r
-               <groupId>org.opendaylight.yangtools</groupId>\r
-               <artifactId>yang</artifactId>\r
-               <version>0.5.7-SNAPSHOT</version>\r
-       </parent>\r
-       <packaging>bundle</packaging>\r
+    <parent>\r
+        <groupId>org.opendaylight.yangtools</groupId>\r
+        <artifactId>yang</artifactId>\r
+        <version>0.5.7-SNAPSHOT</version>\r
+    </parent>\r
+    <packaging>bundle</packaging>\r
 \r
-       <modelVersion>4.0.0</modelVersion>\r
-       <artifactId>yang-common</artifactId>\r
-       <name>${project.artifactId}</name>\r
-       <description>${project.artifactId}</description>\r
+    <modelVersion>4.0.0</modelVersion>\r
+    <artifactId>yang-common</artifactId>\r
+    <name>${project.artifactId}</name>\r
+    <description>${project.artifactId}</description>\r
 \r
-       <dependencies>\r
-               <dependency>\r
-                       <groupId>org.slf4j</groupId>\r
-                       <artifactId>slf4j-api</artifactId>\r
-               </dependency>\r
-       </dependencies>\r
+    <dependencies>\r
+        <dependency>\r
+            <groupId>org.slf4j</groupId>\r
+            <artifactId>slf4j-api</artifactId>\r
+        </dependency>\r
+    </dependencies>\r
 \r
 \r
-       <build>\r
-               <plugins>\r
-                       <plugin>\r
-                               <groupId>org.apache.felix</groupId>\r
-                               <artifactId>maven-bundle-plugin</artifactId>\r
-                               <version>${maven.bundle.version}</version>\r
-                               <extensions>true</extensions>\r
-                               <configuration>\r
-                                       <instructions>\r
-                                               <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>\r
-                                       </instructions>\r
-                               </configuration>\r
-                       </plugin>\r
-               </plugins>\r
-       </build>\r
+    <build>\r
+        <plugins>\r
+            <plugin>\r
+                <groupId>org.apache.felix</groupId>\r
+                <artifactId>maven-bundle-plugin</artifactId>\r
+                <version>${maven.bundle.version}</version>\r
+                <extensions>true</extensions>\r
+                <configuration>\r
+                    <instructions>\r
+                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>\r
+                        <Export-Package>org.opendaylight.yangtools.yang.common</Export-Package>\r
+                    </instructions>\r
+                </configuration>\r
+            </plugin>\r
+        </plugins>\r
+    </build>\r
+\r
 </project>\r

diff --git a/yang/yang-data-api/pom.xml b/yang/yang-data-api/pom.xml
index 8dcdc78886b4a75eaab71a1b8dc063ae070dafdc..e7acdecc43e8d11ae1d2debfef92e52e878c0657 100644 (file)
--- a/yang/yang-data-api/pom.xml
+++ b/yang/yang-data-api/pom.xml
@@ -30,6 +30,7 @@
                 <configuration>\r
                     <instructions>\r
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>\r
+                        <Export-Package>org.opendaylight.yangtools.yang.data.api</Export-Package>\r
                     </instructions>\r
                 </configuration>\r
             </plugin>\r

diff --git a/yang/yang-data-impl/pom.xml b/yang/yang-data-impl/pom.xml
index 532aaabbef01b107c35ed15197ad59609099df3b..0f18bf1e3e9e9851943b9b80d0c53adf5d6c07d0 100644 (file)
--- a/yang/yang-data-impl/pom.xml
+++ b/yang/yang-data-impl/pom.xml
@@ -27,6 +27,7 @@
                 <configuration>\r
                     <instructions>\r
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>\r
+                        <Export-Package>org.opendaylight.yangtools.yang.data.impl</Export-Package>\r
                     </instructions>\r
                 </configuration>\r
             </plugin>\r

diff --git a/yang/yang-data-util/pom.xml b/yang/yang-data-util/pom.xml
index 47e8121641b7fc7e9b5c003c7bb5f7b44f527530..48c147bd975cfa89dcd49d597cb7e330ff6d5c71 100644 (file)
--- a/yang/yang-data-util/pom.xml
+++ b/yang/yang-data-util/pom.xml
@@ -30,6 +30,7 @@
                 <configuration>\r
                     <instructions>\r
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>\r
+                        <Export-Package>org.opendaylight.yangtools.yang.data.util</Export-Package>\r
                     </instructions>\r
                 </configuration>\r
             </plugin>\r

diff --git a/yang/yang-maven-plugin-spi/pom.xml b/yang/yang-maven-plugin-spi/pom.xml
index a74b55ae0d67baa62e781ed478a00840b3449d8c..a412aa5ea38d31bf173b52e35cfd7caef9fd32fb 100644 (file)
--- a/yang/yang-maven-plugin-spi/pom.xml
+++ b/yang/yang-maven-plugin-spi/pom.xml
@@ -53,6 +53,7 @@
                 <configuration>
                     <instructions>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
+                        <Export-Package>org.opendaylight.yangtools.yang2sources.spi</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/yang/yang-model-api/pom.xml b/yang/yang-model-api/pom.xml
index 6eaf8d6538ee2c047c4e7d7b05d1b6c09aec4aa3..495bd40e758650776a25bcab0519c0bac0fa15ca 100644 (file)
--- a/yang/yang-model-api/pom.xml
+++ b/yang/yang-model-api/pom.xml
@@ -30,6 +30,7 @@
                 <configuration>\r
                     <instructions>\r
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>\r
+                        <Export-Package>org.opendaylight.yangtools.yang.model.api</Export-Package>\r
                     </instructions>\r
                 </configuration>\r
             </plugin>\r

diff --git a/yang/yang-model-util/pom.xml b/yang/yang-model-util/pom.xml
index bd436f45ec5cc3539019abdbb71a151337f4fc99..0c94867e26fbdcdff7ba99241822d7d3ac6bb737 100644 (file)
--- a/yang/yang-model-util/pom.xml
+++ b/yang/yang-model-util/pom.xml
@@ -39,6 +39,7 @@
                 <configuration>
                     <instructions>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
+                        <Export-Package>org.opendaylight.yangtools.yang.model.util</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/yang/yang-parser-api/pom.xml b/yang/yang-parser-api/pom.xml
index ce9e30c02b0cbbf628179956d752e4136458286c..d395bd4a45242c03d9f62d3ca98771a137fcefc3 100644 (file)
--- a/yang/yang-parser-api/pom.xml
+++ b/yang/yang-parser-api/pom.xml
@@ -30,6 +30,7 @@
                 <configuration>
                     <instructions>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
+                        <Export-Package>org.opendaylight.yangtools.yang.model.parser.api</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/yang/yang-parser-impl/pom.xml b/yang/yang-parser-impl/pom.xml
index d4b467ed41d024ecf26d26c5cec942dcfd3c878e..a7601533d1db09eb455d8e78050c5df104bf4664 100644 (file)
--- a/yang/yang-parser-impl/pom.xml
+++ b/yang/yang-parser-impl/pom.xml
@@ -73,6 +73,10 @@
                 <configuration>\r
                     <instructions>\r
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>\r
+                        <Export-Package>\r
+                            org.opendaylight.yangtools.yang.parser.impl,\r
+                            org.opendaylight.yangtools.yang.parser.util\r
+                        </Export-Package>\r
                     </instructions>\r
                 </configuration>\r
             </plugin>\r