Merge "Adding IdManager/LockManager and related Changes"

diff --combined features/pom.xml
index 4b109efef00aba75c018f683c749296273b8de12,8433fba5543c5eb36d588f17cebbb029ff7baeb7..72b6f763b1ebb67b403cb6346c7f100593871de0
--- 1/features/pom.xml
--- 2/features/pom.xml
+++ b/features/pom.xml
@@@ -33,8 -33,8 +33,9 @@@ and is available at http://www.eclipse.
      <interfacemgr.version>${vpnservices.version}</interfacemgr.version>
      <nexthopmgr.version>${vpnservices.version}</nexthopmgr.version>
      <fibmanager.version>${vpnservices.version}</fibmanager.version>
+     <lockmanager.version>${vpnservices.version}</lockmanager.version>
      <idmanager.version>${vpnservices.version}</idmanager.version>
 +      <itm.version>${vpnservices.version}</itm.version>
    </properties>
    <dependencyManagement>
      <dependencies>
@@@ -210,6 -210,23 +211,23 @@@
        <artifactId>fibmanager-api</artifactId>
        <version>${fibmanager.version}</version>
      </dependency>
+     <dependency>
+       <groupId>${project.groupId}</groupId>
+       <artifactId>lockmanager-impl</artifactId>
+       <version>${lockmanager.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>${project.groupId}</groupId>
+       <artifactId>lockmanager-impl</artifactId>
+       <version>${lockmanager.version}</version>
+       <classifier>config</classifier>
+       <type>xml</type>
+     </dependency>
+     <dependency>
+       <groupId>${project.groupId}</groupId>
+       <artifactId>lockmanager-api</artifactId>
+       <version>${lockmanager.version}</version>
+     </dependency>
      <dependency>
        <groupId>${project.groupId}</groupId>
        <artifactId>idmanager-impl</artifactId>
@@@ -226,18 -243,6 +244,18 @@@
        <groupId>${project.groupId}</groupId>
        <artifactId>idmanager-api</artifactId>
        <version>${idmanager.version}</version>
 +    </dependency>
 +      <dependency>
 +      <groupId>org.opendaylight.vpnservice</groupId>
 +      <artifactId>itm-impl</artifactId>
 +      <version>${itm.version}</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.opendaylight.vpnservice</groupId>
 +      <artifactId>itm-impl</artifactId>
 +      <version>${itm.version}</version>
 +      <classifier>config</classifier>
 +      <type>xml</type>
      </dependency>
      <dependency>
        <groupId>org.apache.thrift</groupId>

diff --combined features/src/main/features/features.xml
index 4ffb0e3c7f8d628ea7ea3a41c9d2b4812bdbe11c,b4a6735a336fa2881b77323e2465e4f78c899cb9..270db04df3cf65ff6c78c8213bf06a1cbc4af5de
--- 1/features/src/main/features/features.xml
--- 2/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@@ -21,11 -21,12 +21,12 @@@ and is available at http://www.eclipse.
      <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
      <feature version='${openflowplugin.version}'>odl-openflowplugin-nsf-model</feature>
      <bundle>mvn:org.opendaylight.vpnservice/model-bgp/{{VERSION}}</bundle>
+     <bundle>mvn:org.opendaylight.vpnservice/lockmanager-api/${lockmanager.version}</bundle>
      <bundle>mvn:org.opendaylight.vpnservice/idmanager-api/${idmanager.version}</bundle>
      <bundle>mvn:org.opendaylight.vpnservice/vpnmanager-api/${vpnmanager.version}</bundle>
      <bundle>mvn:org.opendaylight.vpnservice/nexthopmgr-api/${nexthopmgr.version}</bundle>
      <bundle>mvn:org.opendaylight.vpnservice/fibmanager-api/${fibmanager.version}</bundle>
 -
 +    <bundle>mvn:org.opendaylight.vpnservice/itm-api/${itm.version}</bundle>
    </feature>
    <feature name='odl-vpnservice-impl' version='${project.version}' description='OpenDaylight :: vpnservice :: impl '>
      <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
@@@ -33,6 -34,7 +34,7 @@@
      <feature version='${project.version}'>odl-vpnservice-api</feature>
      <feature version="${openflowplugin.version}">odl-openflowplugin-southbound</feature>
      <feature version="${openflowplugin.version}">odl-openflowplugin-flow-services</feature>
+     <bundle>mvn:org.opendaylight.vpnservice/lockmanager-impl/${lockmanager.version}</bundle>
      <bundle>mvn:org.opendaylight.vpnservice/idmanager-impl/${idmanager.version}</bundle>
      <bundle>mvn:org.opendaylight.vpnservice/bgpmanager-api/${vpnservices.version}</bundle>
      <bundle>mvn:org.opendaylight.vpnservice/bgpmanager-impl/${vpnservices.version}</bundle>
@@@ -43,11 -45,11 +45,12 @@@
      <bundle>mvn:org.opendaylight.vpnservice/vpnmanager-impl/${vpnmanager.version}</bundle>
      <bundle>mvn:org.opendaylight.vpnservice/nexthopmgr-impl/${nexthopmgr.version}</bundle>
      <bundle>mvn:org.opendaylight.vpnservice/fibmanager-impl/${fibmanager.version}</bundle>
 -
 +    <bundle>mvn:org.opendaylight.vpnservice/itm-impl/${itm.version}</bundle>
 +    
      <!--<bundle>mvn:org.opendaylight.vpnservice.third-party/org.apache.thriftlib/1.0.1-SNAPSHOT</bundle>-->
      <bundle>wrap:mvn:org.apache.thrift/libthrift/0.9.1$overwrite=merge&amp;Bundle-Version=0.9.1&amp;Export-Package=*;-noimport:=true;version="0.9.1"</bundle>
      <!--<bundle>wrap:mvn:javax.servlet/servlet-api/2.5</bundle>-->
+     <configfile finalname="lockmanager-impl-default-config.xml">mvn:org.opendaylight.vpnservice/lockmanager-impl/${lockmanager.version}/xml/config</configfile>
        <configfile finalname="idmanager-impl-default-config.xml">mvn:org.opendaylight.vpnservice/idmanager-impl/${idmanager.version}/xml/config</configfile>
      <configfile finalname="bgpmanager-impl-default-config.xml">mvn:org.opendaylight.vpnservice/bgpmanager-impl/${vpnservices.version}/xml/config</configfile>
      <configfile finalname="mdsalutil-impl-default-config.xml">mvn:org.opendaylight.vpnservice/mdsalutil-impl/${interfacemgr.version}/xml/config</configfile>
@@@ -55,7 -57,6 +58,7 @@@
      <configfile finalname="vpnmanager-impl-default-config.xml">mvn:org.opendaylight.vpnservice/vpnmanager-impl/${vpnmanager.version}/xml/config</configfile>
      <configfile finalname="nexthopmgr-impl-default-config.xml">mvn:org.opendaylight.vpnservice/nexthopmgr-impl/${nexthopmgr.version}/xml/config</configfile>
      <configfile finalname="fibmanager-impl-default-config.xml">mvn:org.opendaylight.vpnservice/fibmanager-impl/${fibmanager.version}/xml/config</configfile>
 +    <configfile finalname="itm-impl-default-config.xml">mvn:org.opendaylight.vpnservice/itm-impl/${itm.version}/xml/config</configfile>
  
    </feature>
    <feature name='odl-vpnservice-impl-rest' version='${project.version}' description='OpenDaylight :: vpnservice :: impl :: REST '>

diff --combined pom.xml
index 561d19de90ffb13d864810c26326976249ac951a,f090c5698dc88d708bb90b5abe1d646e1c403f51..d19242065c1a5e122a7f1acb99154d1df9787879
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -20,13 -20,13 +20,14 @@@ and is available at http://www.eclipse.
      <module>commons/config-parent</module>
      <module>model-bgp</module>
      <module>mdsalutil</module>
+     <module>lockmanager</module>
+     <module>idmanager</module>
      <module>vpnmanager</module>
      <module>interfacemgr</module>
      <module>nexthopmgr</module>
-     <module>idmanager</module>
      <module>fibmanager</module>
      <module>bgpmanager</module>
 +    <module>itm</module>
      <module>distribution/karaf</module>
      <module>features</module>
      <module>vpnservice-artifacts</module>