Code Review / netvirt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Drop duplicate classes
[netvirt.git] / features / ovsdb / src / main / features / features.xml
diff --git a/features/ovsdb/src/main/features/features.xml b/features/ovsdb/src/main/features/features.xml
index d45ca792bcf2c112e9a854b25b0426b4aefb7260..2790989e26ab8111d6bddc1d1f68be22b19dc15f 100644 (file)
--- a/features/ovsdb/src/main/features/features.xml
+++ b/features/ovsdb/src/main/features/features.xml
@@ -2,79 +2,29 @@
 <features name="ovsdb-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-  <repository>mvn:org.opendaylight.controller/features-adsal/${sal.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.controller/features-nsf/${nsf.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension/${openflowplugin.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${openflowplugin.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.neutron/features-neutron/${networkconfig.neutron.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.ovsdb/southbound-features/1.1.0-SNAPSHOT/xml/features</repository>
-  <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
+  <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension/{{VERSION}}/xml/features</repository>
+  <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/{{VERSION}}/xml/features</repository>
+  <repository>mvn:org.opendaylight.neutron/features-neutron/{{VERSION}}/xml/features</repository>
+  <repository>mvn:org.opendaylight.ovsdb/southbound-features/1.2.1-SNAPSHOT/xml/features</repository>
+  <repository>mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features</repository>
+  <repository>mvn:org.opendaylight.ovsdb/library-features/{{VERSION}}/xml/features</repository>
+  <repository>mvn:org.opendaylight.dlux/features-dlux/{{VERSION}}/xml/features</repository>
 
   <feature name="odl-ovsdb-all" description="OpenDaylight :: OVSDB :: all"
            version='${project.version}'>
     <feature version="${ovsdb.library.version}">odl-ovsdb-library</feature>
-    <feature version="${ovsdb.plugin.version}">odl-ovsdb-plugin</feature>
-    <feature version="${ovsdb.northbound.version}">odl-ovsdb-northbound</feature>
-  </feature>
-
-  <feature name="odl-ovsdb-library" description="OVSDB :: Library"
-           version='${ovsdb.library.version}'>
-    <feature version="${odl.karaf.base.version}">odl-base-all</feature>
-    <bundle>mvn:com.google.code.gson/gson/${gson.version}</bundle>
-    <bundle>mvn:org.opendaylight.ovsdb/library/${ovsdb.library.version}</bundle>
   </feature>
 
   <feature name="odl-ovsdb-schema-openvswitch" description="OVSDB :: Schema :: Open_vSwitch"
            version='${schema.openvswitch.version}'>
     <feature version="${ovsdb.library.version}">odl-ovsdb-library</feature>
-    <bundle>mvn:org.opendaylight.ovsdb/schema.openvswitch/${schema.openvswitch.version}</bundle>
+    <bundle>mvn:org.opendaylight.ovsdb/schema.openvswitch/{{VERSION}}</bundle>
   </feature>
 
   <feature name="odl-ovsdb-schema-hardwarevtep" description="OVSDB :: Schema :: hardware_vtep"
            version='${schema.hardwarevtep.version}'>
     <feature version="${ovsdb.library.version}">odl-ovsdb-library</feature>
-    <bundle>mvn:org.opendaylight.ovsdb/schema.hardwarevtep/${schema.hardwarevtep.version}</bundle>
-  </feature>
-
-  <feature name="odl-ovsdb-plugin" description="OpenDaylight :: OVSDB :: Plugin"
-           version='${ovsdb.plugin.version}'>
-    <feature version="${openflowplugin.version}">odl-openflowplugin-nsf-services</feature>
-    <feature version="${ovsdb.library.version}">odl-ovsdb-library</feature>
-    <feature version="${schema.openvswitch.version}">odl-ovsdb-schema-openvswitch</feature>
-    <feature version="${schema.hardwarevtep.version}">odl-ovsdb-schema-hardwarevtep</feature>
-    <bundle>mvn:org.opendaylight.ovsdb/plugin/${ovsdb.plugin.version}</bundle>
-    <bundle>mvn:org.opendaylight.ovsdb/plugin-shell/${plugin.shell.version}</bundle>
-  </feature>
-
-  <feature name="odl-ovsdb-northbound" description="OpenDaylight :: OVSDB :: Northbound"
-           version='${ovsdb.northbound.version}'>
-    <feature version="${ovsdb.plugin.version}">odl-ovsdb-plugin</feature>
-    <feature version="${nsf.version}">odl-adsal-northbound</feature>
-    <!-- workaround for sun.reflect problem
-    <feature version="${sal.version}">odl-adsal-core</feature>
-    <bundle>mvn:org.opendaylight.controller/clustering.services/${clustering.services.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/usermanager/${usermanager.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/usermanager.implementation/${usermanager.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/containermanager/${containermanager.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/containermanager.implementation/${containermanager.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/configuration/${configuration.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/configuration.implementation/${configuration.implementation.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/appauth/${appauth.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/commons.northbound/${northbound.commons.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/topologymanager/${topologymanager.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/switchmanager/${switchmanager.api.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/bundlescanner/${bundlescanner.api.version}</bundle>
-    workaround for sun.reflect problem -->
-    <bundle>mvn:org.opendaylight.ovsdb/utils.servicehelper/${ovsdb.utils.servicehelper.version}</bundle>
-    <bundle>mvn:org.opendaylight.ovsdb/northbound/${ovsdb.northbound.version}</bundle>
-  </feature>
-
-  <feature name="odl-ovsdb-compatibility-layer" description="OpenDaylight :: OVSDB :: Plugin Compatibility Layer"
-           version='${ovsdb.plugin.compatibility.layer.version}'>
-    <feature version="${sal.version}">odl-adsal-core</feature>
-    <feature version="${ovsdb.plugin.version}">odl-ovsdb-plugin</feature>
-    <bundle>mvn:org.opendaylight.ovsdb/ovsdb-plugin-compatibility-layer/${ovsdb.plugin.compatibility.layer.version}
-    </bundle>
+    <bundle>mvn:org.opendaylight.ovsdb/schema.hardwarevtep/{{VERSION}}</bundle>
   </feature>
 
   <feature name="odl-ovsdb-openstack" description="OpenDaylight :: OVSDB :: OpenStack Network Virtualization"
@@ -82,13 +32,21 @@
     <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
     <feature version="${openflowplugin.version}">odl-openflowplugin-nsf-model</feature>
     <feature version="${networkconfig.neutron.version}">odl-neutron-service</feature>
-    <feature version="1.1.0-SNAPSHOT">odl-ovsdb-southbound-impl-ui</feature>
+    <feature version="${project.version}">odl-ovsdb-southbound-impl-ui</feature>
     <feature version="${openflowplugin.version}">odl-openflowplugin-flow-services</feature>
     <feature version="${openflowplugin.version}">odl-openflowplugin-nxm-extensions</feature>
-    <bundle>mvn:org.opendaylight.ovsdb/utils.servicehelper/${ovsdb.utils.servicehelper.version}</bundle>
-    <bundle>mvn:org.opendaylight.ovsdb/openstack.net-virt/${openstack.netvirt.version}</bundle>
-    <bundle>mvn:org.opendaylight.ovsdb/openstack.net-virt-providers/${openstack.netvirt.providers.version}</bundle>
-    <configfile finalname="etc/opendaylight/karaf/netvirt-impl-default-config.xml">mvn:org.opendaylight.ovsdb/openstack.net-virt/${project.version}/xml/config</configfile>
-    <configfile finalname="etc/opendaylight/karaf/netvirt-providers-impl-default-config.xml">mvn:org.opendaylight.ovsdb/openstack.net-virt-providers/${project.version}/xml/config</configfile>
+    <bundle>mvn:org.opendaylight.ovsdb/utils.servicehelper/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.ovsdb/utils.neutron-utils/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.ovsdb/utils.mdsal-utils/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.ovsdb/utils.southbound-utils/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.ovsdb/openstack.net-virt/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.ovsdb/openstack.net-virt-providers/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.neutron/dummyprovider/{{VERSION}}</bundle>
+    <configfile finalname="etc/opendaylight/karaf/netvirt-impl-default-config.xml">mvn:org.opendaylight.ovsdb/openstack.net-virt/{{VERSION}}/xml/config</configfile>
+    <configfile finalname="etc/opendaylight/karaf/netvirt-providers-impl-default-config.xml">mvn:org.opendaylight.ovsdb/openstack.net-virt-providers/{{VERSION}}/xml/config</configfile>
+  </feature>
+  <feature name="odl-ovsdb-ui" description="OpenDaylight :: OVSDB :: DLUX Integration Plugin" version='${ovsdb.ui.version}'>
+    <feature version="${dlux.version}">odl-dlux-core</feature>
+    <bundle>mvn:org.opendaylight.ovsdb/ovsdb-ui-bundle/{{VERSION}}</bundle>
   </feature>
 </features>
NetVirt - Archived