Merge changes I02c2af4b,If6adaabc,I559b92ff

* changes:
  Change generated MANIFEST.MF location
  Remove superfluous groupId.
  Add PDE OSGi launcher for the controller project

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 80d8598d452b8d2dc501d411e6dc33fcb7307afe..e95512dcd0a7637f90223890df79d0a6f2abeb38 100644 (file)
--- a/opendaylight/arphandler/pom.xml
+++ b/opendaylight/arphandler/pom.xml
@@ -9,7 +9,6 @@
     <relativePath>../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>arphandler</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -38,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/integrationtest/pom.xml b/opendaylight/clustering/integrationtest/pom.xml
index 24a59d2b7a7095f8d8691be2937ea7697e607f46..f94d205b5277be2fb1c335e8fd1830b5f73057e2 100644 (file)
--- a/opendaylight/clustering/integrationtest/pom.xml
+++ b/opendaylight/clustering/integrationtest/pom.xml
@@ -8,7 +8,6 @@
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>clustering.services.integrationtest</artifactId>
   <version>0.4.0-SNAPSHOT</version>
 

diff --git a/opendaylight/clustering/services/pom.xml b/opendaylight/clustering/services/pom.xml
index a5e09fa59effd24a90dd5e8e15f70d33e3b7e5f1..36462ba76a5c6daf5522b28617fe7b3962a4dc85 100644 (file)
--- a/opendaylight/clustering/services/pom.xml
+++ b/opendaylight/clustering/services/pom.xml
@@ -8,7 +8,6 @@
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>clustering.services</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -29,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 ee2f65d2c8fb166fc85230ade455e6ecf496168f..6edb50b82efe93b5cbf2a9c3ae1804e1da4bd90c 100644 (file)
--- a/opendaylight/clustering/services_implementation/pom.xml
+++ b/opendaylight/clustering/services_implementation/pom.xml
@@ -8,7 +8,6 @@
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>clustering.services-implementation</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -68,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 ab4ef5ad8664c0777a9dac66bb1d7b8ec53a28ae..fd6077d29ec532af5bca18ea5cc60b4411c10a1f 100644 (file)
--- a/opendaylight/clustering/stub/pom.xml
+++ b/opendaylight/clustering/stub/pom.xml
@@ -8,7 +8,6 @@
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>clustering.stub</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -33,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 7834a65e2789edf5c94b66a06908039785d93321..161e7a918234e89dd308bd22f6848af0539c3a85 100644 (file)
--- a/opendaylight/clustering/test/pom.xml
+++ b/opendaylight/clustering/test/pom.xml
@@ -8,7 +8,6 @@
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>clustering.test</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -33,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 3993b5e71fac9eacd0c47135a7f5866f1f701d8b..c7eeb3c6ebb3acecc68e3826c4d3ac1484847813 100644 (file)
--- a/opendaylight/configuration/api/pom.xml
+++ b/opendaylight/configuration/api/pom.xml
@@ -9,7 +9,6 @@
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>configuration</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -31,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 467e9ca1edaec8a3e656c6be2bca8873858df869..78e4de8d820a5b31c35d13bedc902334236fbf66 100644 (file)
--- a/opendaylight/configuration/implementation/pom.xml
+++ b/opendaylight/configuration/implementation/pom.xml
@@ -9,7 +9,6 @@
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>configuration.implementation</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -38,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 2b354752b3ee44de021ef055ed83ed2e37b1729c..ac6757fa30190558f68367cb67091d10ceed7c01 100644 (file)
--- a/opendaylight/containermanager/api/pom.xml
+++ b/opendaylight/containermanager/api/pom.xml
@@ -9,7 +9,6 @@
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>containermanager</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -37,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 9e2f5662ef38b78460ba34946cd2d216bbaf3761..42ff3387f7ff8e2ed7de26976789fde3d8712178 100644 (file)
--- a/opendaylight/containermanager/implementation/pom.xml
+++ b/opendaylight/containermanager/implementation/pom.xml
@@ -9,7 +9,6 @@
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>containermanager.implementation</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -44,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/distribution/opendaylight/opendaylight-local.target b/opendaylight/distribution/opendaylight/opendaylight-local.target
new file mode 100644 (file)
index 0000000..a7780fe
--- /dev/null
+++ b/opendaylight/distribution/opendaylight/opendaylight-local.target
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="opendaylight-local" sequenceNumber="6">
+<locations>
+<location path="${workspace_loc:/distribution.opendaylight/}/../p2site/target/repository" type="Directory"/>
+</locations>
+</target>

diff --git a/opendaylight/distribution/opendaylight/opendaylight-osgi-launcher-local.launch b/opendaylight/distribution/opendaylight/opendaylight-osgi-launcher-local.launch
new file mode 100644 (file)
index 0000000..2583735
--- /dev/null
+++ b/opendaylight/distribution/opendaylight/opendaylight-osgi-launcher-local.launch
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bad_container_name" value="/distribution.opendaylight/opendaylight-osgi-launche"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/opendaylight-osgi-launcher-local"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="default_auto_start" value="true"/>
+<intAttribute key="default_start_level" value="4"/>
+<booleanAttribute key="includeOptional" value="false"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true &#10;-Dosgi.noShutdown=true &#10;-Dorg.osgi.framework.system.packages.extra=sun.reflect,sun.reflect.misc,sun.misc&#10;-Dosgi.hook.configurators.include=org.eclipse.virgo.kernel.equinox.extensions.hooks.ExtensionsHookConfigurator&#10;-Dlogback.configurationFile=${project_loc:/distribution.opendaylight}/src/main/resources/configuration/logback.xml&#10;-Dorg.eclipse.gemini.web.tomcat.config.path=${project_loc:/distribution.opendaylight}/src/main/resources/configuration/tomcat-server.xml&#10;-Dosgi.frameworkClassPath=file:${project_loc:/distribution.opendaylight}/../p2site/target/repository/plugins/org.eclipse.equinox.launcher_1.3.0.v20120522-1813.jar,file:${project_loc:/distribution.opendaylight}/../p2site/target/repository/plugins/org.eclipse.virgo.kernel.equinox.extensions_3.6.0.RELEASE.jar,file:${project_loc:/distribution.opendaylight}/../p2site/target/repository/plugins/org.eclipse.osgi_3.8.1.v20120830-144521.jar"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="target_bundles" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,chameleon-mbeans@default:default,com.google.gson@default:default,com.springsource.org.aopalliance@default:default,com.sun.jersey.client@default:default,com.sun.jersey.core@default:default,com.sun.jersey.jersey-server@default:default,com.sun.jersey.json@default:default,jackson-core-asl@default:default,jackson-jaxrs@default:default,jackson-mapper-asl@default:default,javax.activation@default:default,javax.annotation@default:default,javax.ejb@default:default,javax.el@default:default,javax.mail.glassfish@default:default,javax.persistence@default:default,javax.servlet.jsp.jstl.impl@default:default,javax.servlet.jsp.jstl@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml.rpc@default:default,jcl.over.slf4j@default:default,log4j.over.slf4j@default:default,org.apache.catalina.ha@default:false,org.apache.catalina.tribes@default:false,org.apache.catalina@default:default,org.apache.commons.fileupload@default:default,org.apache.commons.io@default:default,org.apache.commons.lang3@default:default,org.apache.coyote@default:false,org.apache.el@default:default,org.apache.felix.dependencymanager.shell@default:default,org.apache.felix.dependencymanager@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.jasper@default:false,org.apache.juli.extras@default:default,org.apache.tomcat.api@default:default,org.apache.tomcat.util@default:false,org.codehaus.jettison.jettison@default:default,org.eclipse.equinox.cm@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.util@default:default,org.eclipse.gemini.web.core@default:default,org.eclipse.gemini.web.extender@default:default,org.eclipse.gemini.web.tomcat@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.virgo.kernel.equinox.extensions@default:false,org.eclipse.virgo.util.common@default:default,org.eclipse.virgo.util.io@default:default,org.eclipse.virgo.util.math@default:default,org.eclipse.virgo.util.osgi.manifest@default:default,org.eclipse.virgo.util.osgi@default:default,org.eclipse.virgo.util.parser.manifest@default:default,org.jboss.spec.javax.transaction.jboss-transaction-api_1.1_spec@default:default,org.springframework.aop@default:default,org.springframework.asm@default:default,org.springframework.beans@default:default,org.springframework.context.support@default:default,org.springframework.context@default:default,org.springframework.core@default:default,org.springframework.expression@default:default,org.springframework.security.config@default:default,org.springframework.security.core@default:default,org.springframework.security.taglibs@default:default,org.springframework.security.web@default:default,org.springframework.transaction@default:default,org.springframework.web.servlet@default:default,org.springframework.web@default:default,slf4j.api@default:default"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
+<stringAttribute key="workspace_bundles" value="org.opendaylight.controller.arphandler@default:default,org.opendaylight.controller.clustering.services-implementation@default:default,org.opendaylight.controller.clustering.services@default:default,org.opendaylight.controller.clustering.stub@default:default,org.opendaylight.controller.clustering.test@default:default,org.opendaylight.controller.commons.northbound@default:default,org.opendaylight.controller.configuration.implementation@default:default,org.opendaylight.controller.configuration@default:default,org.opendaylight.controller.containermanager.implementation@default:default,org.opendaylight.controller.containermanager@default:default,org.opendaylight.controller.devices.web@default:default,org.opendaylight.controller.flowprogrammer.northbound@default:default,org.opendaylight.controller.flows.web@default:default,org.opendaylight.controller.forwarding.staticrouting.northbound@default:default,org.opendaylight.controller.forwarding.staticrouting@default:default,org.opendaylight.controller.forwardingrulesmanager.implementation@default:default,org.opendaylight.controller.forwardingrulesmanager@default:default,org.opendaylight.controller.hosttracker.implementation@default:default,org.opendaylight.controller.hosttracker.northbound@default:default,org.opendaylight.controller.hosttracker@default:default,org.opendaylight.controller.logging.bridge@default:default,org.opendaylight.controller.protocol_plugins.openflow@default:default,org.opendaylight.controller.protocol_plugins.stub@default:default,org.opendaylight.controller.routing.dijkstra_implementation@default:default,org.opendaylight.controller.sal.implementation@default:default,org.opendaylight.controller.sal@default:default,org.opendaylight.controller.samples.loadbalancer.northbound@default:default,org.opendaylight.controller.samples.loadbalancer@default:default,org.opendaylight.controller.samples.simpleforwarding@default:default,org.opendaylight.controller.security@default:false,org.opendaylight.controller.statistics.northbound@default:default,org.opendaylight.controller.statisticsmanager.implementation@default:default,org.opendaylight.controller.statisticsmanager@default:default,org.opendaylight.controller.subnets.northbound@default:default,org.opendaylight.controller.switchmanager.implementation@default:default,org.opendaylight.controller.switchmanager.northbound@default:default,org.opendaylight.controller.switchmanager@default:default,org.opendaylight.controller.thirdparty.com.sun.jersey.jersey-servlet@default:default,org.opendaylight.controller.thirdparty.net.sf.jung2@default:default,org.opendaylight.controller.thirdparty.org.openflow.openflowj@default:default,org.opendaylight.controller.topology.northbound@default:default,org.opendaylight.controller.topology.web@default:default,org.opendaylight.controller.topologymanager@default:default,org.opendaylight.controller.troubleshoot.web@default:default,org.opendaylight.controller.usermanager@default:default,org.opendaylight.controller.web@default:default"/>
+</launchConfiguration>

diff --git a/opendaylight/distribution/opendaylight/opendaylight-osgi-launcher.launch b/opendaylight/distribution/opendaylight/opendaylight-osgi-launcher.launch
new file mode 100644 (file)
index 0000000..a802ee3
--- /dev/null
+++ b/opendaylight/distribution/opendaylight/opendaylight-osgi-launcher.launch
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bad_container_name" value="/distribution.opendaylight/opendaylight-osgi-launche"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/opendaylight-osgi-launcher"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="default_auto_start" value="true"/>
+<intAttribute key="default_start_level" value="4"/>
+<booleanAttribute key="includeOptional" value="false"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true &#10;-Dosgi.noShutdown=true &#10;-Dorg.osgi.framework.system.packages.extra=sun.reflect,sun.reflect.misc,sun.misc&#10;-Dosgi.hook.configurators.include=org.eclipse.virgo.kernel.equinox.extensions.hooks.ExtensionsHookConfigurator&#10;-Dlogback.configurationFile=${project_loc:/distribution.opendaylight}/src/main/resources/configuration/logback.xml&#10;-Dorg.eclipse.gemini.web.tomcat.config.path=${project_loc:/distribution.opendaylight}/src/main/resources/configuration/tomcat-server.xml&#10;-Dosgi.frameworkClassPath=file:${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/.bundle_pool/plugins/org.eclipse.equinox.launcher_1.3.0.v20120522-1813.jar,file:${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/.bundle_pool/plugins/org.eclipse.virgo.kernel.equinox.extensions_3.6.0.RELEASE.jar,file:${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/.bundle_pool/plugins/org.eclipse.osgi_3.8.1.v20120830-144521.jar"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="target_bundles" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,chameleon-mbeans@default:default,com.google.gson@default:default,com.springsource.org.aopalliance@default:default,com.sun.jersey.client@default:default,com.sun.jersey.core@default:default,com.sun.jersey.jersey-server@default:default,com.sun.jersey.json@default:default,jackson-core-asl@default:default,jackson-jaxrs@default:default,jackson-mapper-asl@default:default,javax.activation@default:default,javax.annotation@default:default,javax.ejb@default:default,javax.el@default:default,javax.mail.glassfish@default:default,javax.persistence@default:default,javax.servlet.jsp.jstl.impl@default:default,javax.servlet.jsp.jstl@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml.rpc@default:default,jcl.over.slf4j@default:default,log4j.over.slf4j@default:default,org.apache.catalina.ha@default:false,org.apache.catalina.tribes@default:false,org.apache.catalina@default:default,org.apache.commons.fileupload@default:default,org.apache.commons.io@default:default,org.apache.commons.lang3@default:default,org.apache.coyote@default:false,org.apache.el@default:default,org.apache.felix.dependencymanager.shell@default:default,org.apache.felix.dependencymanager@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.jasper@default:false,org.apache.juli.extras@default:default,org.apache.tomcat.api@default:default,org.apache.tomcat.util@default:false,org.codehaus.jettison.jettison@default:default,org.eclipse.equinox.cm@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.util@default:default,org.eclipse.gemini.web.core@default:default,org.eclipse.gemini.web.extender@default:default,org.eclipse.gemini.web.tomcat@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.virgo.kernel.equinox.extensions@default:false,org.eclipse.virgo.util.common@default:default,org.eclipse.virgo.util.io@default:default,org.eclipse.virgo.util.math@default:default,org.eclipse.virgo.util.osgi.manifest@default:default,org.eclipse.virgo.util.osgi@default:default,org.eclipse.virgo.util.parser.manifest@default:default,org.jboss.spec.javax.transaction.jboss-transaction-api_1.1_spec@default:default,org.springframework.aop@default:default,org.springframework.asm@default:default,org.springframework.beans@default:default,org.springframework.context.support@default:default,org.springframework.context@default:default,org.springframework.core@default:default,org.springframework.expression@default:default,org.springframework.security.config@default:default,org.springframework.security.core@default:default,org.springframework.security.taglibs@default:default,org.springframework.security.web@default:default,org.springframework.transaction@default:default,org.springframework.web.servlet@default:default,org.springframework.web@default:default,slf4j.api@default:default"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
+<stringAttribute key="workspace_bundles" value="org.opendaylight.controller.arphandler@default:default,org.opendaylight.controller.clustering.services-implementation@default:default,org.opendaylight.controller.clustering.services@default:default,org.opendaylight.controller.clustering.stub@default:default,org.opendaylight.controller.clustering.test@default:default,org.opendaylight.controller.commons.northbound@default:default,org.opendaylight.controller.configuration.implementation@default:default,org.opendaylight.controller.configuration@default:default,org.opendaylight.controller.containermanager.implementation@default:default,org.opendaylight.controller.containermanager@default:default,org.opendaylight.controller.devices.web@default:default,org.opendaylight.controller.flowprogrammer.northbound@default:default,org.opendaylight.controller.flows.web@default:default,org.opendaylight.controller.forwarding.staticrouting.northbound@default:default,org.opendaylight.controller.forwarding.staticrouting@default:default,org.opendaylight.controller.forwardingrulesmanager.implementation@default:default,org.opendaylight.controller.forwardingrulesmanager@default:default,org.opendaylight.controller.hosttracker.implementation@default:default,org.opendaylight.controller.hosttracker.northbound@default:default,org.opendaylight.controller.hosttracker@default:default,org.opendaylight.controller.logging.bridge@default:default,org.opendaylight.controller.protocol_plugins.openflow@default:default,org.opendaylight.controller.protocol_plugins.stub@default:default,org.opendaylight.controller.routing.dijkstra_implementation@default:default,org.opendaylight.controller.sal.implementation@default:default,org.opendaylight.controller.sal@default:default,org.opendaylight.controller.samples.loadbalancer.northbound@default:default,org.opendaylight.controller.samples.loadbalancer@default:default,org.opendaylight.controller.samples.simpleforwarding@default:default,org.opendaylight.controller.security@default:false,org.opendaylight.controller.statistics.northbound@default:default,org.opendaylight.controller.statisticsmanager.implementation@default:default,org.opendaylight.controller.statisticsmanager@default:default,org.opendaylight.controller.subnets.northbound@default:default,org.opendaylight.controller.switchmanager.implementation@default:default,org.opendaylight.controller.switchmanager.northbound@default:default,org.opendaylight.controller.switchmanager@default:default,org.opendaylight.controller.thirdparty.com.sun.jersey.jersey-servlet@default:default,org.opendaylight.controller.thirdparty.net.sf.jung2@default:default,org.opendaylight.controller.thirdparty.org.openflow.openflowj@default:default,org.opendaylight.controller.topology.northbound@default:default,org.opendaylight.controller.topology.web@default:default,org.opendaylight.controller.topologymanager@default:default,org.opendaylight.controller.troubleshoot.web@default:default,org.opendaylight.controller.usermanager@default:default,org.opendaylight.controller.web@default:default"/>
+</launchConfiguration>

diff --git a/opendaylight/distribution/opendaylight/opendaylight.target b/opendaylight/distribution/opendaylight/opendaylight.target
new file mode 100644 (file)
index 0000000..c714f56
--- /dev/null
+++ b/opendaylight/distribution/opendaylight/opendaylight.target
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="opendaylight" sequenceNumber="3">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="com.springsource.org.aopalliance" version="1.0.0"/>
+<unit id="org.apache.el" version="7.0.32.v201211081135"/>
+<unit id="org.apache.felix.dependencymanager" version="3.1.0"/>
+<unit id="org.apache.felix.dependencymanager.shell" version="3.0.1"/>
+<unit id="org.apache.felix.gogo.command" version="0.8.0.v201108120515"/>
+<unit id="org.apache.felix.gogo.runtime" version="0.8.0.v201108120515"/>
+<unit id="org.apache.felix.gogo.shell" version="0.8.0.v201110170705"/>
+<unit id="javax.activation" version="1.1.0.v201211130549"/>
+<unit id="org.apache.jasper" version="7.0.32.v201211201952"/>
+<unit id="org.apache.juli.extras" version="7.0.32.v201211081135"/>
+<unit id="org.apache.tomcat.api" version="7.0.32.v201211081135"/>
+<unit id="org.apache.catalina" version="7.0.32.v201211201336"/>
+<unit id="org.apache.catalina.ha" version="7.0.32.v201211201952"/>
+<unit id="org.apache.catalina.tribes" version="7.0.32.v201211201952"/>
+<unit id="org.apache.coyote" version="7.0.32.v201211201952"/>
+<unit id="org.apache.tomcat.util" version="7.0.32.v201211201952"/>
+<unit id="org.eclipse.virgo.util.common" version="3.6.0.RELEASE"/>
+<unit id="org.apache.commons.fileupload" version="1.2.2"/>
+<unit id="org.apache.commons.io" version="2.3.0"/>
+<unit id="org.apache.commons.lang3" version="3.1.0"/>
+<unit id="org.eclipse.equinox.cm" version="1.0.400.v20120522-1841"/>
+<unit id="org.eclipse.equinox.console" version="1.0.0.v20120522-1841"/>
+<unit id="jackson-mapper-asl" version="1.9.8"/>
+<unit id="org.eclipse.equinox.ds" version="1.4.0.v20120522-1841"/>
+<unit id="org.eclipse.jdt.core.compiler.batch" version="3.8.0.I20120518-2145"/>
+<unit id="org.eclipse.equinox.launcher" version="1.3.0.v20120522-1813"/>
+<unit id="org.eclipse.virgo.kernel.equinox.extensions" version="3.6.0.RELEASE"/>
+<unit id="org.eclipse.equinox.util" version="1.0.400.v20120522-2049"/>
+<unit id="org.eclipse.gemini.web.core" version="2.2.0.RELEASE"/>
+<unit id="org.eclipse.gemini.web.extender" version="2.2.0.RELEASE"/>
+<unit id="org.eclipse.gemini.web.tomcat" version="2.2.0.RELEASE"/>
+<unit id="com.google.gson" version="2.1.0"/>
+<unit id="org.eclipse.virgo.util.io" version="3.6.0.RELEASE"/>
+<unit id="jackson-core-asl" version="1.9.8"/>
+<unit id="javax.ejb" version="3.1.1.v201204261316"/>
+<unit id="org.eclipse.virgo.util.parser.manifest" version="3.6.0.RELEASE"/>
+<unit id="javax.persistence" version="2.0.4.v201112161009"/>
+<unit id="javax.servlet.jsp.jstl" version="1.2.0.v201105211821"/>
+<unit id="org.jboss.spec.javax.transaction.jboss-transaction-api_1.1_spec" version="1.0.1.Final"/>
+<unit id="javax.servlet.jsp.jstl.impl" version="1.2.0.v201210211230"/>
+<unit id="javax.el" version="2.2.0.v201108011116"/>
+<unit id="javax.annotation" version="1.1.0.v201209060031"/>
+<unit id="javax.mail.glassfish" version="1.4.1.v201108011116"/>
+<unit id="javax.xml.rpc" version="1.1.0.v201005080400"/>
+<unit id="jackson-jaxrs" version="1.9.8"/>
+<unit id="jcl.over.slf4j" version="1.7.2"/>
+<unit id="com.sun.jersey.client" version="1.17.0"/>
+<unit id="com.sun.jersey.core" version="1.17.0"/>
+<unit id="com.sun.jersey.json" version="1.17.0"/>
+<unit id="com.sun.jersey.jersey-server" version="1.17.0"/>
+<unit id="org.codehaus.jettison.jettison" version="1.3.3"/>
+<unit id="javax.servlet.jsp" version="2.2.0.v201112011158"/>
+<unit id="log4j.over.slf4j" version="1.7.2"/>
+<unit id="ch.qos.logback.classic" version="1.0.9"/>
+<unit id="ch.qos.logback.core" version="1.0.9"/>
+<unit id="org.eclipse.virgo.util.math" version="3.6.0.RELEASE"/>
+<unit id="org.eclipse.virgo.util.osgi.manifest" version="3.6.0.RELEASE"/>
+<unit id="org.eclipse.osgi.services" version="3.3.100.v20120522-1822"/>
+<unit id="org.eclipse.osgi" version="3.8.1.v20120830-144521"/>
+<unit id="org.eclipse.virgo.util.osgi" version="3.6.0.RELEASE"/>
+<unit id="chameleon-mbeans" version="1.0.0"/>
+<unit id="javax.servlet" version="3.0.0.v201112011016"/>
+<unit id="slf4j.api" version="1.7.2"/>
+<unit id="org.springframework.aop" version="3.1.3.RELEASE"/>
+<unit id="org.springframework.asm" version="3.1.3.RELEASE"/>
+<unit id="org.springframework.beans" version="3.1.3.RELEASE"/>
+<unit id="org.springframework.context" version="3.1.3.RELEASE"/>
+<unit id="org.springframework.context.support" version="3.1.3.RELEASE"/>
+<unit id="org.springframework.core" version="3.1.3.RELEASE"/>
+<unit id="org.springframework.expression" version="3.1.3.RELEASE"/>
+<unit id="org.springframework.security.core" version="3.1.3.RELEASE"/>
+<unit id="org.springframework.security.config" version="3.1.3.RELEASE"/>
+<unit id="org.springframework.security.taglibs" version="3.1.3.RELEASE"/>
+<unit id="org.springframework.security.web" version="3.1.3.RELEASE"/>
+<unit id="org.springframework.transaction" version="3.1.3.RELEASE"/>
+<unit id="org.springframework.web" version="3.1.3.RELEASE"/>
+<unit id="org.springframework.web.servlet" version="3.1.3.RELEASE"/>
+<repository location="https://jenkins.opendaylight.org/controller/job/controller-merge/lastSuccessfulBuild/artifact/opendaylight/distribution/p2site/target/repository/"/>
+</location>
+</locations>
+</target>

diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml
index 986f074fa35286967c45205029eaa5a61f545eae..51885febcb1de1e917e04f46cee5756d8d317953 100644 (file)
--- a/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@ -26,7 +26,6 @@
     </repository>
   </repositories>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>distribution.opendaylight</artifactId>
   <version>0.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>

diff --git a/opendaylight/distribution/p2site/opendayligh-target-platform-p2site.launch b/opendaylight/distribution/p2site/opendayligh-target-platform-p2site.launch
new file mode 100644 (file)
index 0000000..d6e307f
--- /dev/null
+++ b/opendaylight/distribution/p2site/opendayligh-target-platform-p2site.launch
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+<stringAttribute key="M2_GOALS" value="clean org.reficio:p2-maven-plugin:site"/>
+<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+<booleanAttribute key="M2_OFFLINE" value="false"/>
+<stringAttribute key="M2_PROFILES" value=""/>
+<listAttribute key="M2_PROPERTIES"/>
+<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="true"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
+<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.m2e.launching.MavenSourceLocator"/>
+<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;sourceLookupDirector&gt;&#10;&lt;sourceContainers duplicates=&quot;false&quot;/&gt;&#10;&lt;/sourceLookupDirector&gt;&#10;"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx768m -XX:MaxPermSize=256m"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/distribution.p2site}"/>
+</launchConfiguration>

diff --git a/opendaylight/distribution/p2site/pom.xml b/opendaylight/distribution/p2site/pom.xml
new file mode 100644 (file)
index 0000000..2efb674
--- /dev/null
+++ b/opendaylight/distribution/p2site/pom.xml
@@ -0,0 +1,449 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <prerequisites>
+    <maven>3.0</maven>
+  </prerequisites>
+
+  <!-- p2site distribution is created with the intention of providing a -->
+  <!-- target platform that could be use for PDE to create an OSGi -->
+  <!-- launcher, this should allow to enable the hot code replacement on -->
+  <!-- the controller. -->
+
+  <parent>
+    <groupId>org.opendaylight.controller</groupId>
+    <artifactId>commons.opendaylight</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <relativePath>../../commons/opendaylight</relativePath>
+  </parent>
+
+  <pluginRepositories>
+    <pluginRepository>
+      <id>reficio</id>
+      <url>${nexusproxy}/repositories/reficioplugin/</url>
+    </pluginRepository>
+  </pluginRepositories>
+
+  <groupId>org.opendaylight.controller</groupId>
+  <artifactId>distribution.p2site</artifactId>
+  <version>0.1.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.reficio</groupId>
+        <artifactId>p2-maven-plugin</artifactId>
+        <version>1.0.0</version>
+        <executions>
+          <execution>
+            <id>default-cli</id>
+            <configuration>
+              <pedantic>true</pedantic>
+              <artifacts>
+                <artfiact>
+                  <id>org.slf4j:jcl-over-slf4j:${slf4j.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>org.slf4j:slf4j-api:${slf4j.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>org.slf4j:log4j-over-slf4j:${slf4j.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>ch.qos.logback:logback-core:${logback.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>ch.qos.logback:logback-classic:${logback.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>org.codehaus.jackson:jackson-mapper-asl:${jackson.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>org.codehaus.jackson:jackson-core-asl:${jackson.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>org.codehaus.jackson:jackson-jaxrs:${jackson.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>org.codehaus.jettison:jettison:1.3.3</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>commons-io:commons-io:2.3</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>commons-fileupload:commons-fileupload:1.2.2</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>equinoxSDK381:javax.servlet:3.0.0.v201112011016</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>equinoxSDK381:javax.servlet.jsp:2.2.0.v201112011158</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>equinoxSDK381:org.eclipse.equinox.ds:1.4.0.v20120522-1841</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>equinoxSDK381:org.eclipse.equinox.util:1.0.400.v20120522-2049</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>equinoxSDK381:org.eclipse.osgi.services:3.3.100.v20120522-1822</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>equinoxSDK381:org.eclipse.osgi:3.8.1.v20120830-144521</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>equinoxSDK381:org.apache.felix.gogo.command:0.8.0.v201108120515</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>equinoxSDK381:org.apache.felix.gogo.runtime:0.8.0.v201108120515</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>equinoxSDK381:org.apache.felix.gogo.shell:0.8.0.v201110170705</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>equinoxSDK381:org.eclipse.equinox.cm:1.0.400.v20120522-1841</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>equinoxSDK381:org.eclipse.equinox.console:1.0.0.v20120522-1841</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>equinoxSDK381:org.eclipse.equinox.launcher:1.3.0.v20120522-1813</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>geminiweb:org.eclipse.gemini.web.core:${geminiweb.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>geminiweb:org.eclipse.gemini.web.extender:${geminiweb.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>geminiweb:org.eclipse.gemini.web.tomcat:${geminiweb.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>geminiweb:org.eclipse.virgo.kernel.equinox.extensions:${virgo.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>geminiweb:org.eclipse.virgo.util.common:${virgo.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>geminiweb:org.eclipse.virgo.util.io:${virgo.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>geminiweb:org.eclipse.virgo.util.math:${virgo.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>geminiweb:org.eclipse.virgo.util.osgi:${virgo.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>geminiweb:org.eclipse.virgo.util.osgi.manifest:${virgo.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>geminiweb:org.eclipse.virgo.util.parser.manifest:${virgo.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>org.apache.felix:org.apache.felix.dependencymanager:3.1.0</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>org.apache.felix:org.apache.felix.dependencymanager.shell:3.0.1</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>com.google.code.gson:gson:2.1</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.1.Final</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>org.apache.commons:commons-lang3:3.1</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>virgomirror:org.eclipse.jdt.core.compiler.batch:3.8.0.I20120518-2145</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>eclipselink:javax.persistence:2.0.4.v201112161009</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>orbit:javax.activation:1.1.0.v201211130549</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>orbit:javax.annotation:1.1.0.v201209060031</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>orbit:javax.ejb:3.1.1.v201204261316</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>orbit:javax.el:2.2.0.v201108011116</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>orbit:javax.mail.glassfish:1.4.1.v201108011116</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>orbit:javax.xml.rpc:1.1.0.v201005080400</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>orbit:org.apache.catalina:7.0.32.v201211201336</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>orbit:org.apache.catalina.ha:7.0.32.v201211201952</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>orbit:org.apache.catalina.tribes:7.0.32.v201211201952</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>orbit:org.apache.coyote:7.0.32.v201211201952</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>orbit:org.apache.el:7.0.32.v201211081135</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>orbit:org.apache.jasper:7.0.32.v201211201952</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>orbit:org.apache.juli.extras:7.0.32.v201211081135</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>orbit:org.apache.tomcat.api:7.0.32.v201211081135</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>orbit:org.apache.tomcat.util:7.0.32.v201211201952</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>orbit:javax.servlet.jsp.jstl:1.2.0.v201105211821</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>orbit:javax.servlet.jsp.jstl.impl:1.2.0.v201210211230</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>org.springframework:org.springframework.asm:${spring.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>org.springframework:org.springframework.aop:${spring.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>org.springframework:org.springframework.context:${spring.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>org.springframework:org.springframework.context.support:${spring.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>org.springframework:org.springframework.core:${spring.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>org.springframework:org.springframework.beans:${spring.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>org.springframework:org.springframework.expression:${spring.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>org.springframework:org.springframework.web:${spring.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>org.aopalliance:com.springsource.org.aopalliance:1.0.0</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>org.springframework:org.springframework.web.servlet:${spring.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>org.springframework.security:spring-security-config:${spring-security.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>org.springframework.security:spring-security-core:${spring-security.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>org.springframework.security:spring-security-web:${spring-security.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>org.springframework.security:spring-security-taglibs:${spring-security.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>org.springframework:org.springframework.transaction:${spring-security.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>org.ow2.chameleon.management:chameleon-mbeans:1.0.0</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>com.sun.jersey:jersey-core:${jersey.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>com.sun.jersey:jersey-server:${jersey.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>com.sun.jersey:jersey-client:${jersey.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+                <artfiact>
+                  <id>com.sun.jersey:jersey-json:${jersey.version}</id>
+                  <transitive>false</transitive>
+                  <override>false</override>
+                </artfiact>
+              </artifacts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>jetty-maven-plugin</artifactId>
+        <version>8.1.5.v20120716</version>
+        <configuration>
+          <scanIntervalSeconds>10</scanIntervalSeconds>
+          <webAppSourceDirectory>${basedir}/target/repository/</webAppSourceDirectory>
+          <webApp>
+            <contextPath>/site</contextPath>
+          </webApp>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

diff --git a/opendaylight/forwarding/staticrouting/pom.xml b/opendaylight/forwarding/staticrouting/pom.xml
index 28f3e25d4142771154c073c52aeda468532b26af..f8749727f7f06daacc8d82924b1ef1373eabf24a 100644 (file)
--- a/opendaylight/forwarding/staticrouting/pom.xml
+++ b/opendaylight/forwarding/staticrouting/pom.xml
@@ -8,7 +8,6 @@
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>forwarding.staticrouting</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -46,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 382b11d4a3a1186bd4070557cbc4da114889b58a..2fed2dc1960977c262f9c10a43988a733f1ff834 100644 (file)
--- a/opendaylight/forwardingrulesmanager/api/pom.xml
+++ b/opendaylight/forwardingrulesmanager/api/pom.xml
@@ -9,7 +9,6 @@
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>forwardingrulesmanager</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -55,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 d9faed36b9098fe94264a35639244e756e8ab493..df1095c76d64adcaaa327207da772bb305f7d258 100644 (file)
--- a/opendaylight/forwardingrulesmanager/implementation/pom.xml
+++ b/opendaylight/forwardingrulesmanager/implementation/pom.xml
@@ -10,7 +10,6 @@
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>forwardingrulesmanager.implementation</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -76,6 +75,7 @@
             <Service-Component>
             </Service-Component>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
       <plugin>

diff --git a/opendaylight/forwardingrulesmanager/integrationtest/pom.xml b/opendaylight/forwardingrulesmanager/integrationtest/pom.xml
index 7967d6f96991dc46b4ce32a30f9e31d7f2896d2c..31371da03825f6b01fc511a09c9135ceedef4f18 100644 (file)
--- a/opendaylight/forwardingrulesmanager/integrationtest/pom.xml
+++ b/opendaylight/forwardingrulesmanager/integrationtest/pom.xml
@@ -10,7 +10,6 @@
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>forwardingrulesmanager.integrationtest</artifactId>
   <version>0.4.0-SNAPSHOT</version>
 

diff --git a/opendaylight/hosttracker/api/pom.xml b/opendaylight/hosttracker/api/pom.xml
index f60b386baf5e0f991911e1bd2453ea168408b85b..5ed95e794fa9a1919ca1a4f785a4f99ae76975fa 100644 (file)
--- a/opendaylight/hosttracker/api/pom.xml
+++ b/opendaylight/hosttracker/api/pom.xml
@@ -8,7 +8,6 @@
                <version>1.4.0-SNAPSHOT</version>\r
                <relativePath>../../commons/opendaylight</relativePath>\r
        </parent>\r
-       <groupId>org.opendaylight.controller</groupId>\r
        <artifactId>hosttracker</artifactId>\r
        <version>0.4.0-SNAPSHOT</version>\r
        <packaging>bundle</packaging>\r
@@ -43,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 e7788d999ab42482b767e6ab812567fa7c60f7c0..35a2238b2a3a5980af9d1b8d3abb362ab2d57a70 100644 (file)
--- a/opendaylight/hosttracker/implementation/pom.xml
+++ b/opendaylight/hosttracker/implementation/pom.xml
@@ -9,7 +9,6 @@
                <version>1.4.0-SNAPSHOT</version>
                <relativePath>../../commons/opendaylight</relativePath>
        </parent>
-       <groupId>org.opendaylight.controller</groupId>
        <artifactId>hosttracker.implementation</artifactId>
        <version>0.4.0-SNAPSHOT</version>
        <packaging>bundle</packaging>
@@ -68,6 +67,7 @@
                                                <Service-Component>
                                                </Service-Component>
                                        </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
                                </configuration>
                        </plugin>
                        <plugin>

diff --git a/opendaylight/hosttracker/integrationtest/pom.xml b/opendaylight/hosttracker/integrationtest/pom.xml
index d68189ad0f47e1d096eb1b9d09ec21d9080837fb..e3aaad748a0ba3bd66ba5026bc2d8c2decf90d1d 100644 (file)
--- a/opendaylight/hosttracker/integrationtest/pom.xml
+++ b/opendaylight/hosttracker/integrationtest/pom.xml
@@ -9,7 +9,6 @@
     <relativePath>../../../opendaylight/commons/opendaylight</relativePath>\r
   </parent>\r
 \r
-  <groupId>org.opendaylight.controller</groupId>\r
   <artifactId>hosttracker.integrationtest</artifactId>\r
   <version>0.4.0-SNAPSHOT</version>\r
   \r

diff --git a/opendaylight/logging/bridge/pom.xml b/opendaylight/logging/bridge/pom.xml
index ba0ace7e0e70858e03d2030dc82ad6048b87688b..266d83e8e3b26884c7f5801764ba8d6df9d45f1a 100644 (file)
--- a/opendaylight/logging/bridge/pom.xml
+++ b/opendaylight/logging/bridge/pom.xml
@@ -8,7 +8,6 @@
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>logging.bridge</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -31,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 3756e3d51d61b7a88742a0398cfbed1c11966d01..083a081d013691e2cb9de1430cc5410a5b33adf9 100644 (file)
--- a/opendaylight/northbound/commons/pom.xml
+++ b/opendaylight/northbound/commons/pom.xml
@@ -8,7 +8,6 @@
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>commons.northbound</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -38,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 e28454ffc159c0a1e877b5a3259304891303d42c..0a873ca0651013728d404a71798d670ac8b03eb2 100644 (file)
--- a/opendaylight/northbound/flowprogrammer/pom.xml
+++ b/opendaylight/northbound/flowprogrammer/pom.xml
@@ -8,7 +8,6 @@
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>flowprogrammer.northbound</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -56,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 374b98418f7eae9a52ac52079cfff6bb06b5af1d..a26bbbd610b4bd38f9dd2c257632e58c5adabc98 100644 (file)
--- a/opendaylight/northbound/hosttracker/pom.xml
+++ b/opendaylight/northbound/hosttracker/pom.xml
@@ -7,7 +7,6 @@
     <version>1.4.0-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>hosttracker.northbound</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -56,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 3e76e0637fb6a7acbd965f41ffffcdf328e9ebcc..823b76076cf8999bf0723d4750531f1152f6a2ed 100644 (file)
--- a/opendaylight/northbound/staticrouting/pom.xml
+++ b/opendaylight/northbound/staticrouting/pom.xml
@@ -8,7 +8,6 @@
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>forwarding.staticrouting.northbound</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -57,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 326c9324fbd1b0e5c5cbe5b3aead761cf4d251c1..8a9799e9d9e9915f270ec13547527f79e1a93b0d 100644 (file)
--- a/opendaylight/northbound/statistics/pom.xml
+++ b/opendaylight/northbound/statistics/pom.xml
@@ -7,8 +7,7 @@
     <version>1.4.0-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
-  
-  <groupId>org.opendaylight.controller</groupId>
+
   <artifactId>statistics.northbound</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -65,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 3abb1be9c634cb8a34321dd053cafa74377d123c..2d9e20b2abd1d910516c2ce439288ccdc9b6b82c 100644 (file)
--- a/opendaylight/northbound/subnets/pom.xml
+++ b/opendaylight/northbound/subnets/pom.xml
@@ -8,7 +8,6 @@
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>subnets.northbound</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -71,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 7a97e176d5aa576908441bbb3462690e141e58e9..358eed3f2b5d10ad7e2101f080f67da989d33f57 100644 (file)
--- a/opendaylight/northbound/switchmanager/pom.xml
+++ b/opendaylight/northbound/switchmanager/pom.xml
@@ -7,7 +7,6 @@
     <version>1.4.0-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>switchmanager.northbound</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -56,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 b8eebe4a0feb92ccc59a4988566d5647e5b063ed..517492f39a56444749e06bab1a188a4573c11221 100644 (file)
--- a/opendaylight/northbound/topology/pom.xml
+++ b/opendaylight/northbound/topology/pom.xml
@@ -8,7 +8,6 @@
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>topology.northbound</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -59,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 23c0d9d90e3ff9b0fe3bb48713d45a6201c7a299..98d1ecf6369cc12f63afff93042b17ed2154bbd6 100644 (file)
--- a/opendaylight/protocol_plugins/openflow/pom.xml
+++ b/opendaylight/protocol_plugins/openflow/pom.xml
@@ -8,7 +8,6 @@
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>protocol_plugins.openflow</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -54,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 c257099825317f3d6e788f8caad48d320b2b9741..faefe4c629012771c238218dc3ec55c299bd668e 100644 (file)
--- a/opendaylight/protocol_plugins/stub/pom.xml
+++ b/opendaylight/protocol_plugins/stub/pom.xml
@@ -8,7 +8,6 @@
     <version>1.4.0-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>protocol_plugins.stub</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -43,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 06a684f26591fc2b14392dae3dcf8e4a7f7fb3e4..e6c831d897b914cc8afaa9e6abe7566f75e1fcfe 100644 (file)
--- a/opendaylight/routing/dijkstra_implementation/pom.xml
+++ b/opendaylight/routing/dijkstra_implementation/pom.xml
@@ -8,7 +8,6 @@
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>routing.dijkstra_implementation</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -42,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 e49ae8dbfdcfc451ff21c781ccfc2eea9f5331ed..5551999856fbbb9a79ad2011c31a4c6c8b20e2a4 100644 (file)
--- a/opendaylight/sal/api/pom.xml
+++ b/opendaylight/sal/api/pom.xml
@@ -8,7 +8,6 @@
     <relativePath>../../commons/opendaylight</relativePath>\r
   </parent>\r
 \r
-  <groupId>org.opendaylight.controller</groupId>\r
   <artifactId>sal</artifactId>\r
   <version>0.5.0-SNAPSHOT</version>\r
   <packaging>bundle</packaging>\r
@@ -47,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 57ccc4a9d7df6c8b39db1bebe741556b99e454ad..8d4da22295689a8c3cef1b0d1875492a8b11502a 100644 (file)
--- a/opendaylight/sal/implementation/pom.xml
+++ b/opendaylight/sal/implementation/pom.xml
@@ -8,7 +8,6 @@
     <relativePath>../../commons/opendaylight</relativePath>\r
   </parent>\r
 \r
-  <groupId>org.opendaylight.controller</groupId>\r
   <artifactId>sal.implementation</artifactId>\r
   <version>0.4.0-SNAPSHOT</version>\r
   <packaging>bundle</packaging>\r
@@ -44,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 a7583c8ab383eea5b069086f913b8004cf0bf445..ba3ee2fbd58847674de835468d6036a1e281448c 100644 (file)
--- a/opendaylight/samples/loadbalancer/pom.xml
+++ b/opendaylight/samples/loadbalancer/pom.xml
@@ -9,7 +9,6 @@
                <version>1.4.0-SNAPSHOT</version>
                <relativePath>../../commons/opendaylight</relativePath>
        </parent>
-       <groupId>org.opendaylight.controller</groupId>
        <artifactId>samples.loadbalancer</artifactId>
        <version>0.4.0-SNAPSHOT</version>
        <packaging>bundle</packaging>
@@ -63,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 94a6ae16c2b6abf10ded91fd16cf488fd81656dc..c736d0427a5267ab6ec3a94baf46a10648fafc87 100644 (file)
--- a/opendaylight/samples/northbound/loadbalancer/pom.xml
+++ b/opendaylight/samples/northbound/loadbalancer/pom.xml
@@ -7,7 +7,6 @@
     <version>1.4.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>samples.loadbalancer.northbound</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -56,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 342d8df8c45c384471eda8a7c26c8b304391e533..f26f56b7ebe819be1c9b5d554a7f19843c3dff36 100644 (file)
--- a/opendaylight/samples/simpleforwarding/pom.xml
+++ b/opendaylight/samples/simpleforwarding/pom.xml
@@ -8,7 +8,6 @@
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>samples.simpleforwarding</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -45,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 2991afc1a413ea345b9b20e6491fea39d6e068e8..6c689f110266d65b4d9eef812e61a9c4352d4c23 100644 (file)
--- a/opendaylight/security/pom.xml
+++ b/opendaylight/security/pom.xml
@@ -10,7 +10,6 @@
                <relativePath>../commons/opendaylight</relativePath>
        </parent>
 
-       <groupId>org.opendaylight.controller</groupId>
        <artifactId>security</artifactId>
        <version>0.4.0-SNAPSHOT</version>
        <packaging>bundle</packaging>
@@ -41,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 5c5b71dfb060b98718c785225a1a199b22494789..7ee475ed2b01be2b8efb4c1eb0704c2816359f83 100644 (file)
--- a/opendaylight/statisticsmanager/api/pom.xml
+++ b/opendaylight/statisticsmanager/api/pom.xml
@@ -8,7 +8,6 @@
     <version>1.4.0-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>statisticsmanager</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -33,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 fdc2efa5c207baf25b7bfe8ca90ae24ce53768c7..98ddfa5e82493c90a8313a0df3ea0acd597f3bab 100644 (file)
--- a/opendaylight/statisticsmanager/implementation/pom.xml
+++ b/opendaylight/statisticsmanager/implementation/pom.xml
@@ -8,7 +8,6 @@
     <version>1.4.0-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>statisticsmanager.implementation</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -53,6 +52,7 @@
             <Export-Package>
             </Export-Package>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
       <plugin>

diff --git a/opendaylight/statisticsmanager/integrationtest/pom.xml b/opendaylight/statisticsmanager/integrationtest/pom.xml
index 69c686c708563b2db9da3a490fcc38daf7f84778..aaf8a6fdbdfb254241c1a622ad11006078811cb4 100644 (file)
--- a/opendaylight/statisticsmanager/integrationtest/pom.xml
+++ b/opendaylight/statisticsmanager/integrationtest/pom.xml
@@ -9,7 +9,6 @@
     <version>1.4.0-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>statisticsmanager.integrationtest</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <dependencies>

diff --git a/opendaylight/switchmanager/api/pom.xml b/opendaylight/switchmanager/api/pom.xml
index dbf3cf2024d0429702eba2beb202974d5a1140f4..cc56d96869bfae5f84e358a8f830eeb581634905 100644 (file)
--- a/opendaylight/switchmanager/api/pom.xml
+++ b/opendaylight/switchmanager/api/pom.xml
@@ -9,7 +9,6 @@
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>switchmanager</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -58,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 3477abf2c4b1f15f136bd83be7fd2838689a103f..128ab25873cc384b0c5ee0e9ea4d98eec43c0b22 100644 (file)
--- a/opendaylight/switchmanager/implementation/pom.xml
+++ b/opendaylight/switchmanager/implementation/pom.xml
@@ -9,7 +9,6 @@
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>switchmanager.implementation</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -61,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/switchmanager/integrationtest/pom.xml b/opendaylight/switchmanager/integrationtest/pom.xml
index bdf00f4e0ac71cdf2a3d6d74c741e78e5cfbafa1..755d0862e86e73f36339139bd622fa65ca42be46 100644 (file)
--- a/opendaylight/switchmanager/integrationtest/pom.xml
+++ b/opendaylight/switchmanager/integrationtest/pom.xml
@@ -9,7 +9,6 @@
     <relativePath>../../../opendaylight/commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>switchmanager.integrationtest</artifactId>
   <version>0.4.0-SNAPSHOT</version>
 

diff --git a/opendaylight/topologymanager/pom.xml b/opendaylight/topologymanager/pom.xml
index 29a060f477e9905256970f0cd7be78c68002c253..57a036b948edab99e09448daf91e294c75849f43 100755 (executable)
--- a/opendaylight/topologymanager/pom.xml
+++ b/opendaylight/topologymanager/pom.xml
@@ -9,7 +9,6 @@
     <relativePath>../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>topologymanager</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -46,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 eea85e25eaaa1f85742b5959b84dc9e534e346fb..5e15c4cbfef470920ca99de9dd3451a4f2347e04 100644 (file)
--- a/opendaylight/usermanager/pom.xml
+++ b/opendaylight/usermanager/pom.xml
@@ -10,7 +10,6 @@
                <relativePath>../commons/opendaylight</relativePath>
        </parent>
 
-       <groupId>org.opendaylight.controller</groupId>
        <artifactId>usermanager</artifactId>
        <version>0.4.0-SNAPSHOT</version>
        <packaging>bundle</packaging>
@@ -57,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 12cd17c6c32a97e1788c62afd4f71fc033d8e4fa..980717323d2e0bfe23ebdb1691f9816b19bfe669 100644 (file)
--- a/opendaylight/web/devices/pom.xml
+++ b/opendaylight/web/devices/pom.xml
@@ -8,7 +8,6 @@
                <version>1.4.0-SNAPSHOT</version>
                <relativePath>../../commons/opendaylight</relativePath>
        </parent>
-       <groupId>org.opendaylight.controller</groupId>
        <artifactId>devices.web</artifactId>
        <version>0.4.0-SNAPSHOT</version>
        <packaging>bundle</packaging>
@@ -78,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 5333a7e6434bfa1f86eb0a40db49e5892532d667..eefaea3ca589912ddfdda531e95a28f8d5841e27 100644 (file)
--- a/opendaylight/web/flows/pom.xml
+++ b/opendaylight/web/flows/pom.xml
@@ -8,7 +8,6 @@
                <version>1.4.0-SNAPSHOT</version>
                <relativePath>../../commons/opendaylight</relativePath>
        </parent>
-       <groupId>org.opendaylight.controller</groupId>
        <artifactId>flows.web</artifactId>
        <version>0.4.0-SNAPSHOT</version>
        <packaging>bundle</packaging>
@@ -78,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 d30a6ac4c1cad7d5c4bcd9646e5304cb013100aa..76a7cb10aab00b03d5dc8a035a99cfec8b92d7bb 100644 (file)
--- a/opendaylight/web/root/pom.xml
+++ b/opendaylight/web/root/pom.xml
@@ -9,7 +9,6 @@
                <relativePath>../../commons/opendaylight</relativePath>
        </parent>
 
-       <groupId>org.opendaylight.controller</groupId>
        <artifactId>web</artifactId>
        <version>0.4.0-SNAPSHOT</version>
        <packaging>bundle</packaging>
@@ -82,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 b260e2d1f8b0bbd7130674b4bc51daf0746736cc..2a8cb9fa1ebb737fb62da89d624a437e63da4751 100644 (file)
--- a/opendaylight/web/topology/pom.xml
+++ b/opendaylight/web/topology/pom.xml
@@ -8,7 +8,6 @@
                <version>1.4.0-SNAPSHOT</version>
                <relativePath>../../commons/opendaylight</relativePath>
        </parent>
-       <groupId>org.opendaylight.controller</groupId>
        <artifactId>topology.web</artifactId>
        <version>0.4.0-SNAPSHOT</version>
        <packaging>bundle</packaging>
@@ -82,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 52958e116e15f68304c03cdc16d651e35b18f676..0d088826fd41a50fa36f282ebb799030a680acc0 100644 (file)
--- a/opendaylight/web/troubleshoot/pom.xml
+++ b/opendaylight/web/troubleshoot/pom.xml
@@ -8,7 +8,6 @@
                <version>1.4.0-SNAPSHOT</version>
                <relativePath>../../commons/opendaylight</relativePath>
        </parent>
-       <groupId>org.opendaylight.controller</groupId>
        <artifactId>troubleshoot.web</artifactId>
        <version>0.4.0-SNAPSHOT</version>
        <packaging>bundle</packaging>
@@ -80,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>