Merge "NetworkConfiguration -> BridgeDomain Configuration Service"

[controller.git] / opendaylight / distribution / opendaylight / pom.xml

diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml
index f6a7808b23f314593539de8b1e6ae278fcc96893..807dea52e38de9994d81ba2796c908085cae07fc 100644 (file)
--- a/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@ -7,8 +7,8 @@
   </prerequisites>
 
   <scm>
-    <connection>scm:svn:https://wwwin-svn-sjc.cisco.com/eng/csdncontroller/trunk/</connection>
-    <developerConnection>scm:svn:https://wwwin-svn-sjc.cisco.com/eng/csdncontroller/trunk/</developerConnection>
+    <connection>scm:git:https://git.opendaylight.org/gerrit/p/controller.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
   </scm>
   <parent>
     <groupId>org.opendaylight.controller</groupId>
@@ -26,7 +26,6 @@
     </repository>
   </repositories>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>distribution.opendaylight</artifactId>
   <version>0.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
@@ -34,41 +33,59 @@
     <module>../../forwarding/staticrouting</module>
     <module>../../clustering/services</module>
     <module>../../clustering/services_implementation</module>
+    <module>../../clustering/integrationtest</module>
     <module>../../clustering/stub</module>
     <module>../../clustering/test</module>
     <module>../../configuration/api</module>
     <module>../../configuration/implementation</module>
+    <module>../../configuration/integrationtest</module>
     <module>../../routing/dijkstra_implementation</module>
     <module>../../arphandler</module>
-    <module>../../forwardingrulesmanager</module>
-    <module>../../hosttracker</module>
+    <module>../../forwardingrulesmanager/api</module>
+    <module>../../forwardingrulesmanager/implementation</module>
+    <module>../../forwardingrulesmanager/integrationtest</module>
+    <module>../../hosttracker/api</module>
+    <module>../../hosttracker/implementation</module>
+    <module>../../hosttracker/integrationtest</module>
+    <module>../../hosttracker_new/api</module>
+    <module>../../hosttracker_new/implementation</module>
     <module>../../containermanager/api</module>
     <module>../../containermanager/implementation</module>
-    <module>../../switchmanager</module>
-    <module>../../statisticsmanager</module>
+    <module>../../switchmanager/api</module>
+    <module>../../switchmanager/implementation</module>
+    <module>../../switchmanager/integrationtest</module>
+    <module>../../statisticsmanager/api</module>
+    <module>../../statisticsmanager/implementation</module>
+    <module>../../statisticsmanager/integrationtest</module>
     <module>../../topologymanager</module>
-    <module>../../usermanager</module>
+    <module>../../usermanager/api</module>
+    <module>../../usermanager/implementation</module>
+    <module>../../connectionmanager/api</module>
+    <module>../../connectionmanager/implementation</module>
     <module>../../security</module>
-    
-    
+
     <module>../../../third-party/openflowj</module>
     <module>../../../third-party/net.sf.jung2</module>
     <module>../../../third-party/jersey-servlet</module>
-    
+
     <!-- SAL bundles -->
     <module>../../sal/api</module>
     <module>../../sal/implementation</module>
-    
+
+    <!-- SAL Extension bundles -->
+    <module>../../sal/connection/api</module>
+    <module>../../sal/connection/implementation</module>
+    <module>../../sal/networkconfiguration/api</module>
+    <module>../../sal/networkconfiguration/implementation</module>
+
     <!--  Web bundles -->
     <module>../../web/root</module>
     <module>../../web/flows</module>
     <module>../../web/devices</module>
     <module>../../web/troubleshoot</module>
     <module>../../web/topology</module>
-    
+
     <!-- Northbound bundles -->
-    
-     
     <module>../../northbound/commons</module>
     <module>../../northbound/topology</module>
     <module>../../northbound/staticrouting</module>
@@ -77,19 +94,25 @@
     <module>../../northbound/hosttracker</module>
     <module>../../northbound/subnets</module>
     <module>../../northbound/switchmanager</module>
-    
+
+    <!-- Northbound integration tests -->
+    <module>../../northbound/integrationtest</module>
     <!-- Debug and logging -->
     <module>../../logging/bridge</module>
 
-       <!-- Southbound bundles -->
+    <!-- Southbound bundles -->
     <module>../../protocol_plugins/openflow</module>
-       
+    <module>../../protocol_plugins/stub</module>
+
     <!-- Samples -->
     <module>../../samples/simpleforwarding</module>
     <module>../../samples/loadbalancer</module>
     <module>../../samples/northbound/loadbalancer</module>
+    <module>../../commons/concepts</module>
+    <module>../../commons/integrationtest</module>
+
   </modules>
-  
+
   <build>
     <plugins>
       <plugin>