From: Keith Burns <alagalah@gmail.com>
Date: Tue, 12 May 2015 16:18:14 +0000 (+0000)
Subject: Merge changes I8490a721,I71941875
X-Git-Tag: release/lithium~82
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=09c6053b804e7b38e6416f8e63c3c4fc5460d757;p=groupbasedpolicy.git

Merge changes I8490a721,I71941875

* changes:
  Bug 3166 ui-backend introduced
  Moved util methods from PolicyResolver
---

09c6053b804e7b38e6416f8e63c3c4fc5460d757
diff --cc features/src/main/resources/features.xml
index 4e4180d68,f38a307e3..e16767b8e
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@@ -89,4 -89,16 +91,15 @@@
          <bundle>mvn:org.opendaylight.groupbasedpolicy/neutron-mapper/${project.version}</bundle>
          <configfile finalname="${config.configfile.directory}/${config.groupbasedpolicy.neutronmapperconfigfile}">mvn:org.opendaylight.groupbasedpolicy/neutron-mapper-config/${project.version}/xml/config</configfile>
      </feature>
+ 
+     <!--
+          The UI Backend
+     -->
+     <feature name='odl-groupbasedpolicy-uibackend' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: UI Backend provides APIs for UI '>
+         <feature version="${mdsal.version}">odl-mdsal-broker</feature>
+         <feature version="${project.version}">odl-groupbasedpolicy-base</feature>
+         <feature version="${restconf.version}">odl-restconf</feature>
+         <bundle>mvn:org.opendaylight.groupbasedpolicy/ui-backend/${project.version}</bundle>
+         <configfile finalname="${config.configfile.directory}/${config.groupbasedpolicy.uibackendconfigfile}">mvn:org.opendaylight.groupbasedpolicy/ui-backend-config/${project.version}/xml/config</configfile>
+     </feature>
  </features>
 -