Change generated MANIFEST.MF location 62/362/1
authorDavid Erickson <daviderickson@cs.stanford.edu>
Sat, 18 May 2013 22:34:44 +0000 (15:34 -0700)
committerDavid Erickson <daviderickson@cs.stanford.edu>
Sat, 18 May 2013 22:34:44 +0000 (15:34 -0700)
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>
47 files changed:
.gitignore
opendaylight/arphandler/pom.xml
opendaylight/clustering/services/pom.xml
opendaylight/clustering/services_implementation/pom.xml
opendaylight/clustering/stub/pom.xml
opendaylight/clustering/test/pom.xml
opendaylight/configuration/api/pom.xml
opendaylight/configuration/implementation/pom.xml
opendaylight/containermanager/api/pom.xml
opendaylight/containermanager/implementation/pom.xml
opendaylight/forwarding/staticrouting/pom.xml
opendaylight/forwardingrulesmanager/api/pom.xml
opendaylight/forwardingrulesmanager/implementation/pom.xml
opendaylight/hosttracker/api/pom.xml
opendaylight/hosttracker/implementation/pom.xml
opendaylight/logging/bridge/pom.xml
opendaylight/northbound/commons/pom.xml
opendaylight/northbound/flowprogrammer/pom.xml
opendaylight/northbound/hosttracker/pom.xml
opendaylight/northbound/staticrouting/pom.xml
opendaylight/northbound/statistics/pom.xml
opendaylight/northbound/subnets/pom.xml
opendaylight/northbound/switchmanager/pom.xml
opendaylight/northbound/topology/pom.xml
opendaylight/protocol_plugins/openflow/pom.xml
opendaylight/protocol_plugins/stub/pom.xml
opendaylight/routing/dijkstra_implementation/pom.xml
opendaylight/sal/api/pom.xml
opendaylight/sal/implementation/pom.xml
opendaylight/samples/loadbalancer/pom.xml
opendaylight/samples/northbound/loadbalancer/pom.xml
opendaylight/samples/simpleforwarding/pom.xml
opendaylight/security/pom.xml
opendaylight/statisticsmanager/api/pom.xml
opendaylight/statisticsmanager/implementation/pom.xml
opendaylight/switchmanager/api/pom.xml
opendaylight/switchmanager/implementation/pom.xml
opendaylight/topologymanager/pom.xml
opendaylight/usermanager/pom.xml
opendaylight/web/devices/pom.xml
opendaylight/web/flows/pom.xml
opendaylight/web/root/pom.xml
opendaylight/web/topology/pom.xml
opendaylight/web/troubleshoot/pom.xml
third-party/jersey-servlet/pom.xml
third-party/net.sf.jung2/pom.xml
third-party/openflowj/pom.xml

index f1f8a6e..b92845c 100644 (file)
@@ -11,3 +11,4 @@ target
 .classpath
 .project
 .settings
+MANIFEST.MF
index 6023904..e95512d 100644 (file)
@@ -37,6 +37,7 @@
           org.opendaylight.controller.arphandler.internal.Activator
                </Bundle-Activator>
          </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
        </configuration>
       </plugin>
     </plugins>
index 640e282..36462ba 100644 (file)
@@ -28,6 +28,7 @@
               javax.transaction
             </Import-Package>
          </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
        </configuration>
       </plugin>
     </plugins>
index d6a3936..6edb50b 100644 (file)
@@ -67,6 +67,7 @@
               true
             </Embed-Transitive>
          </instructions>
+        <manifestLocation>${project.basedir}/META-INF</manifestLocation>
        </configuration>
       </plugin>
       <plugin>
index a0863cf..fd6077d 100644 (file)
@@ -32,6 +32,7 @@
               org.opendaylight.controller.clustering.stub.internal.Activator
             </Bundle-Activator>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>
index f6047de..161e7a9 100644 (file)
@@ -32,6 +32,7 @@
               OSGI-INF/component.xml
             </Service-Component>
          </instructions>
+        <manifestLocation>${project.basedir}/META-INF</manifestLocation>
        </configuration>
       </plugin>
     </plugins>
index 051d90b..c7eeb3c 100644 (file)
@@ -30,6 +30,7 @@
               org.opendaylight.controller.configuration
            </Export-Package>
          </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
        </configuration>
       </plugin>
     </plugins>
index 5e5f5e2..78e4de8 100644 (file)
@@ -37,6 +37,7 @@
               org.opendaylight.controller.configuration.internal.Activator
             </Bundle-Activator>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>
index f4f741d..ac6757f 100644 (file)
@@ -36,6 +36,7 @@
               org.opendaylight.controller.containermanager
            </Export-Package>
          </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
        </configuration>
       </plugin>
     </plugins>
index 4ff13a4..42ff338 100644 (file)
@@ -43,6 +43,7 @@
               org.opendaylight.controller.containermanager.internal.Activator
             </Bundle-Activator>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>
index 9ff4273..f874972 100644 (file)
@@ -45,6 +45,7 @@
                  org.opendaylight.controller.forwarding.staticrouting.internal.Activator
                </Bundle-Activator>
          </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
        </configuration>
       </plugin>
     </plugins>
index ed3ec60..2fed2dc 100644 (file)
@@ -54,6 +54,7 @@
             <Service-Component>
             </Service-Component>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>
index 1dd2c05..df1095c 100644 (file)
@@ -75,6 +75,7 @@
             <Service-Component>
             </Service-Component>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
       <plugin>
index ea895da..5ed95e7 100644 (file)
@@ -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
index 8208242..35a2238 100644 (file)
@@ -67,6 +67,7 @@
                                                <Service-Component>
                                                </Service-Component>
                                        </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
                                </configuration>
                        </plugin>
                        <plugin>
index 1a65767..266d83e 100644 (file)
@@ -30,6 +30,7 @@
               org.opendaylight.controller.logging.bridge.internal.Activator
             </Bundle-Activator>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>
index 6302392..083a081 100644 (file)
@@ -37,6 +37,7 @@
               org.slf4j,                              
             </Import-Package>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>
index b360b39..0a873ca 100644 (file)
@@ -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>
index 9b7647b..a26bbbd 100644 (file)
@@ -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>
index 319de7e..823b760 100644 (file)
@@ -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>
index 1f7f0ea..8a9799e 100644 (file)
@@ -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>
index 196bf14..2d9e20b 100644 (file)
@@ -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>
index 20893d0..358eed3 100644 (file)
@@ -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>
index 9718fe2..517492f 100644 (file)
@@ -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>
index c95520c..98d1ecf 100644 (file)
@@ -53,6 +53,7 @@
               org.opendaylight.controller.protocol_plugin.openflow.internal.Activator
             </Bundle-Activator>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>
index a93965b..faefe4c 100644 (file)
@@ -42,6 +42,7 @@
               org.opendaylight.controller.protocol_plugins.stub.internal.Activator 
             </Bundle-Activator>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>
index 2aa0560..e6c831d 100644 (file)
@@ -41,6 +41,7 @@
           org.opendaylight.controller.routing.dijkstra_implementation.internal.Activator
         </Bundle-Activator>
       </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
     </configuration>
       </plugin>
     </plugins>
index 4803418..5551999 100644 (file)
@@ -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
index 9a05efe..8d4da22 100644 (file)
@@ -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
index 06b9f59..ba3ee2f 100644 (file)
@@ -62,6 +62,7 @@
                                                <Service-Component>
                                                </Service-Component>
                                        </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
                                </configuration>
                        </plugin>
                </plugins>
index d692c4e..c736d04 100644 (file)
@@ -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>
index 76b6e45..f26f56b 100644 (file)
@@ -44,6 +44,7 @@
                  org.opendaylight.controller.samples.simpleforwarding.internal.Activator
                        </Bundle-Activator>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>
index 8eb3cc1..6c689f1 100644 (file)
@@ -40,6 +40,7 @@
                                                org.opendaylight.controller.security
                                                </Export-Package>
                                        </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
                                </configuration>
                        </plugin>
                </plugins>
index e4ae95b..7ee475e 100644 (file)
@@ -32,6 +32,7 @@
               org.opendaylight.controller.statisticsmanager 
             </Export-Package>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>
index 1786d00..98ddfa5 100644 (file)
@@ -52,6 +52,7 @@
             <Export-Package>
             </Export-Package>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
       <plugin>
index 91f91f9..cc56d96 100644 (file)
@@ -57,6 +57,7 @@
               org.apache.commons.lang3.builder
             </Import-Package>
              </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
            </configuration>
       </plugin>
       <plugin>
index 55d3a32..128ab25 100644 (file)
@@ -60,6 +60,7 @@
                  org.opendaylight.controller.switchmanager.internal.Activator
             </Bundle-Activator>
              </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
            </configuration>
       </plugin>
       <plugin>
index 9a938f1..57a036b 100755 (executable)
@@ -45,6 +45,7 @@
           org.opendaylight.controller.topologymanager.internal.Activator
         </Bundle-Activator>
          </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
        </configuration>
       </plugin>
     </plugins>
index 7155164..5e15c4c 100644 (file)
@@ -56,6 +56,7 @@
                                                        org.opendaylight.controller.usermanager.internal.Activator
                                                </Bundle-Activator>
                                        </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
                                </configuration>
                        </plugin>
                </plugins>
index 7bd88ab..9807173 100644 (file)
@@ -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>
index 21fa22c..eefaea3 100644 (file)
@@ -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>
index e35e960..76a7cb1 100644 (file)
@@ -81,6 +81,7 @@
                                                </Export-Package>
                                                <Web-ContextPath>/</Web-ContextPath>
                                        </instructions>
+          <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
                                </configuration>
                        </plugin>
                </plugins>
index 920f680..2a8cb9f 100644 (file)
@@ -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>
index 0b7b794..0d08882 100644 (file)
@@ -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>
index dfb8968..8c7d8e8 100644 (file)
@@ -61,6 +61,7 @@
               *;resolution:=optional
             </Import-Package>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>
index bfe59c5..b8f7155 100644 (file)
@@ -47,6 +47,7 @@
               !*
             </Import-Package>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>
index 4daddf1..0cc0597 100644 (file)
              org.openflow.util;version="1.0.1"
            </Export-Package>
          </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
        </configuration>
       </plugin>
       <plugin>

©2013 OpenDaylight, A Linux Foundation Collaborative Project. All Rights Reserved.
OpenDaylight is a registered trademark of The OpenDaylight Project, Inc.
Linux Foundation and OpenDaylight are registered trademarks of the Linux Foundation.
Linux is a registered trademark of Linus Torvalds.