Change generated MANIFEST.MF location

This patch moves the generated MANIFEST.MF for
OSGi from the target/classes/META-INF folder to
./META-INF for non-web bundles, and to
./src/main/resources/META-INF for web bundles.
This fixes a problem in Eclipse where it would
think that the project is always out of sync,
indicating this on the OSGi run configuration.

Change-Id: I02c2af4bf80a7f1fe66f53ddf3ae24232d8b83ec
Signed-off-by: David Erickson <daviderickson@cs.stanford.edu>

diff --git a/.gitignore b/.gitignore
index f1f8a6ef9dd7780b5844563dfb5740d1e67405b5..b92845c8d76fafd514451b1c3dae3e1cbc6f2d4c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ target
 .classpath
 .project
 .settings
+MANIFEST.MF

diff --git a/opendaylight/arphandler/pom.xml b/opendaylight/arphandler/pom.xml
index 6023904b750a483044bd537dfa4e9b8be5371517..e95512dcd0a7637f90223890df79d0a6f2abeb38 100644 (file)
--- a/opendaylight/arphandler/pom.xml
+++ b/opendaylight/arphandler/pom.xml
@@ -37,6 +37,7 @@
           org.opendaylight.controller.arphandler.internal.Activator
                </Bundle-Activator>
          </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
        </configuration>
       </plugin>
     </plugins>

diff --git a/opendaylight/clustering/services/pom.xml b/opendaylight/clustering/services/pom.xml
index 640e282122fdda5c214ceb16e0ada8a91abcd6e2..36462ba76a5c6daf5522b28617fe7b3962a4dc85 100644 (file)
--- a/opendaylight/clustering/services/pom.xml
+++ b/opendaylight/clustering/services/pom.xml
@@ -28,6 +28,7 @@
               javax.transaction
             </Import-Package>
          </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
        </configuration>
       </plugin>
     </plugins>

diff --git a/opendaylight/clustering/services_implementation/pom.xml b/opendaylight/clustering/services_implementation/pom.xml
index d6a39364f2280ce2bd1307deee5c26607a3345a2..6edb50b82efe93b5cbf2a9c3ae1804e1da4bd90c 100644 (file)
--- a/opendaylight/clustering/services_implementation/pom.xml
+++ b/opendaylight/clustering/services_implementation/pom.xml
@@ -67,6 +67,7 @@
               true
             </Embed-Transitive>
          </instructions>
+        <manifestLocation>${project.basedir}/META-INF</manifestLocation>
        </configuration>
       </plugin>
       <plugin>

diff --git a/opendaylight/clustering/stub/pom.xml b/opendaylight/clustering/stub/pom.xml
index a0863cfe0fa0d475f825051105e7681affe41a64..fd6077d29ec532af5bca18ea5cc60b4411c10a1f 100644 (file)
--- a/opendaylight/clustering/stub/pom.xml
+++ b/opendaylight/clustering/stub/pom.xml
@@ -32,6 +32,7 @@
               org.opendaylight.controller.clustering.stub.internal.Activator
             </Bundle-Activator>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>

diff --git a/opendaylight/clustering/test/pom.xml b/opendaylight/clustering/test/pom.xml
index f6047de994239a22c177845e92e5f9a4cbdc1a76..161e7a918234e89dd308bd22f6848af0539c3a85 100644 (file)
--- a/opendaylight/clustering/test/pom.xml
+++ b/opendaylight/clustering/test/pom.xml
@@ -32,6 +32,7 @@
               OSGI-INF/component.xml
             </Service-Component>
          </instructions>
+        <manifestLocation>${project.basedir}/META-INF</manifestLocation>
        </configuration>
       </plugin>
     </plugins>

diff --git a/opendaylight/configuration/api/pom.xml b/opendaylight/configuration/api/pom.xml
index 051d90b318fdf9f172b6dd802ead5b06cddeacb5..c7eeb3c6ebb3acecc68e3826c4d3ac1484847813 100644 (file)
--- a/opendaylight/configuration/api/pom.xml
+++ b/opendaylight/configuration/api/pom.xml
@@ -30,6 +30,7 @@
               org.opendaylight.controller.configuration
            </Export-Package>
          </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
        </configuration>
       </plugin>
     </plugins>

diff --git a/opendaylight/configuration/implementation/pom.xml b/opendaylight/configuration/implementation/pom.xml
index 5e5f5e2b2e5f923f7397f629cffdac13748b4234..78e4de8d820a5b31c35d13bedc902334236fbf66 100644 (file)
--- a/opendaylight/configuration/implementation/pom.xml
+++ b/opendaylight/configuration/implementation/pom.xml
@@ -37,6 +37,7 @@
               org.opendaylight.controller.configuration.internal.Activator
             </Bundle-Activator>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>

diff --git a/opendaylight/containermanager/api/pom.xml b/opendaylight/containermanager/api/pom.xml
index f4f741d638541a8e5762c8ae2ef0c5f7df185dc8..ac6757fa30190558f68367cb67091d10ceed7c01 100644 (file)
--- a/opendaylight/containermanager/api/pom.xml
+++ b/opendaylight/containermanager/api/pom.xml
@@ -36,6 +36,7 @@
               org.opendaylight.controller.containermanager
            </Export-Package>
          </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
        </configuration>
       </plugin>
     </plugins>

diff --git a/opendaylight/containermanager/implementation/pom.xml b/opendaylight/containermanager/implementation/pom.xml
index 4ff13a4530a66f16043d80411cf4a4c56f2e5279..42ff3387f7ff8e2ed7de26976789fde3d8712178 100644 (file)
--- a/opendaylight/containermanager/implementation/pom.xml
+++ b/opendaylight/containermanager/implementation/pom.xml
@@ -43,6 +43,7 @@
               org.opendaylight.controller.containermanager.internal.Activator
             </Bundle-Activator>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>

diff --git a/opendaylight/forwarding/staticrouting/pom.xml b/opendaylight/forwarding/staticrouting/pom.xml
index 9ff42738122f36f6b2ba9c299afea87096f175c6..f8749727f7f06daacc8d82924b1ef1373eabf24a 100644 (file)
--- a/opendaylight/forwarding/staticrouting/pom.xml
+++ b/opendaylight/forwarding/staticrouting/pom.xml
@@ -45,6 +45,7 @@
                  org.opendaylight.controller.forwarding.staticrouting.internal.Activator
                </Bundle-Activator>
          </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
        </configuration>
       </plugin>
     </plugins>

diff --git a/opendaylight/forwardingrulesmanager/api/pom.xml b/opendaylight/forwardingrulesmanager/api/pom.xml
index ed3ec6094a57f28297b7c2bfb765a8b582e1c591..2fed2dc1960977c262f9c10a43988a733f1ff834 100644 (file)
--- a/opendaylight/forwardingrulesmanager/api/pom.xml
+++ b/opendaylight/forwardingrulesmanager/api/pom.xml
@@ -54,6 +54,7 @@
             <Service-Component>
             </Service-Component>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>

diff --git a/opendaylight/forwardingrulesmanager/implementation/pom.xml b/opendaylight/forwardingrulesmanager/implementation/pom.xml
index 1dd2c0580bce3871ce5da0d2e39f5f98ffd46733..df1095c76d64adcaaa327207da772bb305f7d258 100644 (file)
--- a/opendaylight/forwardingrulesmanager/implementation/pom.xml
+++ b/opendaylight/forwardingrulesmanager/implementation/pom.xml
@@ -75,6 +75,7 @@
             <Service-Component>
             </Service-Component>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
       <plugin>

diff --git a/opendaylight/hosttracker/api/pom.xml b/opendaylight/hosttracker/api/pom.xml
index ea895dad0cce3facfa9e6dd8f469cd78182c9efa..5ed95e794fa9a1919ca1a4f785a4f99ae76975fa 100644 (file)
--- a/opendaylight/hosttracker/api/pom.xml
+++ b/opendaylight/hosttracker/api/pom.xml
@@ -42,6 +42,7 @@
                                                        org.osgi.framework\r
                                                </Import-Package>\r
                                        </instructions>\r
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>\r
                                </configuration>\r
                        </plugin>\r
                </plugins>\r

diff --git a/opendaylight/hosttracker/implementation/pom.xml b/opendaylight/hosttracker/implementation/pom.xml
index 82082425ec98f8386037a952a0e9f5bfc55ec33f..35a2238b2a3a5980af9d1b8d3abb362ab2d57a70 100644 (file)
--- a/opendaylight/hosttracker/implementation/pom.xml
+++ b/opendaylight/hosttracker/implementation/pom.xml
@@ -67,6 +67,7 @@
                                                <Service-Component>
                                                </Service-Component>
                                        </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
                                </configuration>
                        </plugin>
                        <plugin>

diff --git a/opendaylight/logging/bridge/pom.xml b/opendaylight/logging/bridge/pom.xml
index 1a657677534fabd5c19a4c363d37754b04833de7..266d83e8e3b26884c7f5801764ba8d6df9d45f1a 100644 (file)
--- a/opendaylight/logging/bridge/pom.xml
+++ b/opendaylight/logging/bridge/pom.xml
@@ -30,6 +30,7 @@
               org.opendaylight.controller.logging.bridge.internal.Activator
             </Bundle-Activator>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>

diff --git a/opendaylight/northbound/commons/pom.xml b/opendaylight/northbound/commons/pom.xml
index 630239202446272bbb0e49b5500ed4b16f485f6f..083a081d013691e2cb9de1430cc5410a5b33adf9 100644 (file)
--- a/opendaylight/northbound/commons/pom.xml
+++ b/opendaylight/northbound/commons/pom.xml
@@ -37,6 +37,7 @@
               org.slf4j,                              
             </Import-Package>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>

diff --git a/opendaylight/northbound/flowprogrammer/pom.xml b/opendaylight/northbound/flowprogrammer/pom.xml
index b360b3934776ae3d3f2cbda060dc2de90ac79714..0a873ca0651013728d404a71798d670ac8b03eb2 100644 (file)
--- a/opendaylight/northbound/flowprogrammer/pom.xml
+++ b/opendaylight/northbound/flowprogrammer/pom.xml
@@ -55,6 +55,7 @@
             </Export-Package>
             <Web-ContextPath>/controller/nb/v2/flow</Web-ContextPath>
           </instructions>
+          <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>

diff --git a/opendaylight/northbound/hosttracker/pom.xml b/opendaylight/northbound/hosttracker/pom.xml
index 9b7647be2c7662677f299b899010790fea345bf7..a26bbbd610b4bd38f9dd2c257632e58c5adabc98 100644 (file)
--- a/opendaylight/northbound/hosttracker/pom.xml
+++ b/opendaylight/northbound/hosttracker/pom.xml
@@ -55,6 +55,7 @@
             </Import-Package>
             <Web-ContextPath>/controller/nb/v2/host</Web-ContextPath>
           </instructions>
+          <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>

diff --git a/opendaylight/northbound/staticrouting/pom.xml b/opendaylight/northbound/staticrouting/pom.xml
index 319de7ea5417ccedaa781d60e6b19344b48810d1..823b76076cf8999bf0723d4750531f1152f6a2ed 100644 (file)
--- a/opendaylight/northbound/staticrouting/pom.xml
+++ b/opendaylight/northbound/staticrouting/pom.xml
@@ -56,6 +56,7 @@
             </Export-Package>
             <Web-ContextPath>/controller/nb/v2/staticroute</Web-ContextPath>
           </instructions>
+          <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>

diff --git a/opendaylight/northbound/statistics/pom.xml b/opendaylight/northbound/statistics/pom.xml
index 1f7f0ea73ed8a0c403c6c9bc032b83d910923d27..8a9799e9d9e9915f270ec13547527f79e1a93b0d 100644 (file)
--- a/opendaylight/northbound/statistics/pom.xml
+++ b/opendaylight/northbound/statistics/pom.xml
@@ -64,6 +64,7 @@
             </Export-Package>
             <Web-ContextPath>/controller/nb/v2/statistics</Web-ContextPath>
           </instructions>
+          <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>

diff --git a/opendaylight/northbound/subnets/pom.xml b/opendaylight/northbound/subnets/pom.xml
index 196bf141fab98dbe7e4909c7674dfc2404b8fc71..2d9e20b2abd1d910516c2ce439288ccdc9b6b82c 100644 (file)
--- a/opendaylight/northbound/subnets/pom.xml
+++ b/opendaylight/northbound/subnets/pom.xml
@@ -70,6 +70,7 @@
             </Export-Package>
             <Web-ContextPath>/controller/nb/v2/subnet</Web-ContextPath>
           </instructions>
+          <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>

diff --git a/opendaylight/northbound/switchmanager/pom.xml b/opendaylight/northbound/switchmanager/pom.xml
index 20893d028022114ec95af9a08bead1edf1ebb08d..358eed3f2b5d10ad7e2101f080f67da989d33f57 100644 (file)
--- a/opendaylight/northbound/switchmanager/pom.xml
+++ b/opendaylight/northbound/switchmanager/pom.xml
@@ -55,6 +55,7 @@
             </Import-Package>
             <Web-ContextPath>/controller/nb/v2/switch</Web-ContextPath>
           </instructions>
+          <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>

diff --git a/opendaylight/northbound/topology/pom.xml b/opendaylight/northbound/topology/pom.xml
index 9718fe2ce7b5aae706fea9d36798d03365abee71..517492f39a56444749e06bab1a188a4573c11221 100644 (file)
--- a/opendaylight/northbound/topology/pom.xml
+++ b/opendaylight/northbound/topology/pom.xml
@@ -58,6 +58,7 @@
             </Import-Package>
             <Web-ContextPath>/controller/nb/v2/topology</Web-ContextPath>
           </instructions>
+          <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
           </configuration>
       </plugin>
     </plugins>

diff --git a/opendaylight/protocol_plugins/openflow/pom.xml b/opendaylight/protocol_plugins/openflow/pom.xml
index c95520c7ce1be9989740d67e757345e16a162811..98d1ecf6369cc12f63afff93042b17ed2154bbd6 100644 (file)
--- a/opendaylight/protocol_plugins/openflow/pom.xml
+++ b/opendaylight/protocol_plugins/openflow/pom.xml
@@ -53,6 +53,7 @@
               org.opendaylight.controller.protocol_plugin.openflow.internal.Activator
             </Bundle-Activator>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>

diff --git a/opendaylight/protocol_plugins/stub/pom.xml b/opendaylight/protocol_plugins/stub/pom.xml
index a93965b4824de9865176c930f80cbdce51d77c4d..faefe4c629012771c238218dc3ec55c299bd668e 100644 (file)
--- a/opendaylight/protocol_plugins/stub/pom.xml
+++ b/opendaylight/protocol_plugins/stub/pom.xml
@@ -42,6 +42,7 @@
               org.opendaylight.controller.protocol_plugins.stub.internal.Activator 
             </Bundle-Activator>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>

diff --git a/opendaylight/routing/dijkstra_implementation/pom.xml b/opendaylight/routing/dijkstra_implementation/pom.xml
index 2aa056093701e8c849c15fde2163efdfa7fccdc2..e6c831d897b914cc8afaa9e6abe7566f75e1fcfe 100644 (file)
--- a/opendaylight/routing/dijkstra_implementation/pom.xml
+++ b/opendaylight/routing/dijkstra_implementation/pom.xml
@@ -41,6 +41,7 @@
           org.opendaylight.controller.routing.dijkstra_implementation.internal.Activator
         </Bundle-Activator>
       </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
     </configuration>
       </plugin>
     </plugins>

diff --git a/opendaylight/sal/api/pom.xml b/opendaylight/sal/api/pom.xml
index 4803418e149cf4f79a56214c1ba5b3ccb6105746..5551999856fbbb9a79ad2011c31a4c6c8b20e2a4 100644 (file)
--- a/opendaylight/sal/api/pom.xml
+++ b/opendaylight/sal/api/pom.xml
@@ -46,6 +46,7 @@
               org.opendaylight.controller.sal.reader\r
             </Export-Package>\r
           </instructions>\r
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>\r
         </configuration>\r
       </plugin>\r
     </plugins>\r

diff --git a/opendaylight/sal/implementation/pom.xml b/opendaylight/sal/implementation/pom.xml
index 9a05efe8e81715a1b55141fd38b160243e947894..8d4da22295689a8c3cef1b0d1875492a8b11502a 100644 (file)
--- a/opendaylight/sal/implementation/pom.xml
+++ b/opendaylight/sal/implementation/pom.xml
@@ -43,6 +43,7 @@
              org.opendaylight.controller.sal.implementation.internal.Activator\r
                </Bundle-Activator>\r
           </instructions>\r
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>\r
         </configuration>\r
       </plugin>\r
     </plugins>\r

diff --git a/opendaylight/samples/loadbalancer/pom.xml b/opendaylight/samples/loadbalancer/pom.xml
index 06b9f597b3557346da569f6952e861c27e6c3157..ba3ee2fbd58847674de835468d6036a1e281448c 100644 (file)
--- a/opendaylight/samples/loadbalancer/pom.xml
+++ b/opendaylight/samples/loadbalancer/pom.xml
@@ -62,6 +62,7 @@
                                                <Service-Component>
                                                </Service-Component>
                                        </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
                                </configuration>
                        </plugin>
                </plugins>

diff --git a/opendaylight/samples/northbound/loadbalancer/pom.xml b/opendaylight/samples/northbound/loadbalancer/pom.xml
index d692c4e83132429950e1eea6b7a3a8350cd2e794..c736d0427a5267ab6ec3a94baf46a10648fafc87 100644 (file)
--- a/opendaylight/samples/northbound/loadbalancer/pom.xml
+++ b/opendaylight/samples/northbound/loadbalancer/pom.xml
@@ -55,6 +55,7 @@
             </Import-Package>
             <Web-ContextPath>/one/nb/v2/lb</Web-ContextPath>
           </instructions>
+          <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>

diff --git a/opendaylight/samples/simpleforwarding/pom.xml b/opendaylight/samples/simpleforwarding/pom.xml
index 76b6e4565d57e6276a149f1f348d2ce9adb13f61..f26f56b7ebe819be1c9b5d554a7f19843c3dff36 100644 (file)
--- a/opendaylight/samples/simpleforwarding/pom.xml
+++ b/opendaylight/samples/simpleforwarding/pom.xml
@@ -44,6 +44,7 @@
                  org.opendaylight.controller.samples.simpleforwarding.internal.Activator
                        </Bundle-Activator>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>

diff --git a/opendaylight/security/pom.xml b/opendaylight/security/pom.xml
index 8eb3cc11667ff15db2735034561b95c1a8b5d7f1..6c689f110266d65b4d9eef812e61a9c4352d4c23 100644 (file)
--- a/opendaylight/security/pom.xml
+++ b/opendaylight/security/pom.xml
@@ -40,6 +40,7 @@
                                                org.opendaylight.controller.security
                                                </Export-Package>
                                        </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
                                </configuration>
                        </plugin>
                </plugins>

diff --git a/opendaylight/statisticsmanager/api/pom.xml b/opendaylight/statisticsmanager/api/pom.xml
index e4ae95b3fcde4fe76afc8239ff870ee9c4d9ed3f..7ee475ed2b01be2b8efb4c1eb0704c2816359f83 100644 (file)
--- a/opendaylight/statisticsmanager/api/pom.xml
+++ b/opendaylight/statisticsmanager/api/pom.xml
@@ -32,6 +32,7 @@
               org.opendaylight.controller.statisticsmanager 
             </Export-Package>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>

diff --git a/opendaylight/statisticsmanager/implementation/pom.xml b/opendaylight/statisticsmanager/implementation/pom.xml
index 1786d003cd4c1be700e3339fbfc3d13ca2013b9f..98ddfa5e82493c90a8313a0df3ea0acd597f3bab 100644 (file)
--- a/opendaylight/statisticsmanager/implementation/pom.xml
+++ b/opendaylight/statisticsmanager/implementation/pom.xml
@@ -52,6 +52,7 @@
             <Export-Package>
             </Export-Package>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
       <plugin>

diff --git a/opendaylight/switchmanager/api/pom.xml b/opendaylight/switchmanager/api/pom.xml
index 91f91f92a492b0c9f61c8de28fa2a685faa6f4d4..cc56d96869bfae5f84e358a8f830eeb581634905 100644 (file)
--- a/opendaylight/switchmanager/api/pom.xml
+++ b/opendaylight/switchmanager/api/pom.xml
@@ -57,6 +57,7 @@
               org.apache.commons.lang3.builder
             </Import-Package>
              </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
            </configuration>
       </plugin>
       <plugin>

diff --git a/opendaylight/switchmanager/implementation/pom.xml b/opendaylight/switchmanager/implementation/pom.xml
index 55d3a3286d5a712ec68c374e9cdef6f8b56a3a01..128ab25873cc384b0c5ee0e9ea4d98eec43c0b22 100644 (file)
--- a/opendaylight/switchmanager/implementation/pom.xml
+++ b/opendaylight/switchmanager/implementation/pom.xml
@@ -60,6 +60,7 @@
                  org.opendaylight.controller.switchmanager.internal.Activator
             </Bundle-Activator>
              </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
            </configuration>
       </plugin>
       <plugin>

diff --git a/opendaylight/topologymanager/pom.xml b/opendaylight/topologymanager/pom.xml
index 9a938f11a682a679d775342ebb43137cc38a6903..57a036b948edab99e09448daf91e294c75849f43 100755 (executable)
--- a/opendaylight/topologymanager/pom.xml
+++ b/opendaylight/topologymanager/pom.xml
@@ -45,6 +45,7 @@
           org.opendaylight.controller.topologymanager.internal.Activator
         </Bundle-Activator>
          </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
        </configuration>
       </plugin>
     </plugins>

diff --git a/opendaylight/usermanager/pom.xml b/opendaylight/usermanager/pom.xml
index 71551648381dc6569567b6ab6e6463d9f53737a5..5e15c4cbfef470920ca99de9dd3451a4f2347e04 100644 (file)
--- a/opendaylight/usermanager/pom.xml
+++ b/opendaylight/usermanager/pom.xml
@@ -56,6 +56,7 @@
                                                        org.opendaylight.controller.usermanager.internal.Activator
                                                </Bundle-Activator>
                                        </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
                                </configuration>
                        </plugin>
                </plugins>

diff --git a/opendaylight/web/devices/pom.xml b/opendaylight/web/devices/pom.xml
index 7bd88ab8c514262aa4010b420b3c2248398239fc..980717323d2e0bfe23ebdb1691f9816b19bfe669 100644 (file)
--- a/opendaylight/web/devices/pom.xml
+++ b/opendaylight/web/devices/pom.xml
@@ -77,6 +77,7 @@
                                                </Import-Package>
                                                <Web-ContextPath>/controller/web/devices</Web-ContextPath>
                                        </instructions>
+          <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
                                </configuration>
                        </plugin>
                </plugins>

diff --git a/opendaylight/web/flows/pom.xml b/opendaylight/web/flows/pom.xml
index 21fa22c80648b0223e53399bd8effb49507b1f9b..eefaea3ca589912ddfdda531e95a28f8d5841e27 100644 (file)
--- a/opendaylight/web/flows/pom.xml
+++ b/opendaylight/web/flows/pom.xml
@@ -77,6 +77,7 @@
                                                </Import-Package>
                                                <Web-ContextPath>/controller/web/flows</Web-ContextPath>
                                        </instructions>
+          <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
                                </configuration>
                        </plugin>
                </plugins>

diff --git a/opendaylight/web/root/pom.xml b/opendaylight/web/root/pom.xml
index e35e96065c13a1fc4796690f9b12013d1bd07a96..76a7cb10aab00b03d5dc8a035a99cfec8b92d7bb 100644 (file)
--- a/opendaylight/web/root/pom.xml
+++ b/opendaylight/web/root/pom.xml
@@ -81,6 +81,7 @@
                                                </Export-Package>
                                                <Web-ContextPath>/</Web-ContextPath>
                                        </instructions>
+          <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
                                </configuration>
                        </plugin>
                </plugins>

diff --git a/opendaylight/web/topology/pom.xml b/opendaylight/web/topology/pom.xml
index 920f68070640ab898fc42a6ca33c30b4c11a8d80..2a8cb9fa1ebb737fb62da89d624a437e63da4751 100644 (file)
--- a/opendaylight/web/topology/pom.xml
+++ b/opendaylight/web/topology/pom.xml
@@ -81,6 +81,7 @@
                                                </Import-Package>
                                                <Web-ContextPath>/controller/web/topology</Web-ContextPath>
                                        </instructions>
+          <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
                                </configuration>
                        </plugin>
                </plugins>

diff --git a/opendaylight/web/troubleshoot/pom.xml b/opendaylight/web/troubleshoot/pom.xml
index 0b7b794cbbf4b9700711da0143f9bc8c19805b9a..0d088826fd41a50fa36f282ebb799030a680acc0 100644 (file)
--- a/opendaylight/web/troubleshoot/pom.xml
+++ b/opendaylight/web/troubleshoot/pom.xml
@@ -79,6 +79,7 @@
                                                </Import-Package>
                                                <Web-ContextPath>/controller/web/troubleshoot</Web-ContextPath>
                                        </instructions>
+          <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
                                </configuration>
                        </plugin>
                </plugins>

diff --git a/third-party/jersey-servlet/pom.xml b/third-party/jersey-servlet/pom.xml
index dfb8968a5e4390dcedcbcd72d72c6dccf89bdd16..8c7d8e80b1101d06e0fa0b44a072be2811405a7d 100644 (file)
--- a/third-party/jersey-servlet/pom.xml
+++ b/third-party/jersey-servlet/pom.xml
@@ -61,6 +61,7 @@
               *;resolution:=optional
             </Import-Package>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>

diff --git a/third-party/net.sf.jung2/pom.xml b/third-party/net.sf.jung2/pom.xml
index bfe59c59cae7b4b6bf235e0f07eb2b6a6248a8c1..b8f7155779470b6a25153482c25600a7e61b06ba 100644 (file)
--- a/third-party/net.sf.jung2/pom.xml
+++ b/third-party/net.sf.jung2/pom.xml
@@ -47,6 +47,7 @@
               !*
             </Import-Package>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>

diff --git a/third-party/openflowj/pom.xml b/third-party/openflowj/pom.xml
index 4daddf11627eecdbf79554a4b5f3fcb91f42093f..0cc0597565bea83f57695cef0c3028ab60f72177 100644 (file)
--- a/third-party/openflowj/pom.xml
+++ b/third-party/openflowj/pom.xml
@@ -113,6 +113,7 @@
              org.openflow.util;version="1.0.1"
            </Export-Package>
          </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
        </configuration>
       </plugin>
       <plugin>