Merge "Bugfix: Exception when adding static host"

diff --combined opendaylight/hosttracker/integrationtest/src/test/java/org/opendaylight/controller/hosttracker/internal/HostTrackerIT.java
index 223f3d54d82ac690259ac483bc12664a35dffa5b,aa029a2d7bc512389d2d1293e36b1460530fc310..57e2714ff1c23bf3aded4c40d4b98ae96ed0135c
--- 1/opendaylight/hosttracker/integrationtest/src/test/java/org/opendaylight/controller/hosttracker/internal/HostTrackerIT.java
--- 2/opendaylight/hosttracker/integrationtest/src/test/java/org/opendaylight/controller/hosttracker/internal/HostTrackerIT.java
+++ b/opendaylight/hosttracker/integrationtest/src/test/java/org/opendaylight/controller/hosttracker/internal/HostTrackerIT.java
@@@ -69,13 -69,13 +69,13 @@@ public class HostTrackerIT 
                  // Set the systemPackages (used by clustering)
                  systemPackages("sun.reflect", "sun.reflect.misc", "sun.misc"),
                  // List framework bundles
 -                mavenBundle("equinoxSDK381", "org.eclipse.equinox.console", "1.0.0.v20120522-1841"),
 -                mavenBundle("equinoxSDK381", "org.eclipse.equinox.util", "1.0.400.v20120522-2049"),
 -                mavenBundle("equinoxSDK381", "org.eclipse.osgi.services","3.3.100.v20120522-1822"),
 -                mavenBundle("equinoxSDK381", "org.eclipse.equinox.ds", "1.4.0.v20120522-1841"),
 -                mavenBundle("equinoxSDK381", "org.apache.felix.gogo.command", "0.8.0.v201108120515"),
 -                mavenBundle("equinoxSDK381", "org.apache.felix.gogo.runtime", "0.8.0.v201108120515"),
 -                mavenBundle("equinoxSDK381", "org.apache.felix.gogo.shell", "0.8.0.v201110170705"),
 +                mavenBundle("equinoxSDK381", "org.eclipse.equinox.console").versionAsInProject(),
 +                mavenBundle("equinoxSDK381", "org.eclipse.equinox.util").versionAsInProject(),
 +                mavenBundle("equinoxSDK381", "org.eclipse.osgi.services").versionAsInProject(),
 +                mavenBundle("equinoxSDK381", "org.eclipse.equinox.ds").versionAsInProject(),
 +                mavenBundle("equinoxSDK381", "org.apache.felix.gogo.command").versionAsInProject(),
 +                mavenBundle("equinoxSDK381", "org.apache.felix.gogo.runtime").versionAsInProject(),
 +                mavenBundle("equinoxSDK381", "org.apache.felix.gogo.shell").versionAsInProject(),
                  // List logger bundles
                  mavenBundle("org.slf4j", "slf4j-api").versionAsInProject(),
                  mavenBundle("org.slf4j", "log4j-over-slf4j").versionAsInProject(),
@@@ -174,9 -174,9 +174,9 @@@
          NodeConnector nc1_2 = NodeConnectorCreator.createOFNodeConnector((short) 2, node1);
  
          // test addStaticHost(), store into inactive host DB
-         Status st = this.hosttracker.addStaticHost("192.168.0.8", "11:22:33:44:55:66", nc1_1, "0");
+         Status st = this.hosttracker.addStaticHost("192.168.0.8", "11:22:33:44:55:66", nc1_1, null);
          Assert.assertTrue(st.isSuccess());
-         st = this.hosttracker.addStaticHost("192.168.0.13", "11:22:33:44:55:77", nc1_2, "0");
+         st = this.hosttracker.addStaticHost("192.168.0.13", "11:22:33:44:55:77", nc1_2, "");
          Assert.assertTrue(st.isSuccess());
  
          // check inactive DB
@@@ -213,8 -213,11 +213,11 @@@
          NodeConnector nc1_2 = NodeConnectorCreator.createOFNodeConnector((short) 2, node1);
  
          // test addStaticHost(), put into inactive host DB if not verifiable
-         Status st = this.hosttracker.addStaticHost("192.168.0.8", "11:22:33:44:55:66", nc1_1, "0");
+         Status st = this.hosttracker.addStaticHost("192.168.0.8", "11:22:33:44:55:66", nc1_1, null);
+         Assert.assertTrue(st.isSuccess());
          st = this.hosttracker.addStaticHost("192.168.0.13", "11:22:33:44:55:77", nc1_2, "0");
+         Assert.assertFalse(st.isSuccess());
+ 
  
          this.invtoryListener.notifyNodeConnector(nc1_1, UpdateType.ADDED, null);
  
@@@ -251,8 -254,8 +254,8 @@@
          NodeConnector nc1_2 = NodeConnectorCreator.createOFNodeConnector((short) 2, node1);
  
          // test addStaticHost(), put into inactive host DB if not verifiable
-         Status st = this.hosttracker.addStaticHost("192.168.0.8", "11:22:33:44:55:66", nc1_1, "0");
-         st = this.hosttracker.addStaticHost("192.168.0.13", "11:22:33:44:55:77", nc1_2, "0");
+         Status st = this.hosttracker.addStaticHost("192.168.0.8", "11:22:33:44:55:66", nc1_1, null);
+         st = this.hosttracker.addStaticHost("192.168.0.13", "11:22:33:44:55:77", nc1_2, "");
  
          HostNodeConnector hnc_1 = this.hosttracker.hostFind(InetAddress.getByName("192.168.0.8"));
          assertNull(hnc_1);

diff --combined opendaylight/northbound/integrationtest/src/test/java/org/opendaylight/controller/northbound/integrationtest/NorthboundIT.java
index b428e1610a085580d1c21bcbd6d020053796344e,814731196c0e7db7faafb646383d6f517ddac07d..f7ebfe438fb82f577581664301fa90b3a7f079ff
--- 1/opendaylight/northbound/integrationtest/src/test/java/org/opendaylight/controller/northbound/integrationtest/NorthboundIT.java
--- 2/opendaylight/northbound/integrationtest/src/test/java/org/opendaylight/controller/northbound/integrationtest/NorthboundIT.java
+++ b/opendaylight/northbound/integrationtest/src/test/java/org/opendaylight/controller/northbound/integrationtest/NorthboundIT.java
@@@ -903,7 -903,7 +903,7 @@@ public class NorthboundIT 
          Integer nodeId_1 = 3366;
          String nodeConnectorType_1 = "STUB";
          Integer nodeConnectorId_1 = 12;
-         String vlan_1 = "4";
+         String vlan_1 = "";
  
          // 2nd host
          String networkAddress_2 = "10.1.1.1";
@@@ -912,7 -912,7 +912,7 @@@
          Integer nodeId_2 = 4477;
          String nodeConnectorType_2 = "STUB";
          Integer nodeConnectorId_2 = 34;
-         String vlan_2 = "0";
+         String vlan_2 = "123";
  
          String baseURL = "http://127.0.0.1:8080/controller/nb/v2/host/default";
  
@@@ -969,7 -969,7 +969,7 @@@
                  Assert.assertTrue(host_jo.getInt("nodeConnectorId") == nodeConnectorId_1);
                  Assert.assertTrue(host_jo.getString("nodeType").equalsIgnoreCase(nodeType_1));
                  Assert.assertTrue(host_jo.getInt("nodeId") == nodeId_1);
-                 Assert.assertTrue(host_jo.getString("vlan").equalsIgnoreCase(vlan_1));
+                 Assert.assertTrue(host_jo.getString("vlan").equals("0"));
                  Assert.assertTrue(host_jo.getBoolean("staticHost"));
              } else if (networkAddress.equalsIgnoreCase(networkAddress_2)) {
                  Assert.assertTrue(host_jo.getString("dataLayerAddress").equalsIgnoreCase(dataLayerAddress_2));
@@@ -1030,13 -1030,13 +1030,13 @@@
          Assert.assertTrue(json.getInt("nodeConnectorId") == nodeConnectorId_1);
          Assert.assertTrue(json.getString("nodeType").equalsIgnoreCase(nodeType_1));
          Assert.assertTrue(json.getInt("nodeId") == nodeId_1);
-         Assert.assertTrue(json.getString("vlan").equalsIgnoreCase(vlan_1));
+         Assert.assertTrue(json.getString("vlan").equals("0"));
          Assert.assertTrue(json.getBoolean("staticHost"));
  
          // test DELETE method for deleteFlow()
  
          result = getJsonResult(baseURL + "/" + networkAddress_1, "DELETE");
-         Assert.assertTrue(httpResponseCode == 200);
+         Assert.assertTrue(httpResponseCode == 204);
  
          // verify host_1 removed from active host DB
          // test GET method: getActiveHosts() - no host expected
@@@ -1274,160 -1274,160 +1274,160 @@@
  
                  // Set the systemPackages (used by clustering)
                  systemPackages("sun.reflect", "sun.reflect.misc", "sun.misc"),
 -                mavenBundle("javax.servlet", "servlet-api", "2.5"),
 -
 -                mavenBundle("org.slf4j", "jcl-over-slf4j", "1.7.2"),
 -                mavenBundle("org.slf4j", "slf4j-api", "1.7.2"),
 -                mavenBundle("org.slf4j", "log4j-over-slf4j", "1.7.2"),
 -                mavenBundle("ch.qos.logback", "logback-core", "1.0.9"),
 -                mavenBundle("ch.qos.logback", "logback-classic", "1.0.9"),
 -                mavenBundle("org.apache.commons", "commons-lang3", "3.1"),
 -                mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager", "3.1.0"),
 +                mavenBundle("org.slf4j", "jcl-over-slf4j").versionAsInProject(),
 +                mavenBundle("org.slf4j", "slf4j-api").versionAsInProject(),
 +                mavenBundle("org.slf4j", "log4j-over-slf4j").versionAsInProject(),
 +                mavenBundle("ch.qos.logback", "logback-core").versionAsInProject(),
 +                mavenBundle("ch.qos.logback", "logback-classic").versionAsInProject(),
 +                mavenBundle("org.apache.commons", "commons-lang3").versionAsInProject(),
 +                mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager").versionAsInProject(),
  
                  // the plugin stub to get data for the tests
 -                mavenBundle("org.opendaylight.controller", "protocol_plugins.stub", "0.4.0-SNAPSHOT"),
 +                mavenBundle("org.opendaylight.controller", "protocol_plugins.stub").versionAsInProject(),
  
                  // List all the opendaylight modules
 -                mavenBundle("org.opendaylight.controller", "configuration", "0.4.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "configuration.implementation", "0.4.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "containermanager", "0.4.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "containermanager.implementation", "0.4.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "clustering.services", "0.4.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "clustering.services-implementation", "0.4.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "security", "0.4.0-SNAPSHOT").noStart(),
 -                mavenBundle("org.opendaylight.controller", "sal", "0.5.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "sal.implementation", "0.4.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "sal.connection", "0.1.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "sal.connection.implementation", "0.1.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "switchmanager", "0.5.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "connectionmanager", "0.1.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "connectionmanager.implementation", "0.1.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "switchmanager.implementation", "0.4.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "forwardingrulesmanager", "0.4.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "forwardingrulesmanager.implementation", "0.4.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "statisticsmanager", "0.4.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "statisticsmanager.implementation", "0.4.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "arphandler", "0.4.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "hosttracker", "0.4.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "hosttracker.implementation", "0.4.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "arphandler", "0.4.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "routing.dijkstra_implementation", "0.4.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "topologymanager", "0.4.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "usermanager", "0.4.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "usermanager.implementation", "0.4.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "logging.bridge", "0.4.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "clustering.test", "0.4.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "forwarding.staticrouting", "0.4.0-SNAPSHOT"),
 +                mavenBundle("org.opendaylight.controller", "configuration").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "configuration.implementation").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "containermanager").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "containermanager.implementation").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "clustering.services").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "clustering.services-implementation").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "security").versionAsInProject().noStart(),
 +                mavenBundle("org.opendaylight.controller", "sal").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "sal.implementation").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "sal.connection").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "sal.connection.implementation").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "switchmanager").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "connectionmanager").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "connectionmanager.implementation").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "switchmanager.implementation").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "forwardingrulesmanager").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller",
 +                            "forwardingrulesmanager.implementation").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "statisticsmanager").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "statisticsmanager.implementation").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "arphandler").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "hosttracker").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "hosttracker.implementation").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "arphandler").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "routing.dijkstra_implementation").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "topologymanager").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "usermanager").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "usermanager.implementation").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "logging.bridge").versionAsInProject(),
 +//                mavenBundle("org.opendaylight.controller", "clustering.test").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "forwarding.staticrouting").versionAsInProject(),
  
                  // Northbound bundles
 -                mavenBundle("org.opendaylight.controller", "commons.northbound", "0.4.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "forwarding.staticrouting.northbound", "0.4.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "statistics.northbound", "0.4.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "topology.northbound", "0.4.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "hosttracker.northbound", "0.4.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "switchmanager.northbound", "0.4.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "flowprogrammer.northbound", "0.4.0-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller", "subnets.northbound", "0.4.0-SNAPSHOT"),
 -
 -                mavenBundle("org.codehaus.jackson", "jackson-mapper-asl", "1.9.8"),
 -                mavenBundle("org.codehaus.jackson", "jackson-core-asl", "1.9.8"),
 -                mavenBundle("org.codehaus.jackson", "jackson-jaxrs", "1.9.8"),
 -                mavenBundle("org.codehaus.jettison", "jettison", "1.3.3"),
 -
 -                mavenBundle("commons-io", "commons-io", "2.3"),
 -
 -                mavenBundle("commons-fileupload", "commons-fileupload", "1.2.2"),
 -
 -                mavenBundle("equinoxSDK381", "javax.servlet", "3.0.0.v201112011016"),
 -                mavenBundle("equinoxSDK381", "javax.servlet.jsp", "2.2.0.v201112011158"),
 -                mavenBundle("equinoxSDK381", "org.eclipse.equinox.ds", "1.4.0.v20120522-1841"),
 -                mavenBundle("orbit", "javax.xml.rpc", "1.1.0.v201005080400"),
 -                mavenBundle("equinoxSDK381", "org.eclipse.equinox.util", "1.0.400.v20120522-2049"),
 -                mavenBundle("equinoxSDK381", "org.eclipse.osgi.services", "3.3.100.v20120522-1822"),
 -                mavenBundle("equinoxSDK381", "org.apache.felix.gogo.command", "0.8.0.v201108120515"),
 -                mavenBundle("equinoxSDK381", "org.apache.felix.gogo.runtime", "0.8.0.v201108120515"),
 -                mavenBundle("equinoxSDK381", "org.apache.felix.gogo.shell", "0.8.0.v201110170705"),
 -                mavenBundle("equinoxSDK381", "org.eclipse.equinox.cm", "1.0.400.v20120522-1841"),
 -                mavenBundle("equinoxSDK381", "org.eclipse.equinox.console", "1.0.0.v20120522-1841"),
 -                mavenBundle("equinoxSDK381", "org.eclipse.equinox.launcher", "1.3.0.v20120522-1813"),
 -
 -                mavenBundle("geminiweb", "org.eclipse.gemini.web.core", "2.2.0.RELEASE"),
 -                mavenBundle("geminiweb", "org.eclipse.gemini.web.extender", "2.2.0.RELEASE"),
 -                mavenBundle("geminiweb", "org.eclipse.gemini.web.tomcat", "2.2.0.RELEASE"),
 -                mavenBundle("geminiweb", "org.eclipse.virgo.kernel.equinox.extensions", "3.6.0.RELEASE").noStart(),
 -                mavenBundle("geminiweb", "org.eclipse.virgo.util.common", "3.6.0.RELEASE"),
 -                mavenBundle("geminiweb", "org.eclipse.virgo.util.io", "3.6.0.RELEASE"),
 -                mavenBundle("geminiweb", "org.eclipse.virgo.util.math", "3.6.0.RELEASE"),
 -                mavenBundle("geminiweb", "org.eclipse.virgo.util.osgi", "3.6.0.RELEASE"),
 -                mavenBundle("geminiweb", "org.eclipse.virgo.util.osgi.manifest", "3.6.0.RELEASE"),
 -                mavenBundle("geminiweb", "org.eclipse.virgo.util.parser.manifest", "3.6.0.RELEASE"),
 -
 -                mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager", "3.1.0"),
 -                mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager.shell", "3.0.1"),
 -
 -                mavenBundle("com.google.code.gson", "gson", "2.1"),
 -                mavenBundle("org.jboss.spec.javax.transaction", "jboss-transaction-api_1.1_spec", "1.0.1.Final"),
 -                mavenBundle("org.apache.felix", "org.apache.felix.fileinstall", "3.1.6"),
 -                mavenBundle("org.apache.commons", "commons-lang3", "3.1"),
 -                mavenBundle("commons-codec", "commons-codec"),
 -                mavenBundle("virgomirror", "org.eclipse.jdt.core.compiler.batch", "3.8.0.I20120518-2145"),
 -                mavenBundle("eclipselink", "javax.persistence", "2.0.4.v201112161009"),
 -                mavenBundle("eclipselink", "javax.resource", "1.5.0.v200906010428"),
 -
 -                mavenBundle("orbit", "javax.activation", "1.1.0.v201211130549"),
 -                mavenBundle("orbit", "javax.annotation", "1.1.0.v201209060031"),
 -                mavenBundle("orbit", "javax.ejb", "3.1.1.v201204261316"),
 -                mavenBundle("orbit", "javax.el", "2.2.0.v201108011116"),
 -                mavenBundle("orbit", "javax.mail.glassfish", "1.4.1.v201108011116"),
 -                mavenBundle("orbit", "javax.xml.rpc", "1.1.0.v201005080400"),
 -                mavenBundle("orbit", "org.apache.catalina", "7.0.32.v201211201336"),
 +                mavenBundle("org.opendaylight.controller", "commons.northbound").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "forwarding.staticrouting.northbound").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "statistics.northbound").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "topology.northbound").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "hosttracker.northbound").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "switchmanager.northbound").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "flowprogrammer.northbound").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller", "subnets.northbound").versionAsInProject(),
 +
 +                mavenBundle("org.codehaus.jackson", "jackson-mapper-asl").versionAsInProject(),
 +                mavenBundle("org.codehaus.jackson", "jackson-core-asl").versionAsInProject(),
 +                mavenBundle("org.codehaus.jackson", "jackson-jaxrs").versionAsInProject(),
 +                mavenBundle("org.codehaus.jettison", "jettison").versionAsInProject(),
 +
 +                mavenBundle("commons-io", "commons-io").versionAsInProject(),
 +
 +                mavenBundle("commons-fileupload", "commons-fileupload").versionAsInProject(),
 +
 +                mavenBundle("equinoxSDK381", "javax.servlet").versionAsInProject(),
 +                mavenBundle("equinoxSDK381", "javax.servlet.jsp").versionAsInProject(),
 +                mavenBundle("equinoxSDK381", "org.eclipse.equinox.ds").versionAsInProject(),
 +                mavenBundle("orbit", "javax.xml.rpc").versionAsInProject(),
 +                mavenBundle("equinoxSDK381", "org.eclipse.equinox.util").versionAsInProject(),
 +                mavenBundle("equinoxSDK381", "org.eclipse.osgi.services").versionAsInProject(),
 +                mavenBundle("equinoxSDK381", "org.apache.felix.gogo.command").versionAsInProject(),
 +                mavenBundle("equinoxSDK381", "org.apache.felix.gogo.runtime").versionAsInProject(),
 +                mavenBundle("equinoxSDK381", "org.apache.felix.gogo.shell").versionAsInProject(),
 +                mavenBundle("equinoxSDK381", "org.eclipse.equinox.cm").versionAsInProject(),
 +                mavenBundle("equinoxSDK381", "org.eclipse.equinox.console").versionAsInProject(),
 +                mavenBundle("equinoxSDK381", "org.eclipse.equinox.launcher").versionAsInProject(),
 +
 +                mavenBundle("geminiweb", "org.eclipse.gemini.web.core").versionAsInProject(),
 +                mavenBundle("geminiweb", "org.eclipse.gemini.web.extender").versionAsInProject(),
 +                mavenBundle("geminiweb", "org.eclipse.gemini.web.tomcat").versionAsInProject(),
 +                mavenBundle("geminiweb", "org.eclipse.virgo.kernel.equinox.extensions").versionAsInProject().noStart(),
 +                mavenBundle("geminiweb", "org.eclipse.virgo.util.common").versionAsInProject(),
 +                mavenBundle("geminiweb", "org.eclipse.virgo.util.io").versionAsInProject(),
 +                mavenBundle("geminiweb", "org.eclipse.virgo.util.math").versionAsInProject(),
 +                mavenBundle("geminiweb", "org.eclipse.virgo.util.osgi").versionAsInProject(),
 +                mavenBundle("geminiweb", "org.eclipse.virgo.util.osgi.manifest").versionAsInProject(),
 +                mavenBundle("geminiweb", "org.eclipse.virgo.util.parser.manifest").versionAsInProject(),
 +
 +                mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager").versionAsInProject(),
 +                mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager.shell").versionAsInProject(),
 +
 +                mavenBundle("com.google.code.gson", "gson").versionAsInProject(),
 +                mavenBundle("org.jboss.spec.javax.transaction", "jboss-transaction-api_1.1_spec").versionAsInProject(),
 +                mavenBundle("org.apache.felix", "org.apache.felix.fileinstall").versionAsInProject(),
 +                mavenBundle("org.apache.commons", "commons-lang3").versionAsInProject(),
 +                mavenBundle("commons-codec", "commons-codec").versionAsInProject(),
 +                mavenBundle("virgomirror", "org.eclipse.jdt.core.compiler.batch").versionAsInProject(),
 +                mavenBundle("eclipselink", "javax.persistence").versionAsInProject(),
 +                mavenBundle("eclipselink", "javax.resource").versionAsInProject(),
 +
 +                mavenBundle("orbit", "javax.activation").versionAsInProject(),
 +                mavenBundle("orbit", "javax.annotation").versionAsInProject(),
 +                mavenBundle("orbit", "javax.ejb").versionAsInProject(),
 +                mavenBundle("orbit", "javax.el").versionAsInProject(),
 +                mavenBundle("orbit", "javax.mail.glassfish").versionAsInProject(),
 +                mavenBundle("orbit", "javax.xml.rpc").versionAsInProject(),
 +                mavenBundle("orbit", "org.apache.catalina").versionAsInProject(),
                  // these are bundle fragments that can't be started on its own
 -                mavenBundle("orbit", "org.apache.catalina.ha", "7.0.32.v201211201952").noStart(),
 -                mavenBundle("orbit", "org.apache.catalina.tribes", "7.0.32.v201211201952").noStart(),
 -                mavenBundle("orbit", "org.apache.coyote", "7.0.32.v201211201952").noStart(),
 -                mavenBundle("orbit", "org.apache.jasper", "7.0.32.v201211201952").noStart(),
 -
 -                mavenBundle("orbit", "org.apache.el", "7.0.32.v201211081135"),
 -                mavenBundle("orbit", "org.apache.juli.extras", "7.0.32.v201211081135"),
 -                mavenBundle("orbit", "org.apache.tomcat.api", "7.0.32.v201211081135"),
 -                mavenBundle("orbit", "org.apache.tomcat.util", "7.0.32.v201211201952").noStart(),
 -                mavenBundle("orbit", "javax.servlet.jsp.jstl", "1.2.0.v201105211821"),
 -                mavenBundle("orbit", "javax.servlet.jsp.jstl.impl", "1.2.0.v201210211230"),
 -
 -                mavenBundle("org.ops4j.pax.exam", "pax-exam-container-native"),
 -                mavenBundle("org.ops4j.pax.exam", "pax-exam-junit4"),
 -                mavenBundle("org.ops4j.pax.exam", "pax-exam-link-mvn"),
 -                mavenBundle("org.ops4j.pax.url", "pax-url-aether"),
 -
 -                mavenBundle("org.springframework", "org.springframework.asm", "3.1.3.RELEASE"),
 -                mavenBundle("org.springframework", "org.springframework.aop", "3.1.3.RELEASE"),
 -                mavenBundle("org.springframework", "org.springframework.context", "3.1.3.RELEASE"),
 -                mavenBundle("org.springframework", "org.springframework.context.support", "3.1.3.RELEASE"),
 -                mavenBundle("org.springframework", "org.springframework.core", "3.1.3.RELEASE"),
 -                mavenBundle("org.springframework", "org.springframework.beans", "3.1.3.RELEASE"),
 -                mavenBundle("org.springframework", "org.springframework.expression", "3.1.3.RELEASE"),
 -                mavenBundle("org.springframework", "org.springframework.web", "3.1.3.RELEASE"),
 -
 -                mavenBundle("org.aopalliance", "com.springsource.org.aopalliance", "1.0.0"),
 -                mavenBundle("org.springframework", "org.springframework.web.servlet", "3.1.3.RELEASE"),
 -                mavenBundle("org.springframework.security", "spring-security-config", "3.1.3.RELEASE"),
 -                mavenBundle("org.springframework.security", "spring-security-core", "3.1.3.RELEASE"),
 -                mavenBundle("org.springframework.security", "spring-security-web", "3.1.3.RELEASE"),
 -                mavenBundle("org.springframework.security", "spring-security-taglibs", "3.1.3.RELEASE"),
 -                mavenBundle("org.springframework", "org.springframework.transaction", "3.1.3.RELEASE"),
 -
 -                mavenBundle("org.ow2.chameleon.management", "chameleon-mbeans", "1.0.0"),
 -                mavenBundle("org.opendaylight.controller.thirdparty", "net.sf.jung2", "2.0.1-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller.thirdparty", "com.sun.jersey.jersey-servlet", "1.17-SNAPSHOT"),
 -                mavenBundle("org.opendaylight.controller.thirdparty", "org.apache.catalina.filters.CorsFilter",
 -                            "7.0.42-SNAPSHOT").noStart(),
 +                mavenBundle("orbit", "org.apache.catalina.ha").versionAsInProject().noStart(),
 +                mavenBundle("orbit", "org.apache.catalina.tribes").versionAsInProject().noStart(),
 +                mavenBundle("orbit", "org.apache.coyote").versionAsInProject().noStart(),
 +                mavenBundle("orbit", "org.apache.jasper").versionAsInProject().noStart(),
 +
 +                mavenBundle("orbit", "org.apache.el").versionAsInProject(),
 +                mavenBundle("orbit", "org.apache.juli.extras").versionAsInProject(),
 +                mavenBundle("orbit", "org.apache.tomcat.api").versionAsInProject(),
 +                mavenBundle("orbit", "org.apache.tomcat.util").versionAsInProject().noStart(),
 +                mavenBundle("orbit", "javax.servlet.jsp.jstl").versionAsInProject(),
 +                mavenBundle("orbit", "javax.servlet.jsp.jstl.impl").versionAsInProject(),
 +
 +                mavenBundle("org.ops4j.pax.exam", "pax-exam-container-native").versionAsInProject(),
 +                mavenBundle("org.ops4j.pax.exam", "pax-exam-junit4").versionAsInProject(),
 +                mavenBundle("org.ops4j.pax.exam", "pax-exam-link-mvn").versionAsInProject(),
 +                mavenBundle("org.ops4j.pax.url", "pax-url-aether").versionAsInProject(),
 +
 +                mavenBundle("org.springframework", "org.springframework.asm").versionAsInProject(),
 +                mavenBundle("org.springframework", "org.springframework.aop").versionAsInProject(),
 +                mavenBundle("org.springframework", "org.springframework.context").versionAsInProject(),
 +                mavenBundle("org.springframework", "org.springframework.context.support").versionAsInProject(),
 +                mavenBundle("org.springframework", "org.springframework.core").versionAsInProject(),
 +                mavenBundle("org.springframework", "org.springframework.beans").versionAsInProject(),
 +                mavenBundle("org.springframework", "org.springframework.expression").versionAsInProject(),
 +                mavenBundle("org.springframework", "org.springframework.web").versionAsInProject(),
 +
 +                mavenBundle("org.aopalliance", "com.springsource.org.aopalliance").versionAsInProject(),
 +                mavenBundle("org.springframework", "org.springframework.web.servlet").versionAsInProject(),
 +                mavenBundle("org.springframework.security", "spring-security-config").versionAsInProject(),
 +                mavenBundle("org.springframework.security", "spring-security-core").versionAsInProject(),
 +                mavenBundle("org.springframework.security", "spring-security-web").versionAsInProject(),
 +                mavenBundle("org.springframework.security", "spring-security-taglibs").versionAsInProject(),
 +                mavenBundle("org.springframework", "org.springframework.transaction").versionAsInProject(),
 +
 +                mavenBundle("org.ow2.chameleon.management", "chameleon-mbeans").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller.thirdparty", "net.sf.jung2").versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller.thirdparty", "com.sun.jersey.jersey-servlet")
 +                .versionAsInProject(),
 +                mavenBundle("org.opendaylight.controller.thirdparty", "org.apache.catalina.filters.CorsFilter")
 +                .versionAsInProject().noStart(),
  
                  // Jersey needs to be started before the northbound application
                  // bundles, using a lower start level
 -                mavenBundle("com.sun.jersey", "jersey-client", "1.17"),
 -                mavenBundle("com.sun.jersey", "jersey-server", "1.17").startLevel(2),
 -                mavenBundle("com.sun.jersey", "jersey-core", "1.17").startLevel(2),
 -                mavenBundle("com.sun.jersey", "jersey-json", "1.17").startLevel(2), junitBundles());
 +                mavenBundle("com.sun.jersey", "jersey-client").versionAsInProject(),
 +                mavenBundle("com.sun.jersey", "jersey-server").versionAsInProject().startLevel(2),
 +                mavenBundle("com.sun.jersey", "jersey-core").versionAsInProject().startLevel(2),
 +                mavenBundle("com.sun.jersey", "jersey-json").versionAsInProject().startLevel(2), junitBundles());
      }
  
  }