X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fdistribution%2Fopendaylight%2Fpom.xml;h=4dc4e6fa2e35efee89a617b014eacda9d3678fdf;hp=8a746893988170670c0dae24d87791c735a22d1a;hb=8cbcc63bbb004b50c66ce3c65d0b8d7943c8ffac;hpb=11837100975c9ad113e12668c09ecd78f9433f73

diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml
index 8a74689398..4dc4e6fa2e 100644
--- a/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@ -5,10 +5,10 @@
   <prerequisites>
     <maven>3.0</maven>
   </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:ssh://git.opendaylight.org:29418/controller.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
   </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,43 +33,64 @@
     <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>../../switchmanager/api</module>
+    <module>../../switchmanager/implementation</module>
+    <module>../../switchmanager/integrationtest</module>
     <module>../../statisticsmanager/api</module>
     <module>../../statisticsmanager/implementation</module>
-     <module>../../statisticsmanager/integrationtest</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>
-    
+    <module>../../../third-party/commons/thirdparty</module>
+    <module>../../../third-party/org.apache.catalina.filters.CorsFilter</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>
+
+    <!-- MD-SAL bundles -->
+    <module>../../sal/yang-prototype</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>
@@ -79,20 +99,30 @@
     <module>../../northbound/hosttracker</module>
     <module>../../northbound/subnets</module>
     <module>../../northbound/switchmanager</module>
-    
+    <module>../../northbound/networkconfiguration/bridgedomain</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>
+
+    <!-- Parents -->
+    <module>../../commons/concepts</module>
+    <module>../../commons/integrationtest</module>
+    <module>../../commons/checkstyle</module>
+    <module>../../commons/opendaylight</module>
+    <module>../../commons/parent</module>
   </modules>
-  
+
   <build>
     <plugins>
       <plugin>