From: David Erickson Date: Sat, 18 May 2013 22:34:44 +0000 (-0700) Subject: Change generated MANIFEST.MF location X-Git-Tag: releasepom-0.1.0~441^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=4d8ea2149206e12d7601b34667a85f48ca82af6c 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 --- diff --git a/.gitignore b/.gitignore index f1f8a6ef9d..b92845c8d7 100644 --- 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 6023904b75..e95512dcd0 100644 --- a/opendaylight/arphandler/pom.xml +++ b/opendaylight/arphandler/pom.xml @@ -37,6 +37,7 @@ org.opendaylight.controller.arphandler.internal.Activator + ${project.basedir}/META-INF diff --git a/opendaylight/clustering/services/pom.xml b/opendaylight/clustering/services/pom.xml index 640e282122..36462ba76a 100644 --- a/opendaylight/clustering/services/pom.xml +++ b/opendaylight/clustering/services/pom.xml @@ -28,6 +28,7 @@ javax.transaction + ${project.basedir}/META-INF diff --git a/opendaylight/clustering/services_implementation/pom.xml b/opendaylight/clustering/services_implementation/pom.xml index d6a39364f2..6edb50b82e 100644 --- a/opendaylight/clustering/services_implementation/pom.xml +++ b/opendaylight/clustering/services_implementation/pom.xml @@ -67,6 +67,7 @@ true + ${project.basedir}/META-INF diff --git a/opendaylight/clustering/stub/pom.xml b/opendaylight/clustering/stub/pom.xml index a0863cfe0f..fd6077d29e 100644 --- a/opendaylight/clustering/stub/pom.xml +++ b/opendaylight/clustering/stub/pom.xml @@ -32,6 +32,7 @@ org.opendaylight.controller.clustering.stub.internal.Activator + ${project.basedir}/META-INF diff --git a/opendaylight/clustering/test/pom.xml b/opendaylight/clustering/test/pom.xml index f6047de994..161e7a9182 100644 --- a/opendaylight/clustering/test/pom.xml +++ b/opendaylight/clustering/test/pom.xml @@ -32,6 +32,7 @@ OSGI-INF/component.xml + ${project.basedir}/META-INF diff --git a/opendaylight/configuration/api/pom.xml b/opendaylight/configuration/api/pom.xml index 051d90b318..c7eeb3c6eb 100644 --- a/opendaylight/configuration/api/pom.xml +++ b/opendaylight/configuration/api/pom.xml @@ -30,6 +30,7 @@ org.opendaylight.controller.configuration + ${project.basedir}/META-INF diff --git a/opendaylight/configuration/implementation/pom.xml b/opendaylight/configuration/implementation/pom.xml index 5e5f5e2b2e..78e4de8d82 100644 --- a/opendaylight/configuration/implementation/pom.xml +++ b/opendaylight/configuration/implementation/pom.xml @@ -37,6 +37,7 @@ org.opendaylight.controller.configuration.internal.Activator + ${project.basedir}/META-INF diff --git a/opendaylight/containermanager/api/pom.xml b/opendaylight/containermanager/api/pom.xml index f4f741d638..ac6757fa30 100644 --- a/opendaylight/containermanager/api/pom.xml +++ b/opendaylight/containermanager/api/pom.xml @@ -36,6 +36,7 @@ org.opendaylight.controller.containermanager + ${project.basedir}/META-INF diff --git a/opendaylight/containermanager/implementation/pom.xml b/opendaylight/containermanager/implementation/pom.xml index 4ff13a4530..42ff3387f7 100644 --- a/opendaylight/containermanager/implementation/pom.xml +++ b/opendaylight/containermanager/implementation/pom.xml @@ -43,6 +43,7 @@ org.opendaylight.controller.containermanager.internal.Activator + ${project.basedir}/META-INF diff --git a/opendaylight/forwarding/staticrouting/pom.xml b/opendaylight/forwarding/staticrouting/pom.xml index 9ff4273812..f8749727f7 100644 --- a/opendaylight/forwarding/staticrouting/pom.xml +++ b/opendaylight/forwarding/staticrouting/pom.xml @@ -45,6 +45,7 @@ org.opendaylight.controller.forwarding.staticrouting.internal.Activator + ${project.basedir}/META-INF diff --git a/opendaylight/forwardingrulesmanager/api/pom.xml b/opendaylight/forwardingrulesmanager/api/pom.xml index ed3ec6094a..2fed2dc196 100644 --- a/opendaylight/forwardingrulesmanager/api/pom.xml +++ b/opendaylight/forwardingrulesmanager/api/pom.xml @@ -54,6 +54,7 @@ + ${project.basedir}/META-INF diff --git a/opendaylight/forwardingrulesmanager/implementation/pom.xml b/opendaylight/forwardingrulesmanager/implementation/pom.xml index 1dd2c0580b..df1095c76d 100644 --- a/opendaylight/forwardingrulesmanager/implementation/pom.xml +++ b/opendaylight/forwardingrulesmanager/implementation/pom.xml @@ -75,6 +75,7 @@ + ${project.basedir}/META-INF diff --git a/opendaylight/hosttracker/api/pom.xml b/opendaylight/hosttracker/api/pom.xml index ea895dad0c..5ed95e794f 100644 --- a/opendaylight/hosttracker/api/pom.xml +++ b/opendaylight/hosttracker/api/pom.xml @@ -42,6 +42,7 @@ org.osgi.framework + ${project.basedir}/META-INF diff --git a/opendaylight/hosttracker/implementation/pom.xml b/opendaylight/hosttracker/implementation/pom.xml index 82082425ec..35a2238b2a 100644 --- a/opendaylight/hosttracker/implementation/pom.xml +++ b/opendaylight/hosttracker/implementation/pom.xml @@ -67,6 +67,7 @@ + ${project.basedir}/META-INF diff --git a/opendaylight/logging/bridge/pom.xml b/opendaylight/logging/bridge/pom.xml index 1a65767753..266d83e8e3 100644 --- a/opendaylight/logging/bridge/pom.xml +++ b/opendaylight/logging/bridge/pom.xml @@ -30,6 +30,7 @@ org.opendaylight.controller.logging.bridge.internal.Activator + ${project.basedir}/META-INF diff --git a/opendaylight/northbound/commons/pom.xml b/opendaylight/northbound/commons/pom.xml index 6302392024..083a081d01 100644 --- a/opendaylight/northbound/commons/pom.xml +++ b/opendaylight/northbound/commons/pom.xml @@ -37,6 +37,7 @@ org.slf4j, + ${project.basedir}/META-INF diff --git a/opendaylight/northbound/flowprogrammer/pom.xml b/opendaylight/northbound/flowprogrammer/pom.xml index b360b39347..0a873ca065 100644 --- a/opendaylight/northbound/flowprogrammer/pom.xml +++ b/opendaylight/northbound/flowprogrammer/pom.xml @@ -55,6 +55,7 @@ /controller/nb/v2/flow + ${project.basedir}/src/main/resources/META-INF diff --git a/opendaylight/northbound/hosttracker/pom.xml b/opendaylight/northbound/hosttracker/pom.xml index 9b7647be2c..a26bbbd610 100644 --- a/opendaylight/northbound/hosttracker/pom.xml +++ b/opendaylight/northbound/hosttracker/pom.xml @@ -55,6 +55,7 @@ /controller/nb/v2/host + ${project.basedir}/src/main/resources/META-INF diff --git a/opendaylight/northbound/staticrouting/pom.xml b/opendaylight/northbound/staticrouting/pom.xml index 319de7ea54..823b76076c 100644 --- a/opendaylight/northbound/staticrouting/pom.xml +++ b/opendaylight/northbound/staticrouting/pom.xml @@ -56,6 +56,7 @@ /controller/nb/v2/staticroute + ${project.basedir}/src/main/resources/META-INF diff --git a/opendaylight/northbound/statistics/pom.xml b/opendaylight/northbound/statistics/pom.xml index 1f7f0ea73e..8a9799e9d9 100644 --- a/opendaylight/northbound/statistics/pom.xml +++ b/opendaylight/northbound/statistics/pom.xml @@ -64,6 +64,7 @@ /controller/nb/v2/statistics + ${project.basedir}/src/main/resources/META-INF diff --git a/opendaylight/northbound/subnets/pom.xml b/opendaylight/northbound/subnets/pom.xml index 196bf141fa..2d9e20b2ab 100644 --- a/opendaylight/northbound/subnets/pom.xml +++ b/opendaylight/northbound/subnets/pom.xml @@ -70,6 +70,7 @@ /controller/nb/v2/subnet + ${project.basedir}/src/main/resources/META-INF diff --git a/opendaylight/northbound/switchmanager/pom.xml b/opendaylight/northbound/switchmanager/pom.xml index 20893d0280..358eed3f2b 100644 --- a/opendaylight/northbound/switchmanager/pom.xml +++ b/opendaylight/northbound/switchmanager/pom.xml @@ -55,6 +55,7 @@ /controller/nb/v2/switch + ${project.basedir}/src/main/resources/META-INF diff --git a/opendaylight/northbound/topology/pom.xml b/opendaylight/northbound/topology/pom.xml index 9718fe2ce7..517492f39a 100644 --- a/opendaylight/northbound/topology/pom.xml +++ b/opendaylight/northbound/topology/pom.xml @@ -58,6 +58,7 @@ /controller/nb/v2/topology + ${project.basedir}/src/main/resources/META-INF diff --git a/opendaylight/protocol_plugins/openflow/pom.xml b/opendaylight/protocol_plugins/openflow/pom.xml index c95520c7ce..98d1ecf636 100644 --- 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 + ${project.basedir}/META-INF diff --git a/opendaylight/protocol_plugins/stub/pom.xml b/opendaylight/protocol_plugins/stub/pom.xml index a93965b482..faefe4c629 100644 --- 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 + ${project.basedir}/META-INF diff --git a/opendaylight/routing/dijkstra_implementation/pom.xml b/opendaylight/routing/dijkstra_implementation/pom.xml index 2aa0560937..e6c831d897 100644 --- 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 + ${project.basedir}/META-INF diff --git a/opendaylight/sal/api/pom.xml b/opendaylight/sal/api/pom.xml index 4803418e14..5551999856 100644 --- a/opendaylight/sal/api/pom.xml +++ b/opendaylight/sal/api/pom.xml @@ -46,6 +46,7 @@ org.opendaylight.controller.sal.reader + ${project.basedir}/META-INF diff --git a/opendaylight/sal/implementation/pom.xml b/opendaylight/sal/implementation/pom.xml index 9a05efe8e8..8d4da22295 100644 --- a/opendaylight/sal/implementation/pom.xml +++ b/opendaylight/sal/implementation/pom.xml @@ -43,6 +43,7 @@ org.opendaylight.controller.sal.implementation.internal.Activator + ${project.basedir}/META-INF diff --git a/opendaylight/samples/loadbalancer/pom.xml b/opendaylight/samples/loadbalancer/pom.xml index 06b9f597b3..ba3ee2fbd5 100644 --- a/opendaylight/samples/loadbalancer/pom.xml +++ b/opendaylight/samples/loadbalancer/pom.xml @@ -62,6 +62,7 @@ + ${project.basedir}/META-INF diff --git a/opendaylight/samples/northbound/loadbalancer/pom.xml b/opendaylight/samples/northbound/loadbalancer/pom.xml index d692c4e831..c736d0427a 100644 --- a/opendaylight/samples/northbound/loadbalancer/pom.xml +++ b/opendaylight/samples/northbound/loadbalancer/pom.xml @@ -55,6 +55,7 @@ /one/nb/v2/lb + ${project.basedir}/src/main/resources/META-INF diff --git a/opendaylight/samples/simpleforwarding/pom.xml b/opendaylight/samples/simpleforwarding/pom.xml index 76b6e4565d..f26f56b7eb 100644 --- a/opendaylight/samples/simpleforwarding/pom.xml +++ b/opendaylight/samples/simpleforwarding/pom.xml @@ -44,6 +44,7 @@ org.opendaylight.controller.samples.simpleforwarding.internal.Activator + ${project.basedir}/META-INF diff --git a/opendaylight/security/pom.xml b/opendaylight/security/pom.xml index 8eb3cc1166..6c689f1102 100644 --- a/opendaylight/security/pom.xml +++ b/opendaylight/security/pom.xml @@ -40,6 +40,7 @@ org.opendaylight.controller.security + ${project.basedir}/META-INF diff --git a/opendaylight/statisticsmanager/api/pom.xml b/opendaylight/statisticsmanager/api/pom.xml index e4ae95b3fc..7ee475ed2b 100644 --- a/opendaylight/statisticsmanager/api/pom.xml +++ b/opendaylight/statisticsmanager/api/pom.xml @@ -32,6 +32,7 @@ org.opendaylight.controller.statisticsmanager + ${project.basedir}/META-INF diff --git a/opendaylight/statisticsmanager/implementation/pom.xml b/opendaylight/statisticsmanager/implementation/pom.xml index 1786d003cd..98ddfa5e82 100644 --- a/opendaylight/statisticsmanager/implementation/pom.xml +++ b/opendaylight/statisticsmanager/implementation/pom.xml @@ -52,6 +52,7 @@ + ${project.basedir}/META-INF diff --git a/opendaylight/switchmanager/api/pom.xml b/opendaylight/switchmanager/api/pom.xml index 91f91f92a4..cc56d96869 100644 --- a/opendaylight/switchmanager/api/pom.xml +++ b/opendaylight/switchmanager/api/pom.xml @@ -57,6 +57,7 @@ org.apache.commons.lang3.builder + ${project.basedir}/META-INF diff --git a/opendaylight/switchmanager/implementation/pom.xml b/opendaylight/switchmanager/implementation/pom.xml index 55d3a3286d..128ab25873 100644 --- a/opendaylight/switchmanager/implementation/pom.xml +++ b/opendaylight/switchmanager/implementation/pom.xml @@ -60,6 +60,7 @@ org.opendaylight.controller.switchmanager.internal.Activator + ${project.basedir}/META-INF diff --git a/opendaylight/topologymanager/pom.xml b/opendaylight/topologymanager/pom.xml index 9a938f11a6..57a036b948 100755 --- a/opendaylight/topologymanager/pom.xml +++ b/opendaylight/topologymanager/pom.xml @@ -45,6 +45,7 @@ org.opendaylight.controller.topologymanager.internal.Activator + ${project.basedir}/META-INF diff --git a/opendaylight/usermanager/pom.xml b/opendaylight/usermanager/pom.xml index 7155164838..5e15c4cbfe 100644 --- a/opendaylight/usermanager/pom.xml +++ b/opendaylight/usermanager/pom.xml @@ -56,6 +56,7 @@ org.opendaylight.controller.usermanager.internal.Activator + ${project.basedir}/META-INF diff --git a/opendaylight/web/devices/pom.xml b/opendaylight/web/devices/pom.xml index 7bd88ab8c5..980717323d 100644 --- a/opendaylight/web/devices/pom.xml +++ b/opendaylight/web/devices/pom.xml @@ -77,6 +77,7 @@ /controller/web/devices + ${project.basedir}/src/main/resources/META-INF diff --git a/opendaylight/web/flows/pom.xml b/opendaylight/web/flows/pom.xml index 21fa22c806..eefaea3ca5 100644 --- a/opendaylight/web/flows/pom.xml +++ b/opendaylight/web/flows/pom.xml @@ -77,6 +77,7 @@ /controller/web/flows + ${project.basedir}/src/main/resources/META-INF diff --git a/opendaylight/web/root/pom.xml b/opendaylight/web/root/pom.xml index e35e96065c..76a7cb10aa 100644 --- a/opendaylight/web/root/pom.xml +++ b/opendaylight/web/root/pom.xml @@ -81,6 +81,7 @@ / + ${project.basedir}/src/main/resources/META-INF diff --git a/opendaylight/web/topology/pom.xml b/opendaylight/web/topology/pom.xml index 920f680706..2a8cb9fa1e 100644 --- a/opendaylight/web/topology/pom.xml +++ b/opendaylight/web/topology/pom.xml @@ -81,6 +81,7 @@ /controller/web/topology + ${project.basedir}/src/main/resources/META-INF diff --git a/opendaylight/web/troubleshoot/pom.xml b/opendaylight/web/troubleshoot/pom.xml index 0b7b794cbb..0d088826fd 100644 --- a/opendaylight/web/troubleshoot/pom.xml +++ b/opendaylight/web/troubleshoot/pom.xml @@ -79,6 +79,7 @@ /controller/web/troubleshoot + ${project.basedir}/src/main/resources/META-INF diff --git a/third-party/jersey-servlet/pom.xml b/third-party/jersey-servlet/pom.xml index dfb8968a5e..8c7d8e80b1 100644 --- a/third-party/jersey-servlet/pom.xml +++ b/third-party/jersey-servlet/pom.xml @@ -61,6 +61,7 @@ *;resolution:=optional + ${project.basedir}/META-INF diff --git a/third-party/net.sf.jung2/pom.xml b/third-party/net.sf.jung2/pom.xml index bfe59c59ca..b8f7155779 100644 --- a/third-party/net.sf.jung2/pom.xml +++ b/third-party/net.sf.jung2/pom.xml @@ -47,6 +47,7 @@ !* + ${project.basedir}/META-INF diff --git a/third-party/openflowj/pom.xml b/third-party/openflowj/pom.xml index 4daddf1162..0cc0597565 100644 --- a/third-party/openflowj/pom.xml +++ b/third-party/openflowj/pom.xml @@ -113,6 +113,7 @@ org.openflow.util;version="1.0.1" + ${project.basedir}/META-INF