TSDR Karaf4 Migration

Change-Id: I763145b8ea7c542b185dcb7fd1ccb8fc146d9491
Signed-off-by: YuLing Chen <yulingchen54@gmail.com>
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
new file mode 100644 (file)
index 0000000..3c691a1
--- /dev/null
+++ b/artifacts/pom.xml
@@ -0,0 +1,297 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2013 Robert Varga. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+      <groupId>org.opendaylight.odlparent</groupId>
+      <artifactId>odlparent-lite</artifactId>
+      <version>1.9.0-SNAPSHOT</version>
+      <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.tsdr</groupId>
+    <artifactId>tsdr-artifacts</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <name>ODL :: tsdr :: ${project.artifactId}</name>
+    <packaging>pom</packaging>
+
+    <dependencyManagement>
+        <dependencies>
+        <!-- TSDR modules -->
+        <dependency>
+           <groupId>${project.groupId}</groupId>
+           <artifactId>tsdr-datastorage</artifactId>
+           <version>${project.version}</version>
+        </dependency>
+        <dependency>
+           <groupId>${project.groupId}</groupId>
+           <artifactId>tsdr-datapurge</artifactId>
+           <version>${project.version}</version>
+        </dependency>
+            <dependency>
+           <groupId>${project.groupId}</groupId>
+           <artifactId>tsdr-persistence-spi</artifactId>
+           <version>${project.version}</version>
+        </dependency>
+            <dependency>
+           <groupId>${project.groupId}</groupId>
+           <artifactId>tsdr-dataquery</artifactId>
+           <version>${project.version}</version>
+        </dependency>
+            <dependency>
+           <groupId>${project.groupId}</groupId>
+           <artifactId>tsdr-collector-spi</artifactId>
+           <version>${project.version}</version>
+        </dependency>
+            <dependency>
+           <groupId>${project.groupId}</groupId>
+           <artifactId>tsdr-persistence-hsqldb</artifactId>
+           <version>${project.version}</version>
+        </dependency>
+            <dependency>
+           <groupId>${project.groupId}</groupId>
+           <artifactId>tsdr-persistence-cassandra</artifactId>
+           <version>${project.version}</version>
+        </dependency>
+            <dependency>
+           <groupId>${project.groupId}</groupId>
+           <artifactId>tsdr-persistence-hbase</artifactId>
+           <version>${project.version}</version>
+        </dependency>
+            <dependency>
+           <groupId>${project.groupId}</groupId>
+           <artifactId>tsdr-persistence-elasticsearch</artifactId>
+           <version>${project.version}</version>
+        </dependency>
+            <dependency>
+           <groupId>${project.groupId}</groupId>
+           <artifactId>tsdr-persistence-elasticsearch</artifactId>
+           <version>${project.version}</version>
+        </dependency>
+            <dependency>
+           <groupId>${project.groupId}</groupId>
+           <artifactId>tsdr-controller-metrics-collector</artifactId>
+           <version>${project.version}</version>
+        </dependency>
+            <dependency>
+           <groupId>${project.groupId}</groupId>
+           <artifactId>tsdr-netflow-statisctics-collector</artifactId>
+           <version>${project.version}</version>
+        </dependency>
+            <dependency>
+           <groupId>${project.groupId}</groupId>
+           <artifactId>tsdr-openflow-statisctics-collector</artifactId>
+           <version>${project.version}</version>
+        </dependency>
+            <dependency>
+           <groupId>${project.groupId}</groupId>
+           <artifactId>tsdr-syslog-collector</artifactId>
+           <version>${project.version}</version>
+        </dependency>
+            <dependency>
+           <groupId>${project.groupId}</groupId>
+           <artifactId>tsdr-restconf-collector</artifactId>
+           <version>${project.version}</version>
+        </dependency>
+        <!-- TSDR Configuration -->
+        <!-- TSDR Core -->
+        <dependency>
+          <groupId>org.opendaylight.tsdr</groupId>
+          <artifactId>tsdr-datastorage</artifactId>
+          <version>${project.version}</version>
+          <type>xml</type>
+          <classifier>config</classifier>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.tsdr</groupId>
+          <artifactId>tsdr-dataquery</artifactId>
+          <version>${project.version}</version>
+          <type>xml</type>
+          <classifier>config</classifier>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.tsdr</groupId>
+          <artifactId>tsdr-datapurge</artifactId>
+          <version>${project.version}</version>
+          <type>xml</type>
+          <classifier>config</classifier>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.tsdr</groupId>
+          <artifactId>tsdr-datapurge</artifactId>
+          <version>${project.version}</version>
+          <type>cfg</type>
+          <classifier>config1</classifier>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.tsdr</groupId>
+          <artifactId>tsdr-collector-spi</artifactId>
+          <version>${project.version}</version>
+          <type>xml</type>
+          <classifier>config</classifier>
+        </dependency>
+
+         <!--TSDR Collectors -->
+        <dependency>
+          <groupId>org.opendaylight.tsdr</groupId>
+          <artifactId>tsdr-restconf-collector</artifactId>
+          <classifier>config</classifier>
+          <version>${project.version}</version>
+          <type>xml</type>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.tsdr</groupId>
+          <artifactId>tsdr-restconf-collector</artifactId>
+          <classifier>config1</classifier>
+          <version>${project.version}</version>
+          <type>cfg</type>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.tsdr</groupId>
+          <artifactId>tsdr-syslog-collector</artifactId>
+          <version>${project.version}</version>
+          <type>xml</type>
+          <classifier>config</classifier>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.tsdr</groupId>
+          <artifactId>tsdr-netflow-statistics-collector</artifactId>
+          <version>${project.version}</version>
+          <type>xml</type>
+          <classifier>config</classifier>
+        </dependency>
+       <dependency>
+          <groupId>org.opendaylight.tsdr</groupId>
+          <artifactId>tsdr-openflow-statistics-collector</artifactId>
+          <version>${project.version}</version>
+          <type>xml</type>
+          <classifier>config</classifier>
+       </dependency>
+       <dependency>
+          <groupId>org.opendaylight.tsdr</groupId>
+          <artifactId>tsdr-controller-metrics-collector</artifactId>
+          <version>${project.version}</version>
+          <type>xml</type>
+          <classifier>config</classifier>
+       </dependency>
+       <dependency>
+          <groupId>org.opendaylight.tsdr</groupId>
+          <artifactId>tsdr-syslog-collector</artifactId>
+          <version>${project.version}</version>
+          <type>xml</type>
+          <classifier>config</classifier>
+       </dependency>
+       <!-- TSDR datastores -->
+      <dependency>
+          <groupId>org.opendaylight.tsdr</groupId>
+          <artifactId>tsdr-persistence-hsqldb</artifactId>
+          <version>${project.version}</version>
+          <type>xml</type>
+          <classifier>config</classifier>
+      </dependency>
+      <dependency>
+          <groupId>org.opendaylight.tsdr</groupId>
+          <artifactId>tsdr-persistence-cassandra</artifactId>
+          <version>${project.version}</version>
+          <type>xml</type>
+          <classifier>config</classifier>
+      </dependency>
+      <dependency>
+          <groupId>org.opendaylight.tsdr</groupId>
+          <artifactId>tsdr-persistence-hbase</artifactId>
+          <version>${project.version}</version>
+          <type>xml</type>
+          <classifier>config</classifier>
+      </dependency>
+
+      <!-- TSDR Features -->
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>features-tsdr</artifactId>
+        <version>${project.version}</version>
+        <classifier>features</classifier>
+        <type>xml</type>
+      </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>features4-tsdr</artifactId>
+        <version>${project.version}</version>
+        <classifier>features</classifier>
+        <type>xml</type>
+      </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>odl-tsdr-core</artifactId>
+        <version>${project.version}</version>
+        <classifier>features</classifier>
+        <type>xml</type>
+      </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>odl-tsdr-hsqldb</artifactId>
+        <version>${project.version}</version>
+        <classifier>features</classifier>
+        <type>xml</type>
+      </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>odl-tsdr-cassandra</artifactId>
+        <version>${project.version}</version>
+        <classifier>features</classifier>
+        <type>xml</type>
+      </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>odl-tsdr-hbase</artifactId>
+        <version>${project.version}</version>
+        <classifier>features</classifier>
+        <type>xml</type>
+      </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>odl-tsdr-elasticsearch</artifactId>
+        <version>${project.version}</version>
+        <classifier>features</classifier>
+        <type>xml</type>
+      </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>odl-tsdr-netflow-statistics-collector</artifactId>
+        <version>${project.version}</version>
+        <classifier>features</classifier>
+        <type>xml</type>
+      </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>odl-tsdr-openflow-statistics-collector</artifactId>
+        <version>${project.version}</version>
+        <classifier>features</classifier>
+        <type>xml</type>
+      </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>odl-tsdr-restconf-collector</artifactId>
+        <version>${project.version}</version>
+        <classifier>features</classifier>
+        <type>xml</type>
+      </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>odl-tsdr-syslog-collector</artifactId>
+        <version>${project.version}</version>
+        <classifier>features</classifier>
+        <type>xml</type>
+      </dependency>
+   </dependencies>
+ </dependencyManagement>
+
+</project>
+

diff --git a/collectors/openflow-statistics-collector/pom.xml b/collectors/openflow-statistics-collector/pom.xml
index 40650edffcfa8f49e1b554763acd411c647a345c..86842152e683ba18a5fcdf893124cedfaf6f466a 100644 (file)
--- a/collectors/openflow-statistics-collector/pom.xml
+++ b/collectors/openflow-statistics-collector/pom.xml
@@ -139,11 +139,6 @@
                 <artifactId>mockito-core</artifactId>
                 <scope>test</scope>
         </dependency>
-        <dependency>
-                <groupId>org.mockito</groupId>
-                <artifactId>mockito-core</artifactId>
-                <scope>test</scope>
-        </dependency>
         <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>

diff --git a/collectors/restconf-collector/pom.xml b/collectors/restconf-collector/pom.xml
index 1eb270fb630891f682aa5cd11c4d21aace51ac11..8a58ea4de95c9386894d36932d1c82b7385fd02e 100644 (file)
--- a/collectors/restconf-collector/pom.xml
+++ b/collectors/restconf-collector/pom.xml
@@ -9,6 +9,7 @@
     </parent>
     <artifactId>tsdr-restconf-collector</artifactId>
     <packaging>bundle</packaging>
+    <name>ODL :: tsdr :: ${project.artifactId}</name>
     <properties>
         <yang.jmx.generator.plugin.version>0.7.0-SNAPSHOT</yang.jmx.generator.plugin.version>
         <javax.servlet.api.version>3.0.1</javax.servlet.api.version>

diff --git a/collectors/snmp-data-collector/pom.xml b/collectors/snmp-data-collector/pom.xml
index 8689e2735a48b04d9f256084bed0745a26f0cd34..4b6f5a300606a22a3cfe8556d7e407ecf0b926fb 100755 (executable)
--- a/collectors/snmp-data-collector/pom.xml
+++ b/collectors/snmp-data-collector/pom.xml
@@ -146,7 +146,6 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.dependencymanager</artifactId>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

diff --git a/configuration/pom.xml b/configuration/pom.xml
index 98f47c54b9bde5028b321f4d0c40120f71ded739..9781bbf12e190132fd78caba9a72edfaea78a76d 100644 (file)
--- a/configuration/pom.xml
+++ b/configuration/pom.xml
@@ -117,7 +117,6 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.dependencymanager</artifactId>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

diff --git a/datapurge/pom.xml b/datapurge/pom.xml
index a44a36fb2c531324b7ba615ac1d172d314bcb702..840dbaaa9f5c696186e085dcac330e2728a156f2 100644 (file)
--- a/datapurge/pom.xml
+++ b/datapurge/pom.xml
@@ -103,16 +103,6 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.console</artifactId>
-            <version> ${karaf.shell.command.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.commands</artifactId>
-            <version> ${karaf.shell.command.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.tsdr</groupId>
             <artifactId>tsdr-persistence-spi</artifactId>
@@ -156,7 +146,6 @@
     <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.dependencymanager</artifactId>
-        <scope>provided</scope>
     </dependency>
     </dependencies>
 </project>

diff --git a/dataquery/pom.xml b/dataquery/pom.xml
index d03dc5a2134d36dfaebf8db5c5567cd9fa3bfbfb..aad206b683a05760bb3c6f0b18a6591400585f3e 100644 (file)
--- a/dataquery/pom.xml
+++ b/dataquery/pom.xml
@@ -21,13 +21,13 @@
                 <configuration>
                     <instructions>
                         <Import-Package>
-                            *,
                             com.sun.jersey.spi.container.servlet,
                             org.eclipse.jetty.servlets;version="[8.1,10)",
                             org.opendaylight.aaa.shiro.filters,
                             org.opendaylight.aaa.shiro.realm,
                             org.opendaylight.aaa.shiro.web.env,
-                            org.apache.shiro.web.env
+                            org.apache.shiro.web.env,
+                            *
                         </Import-Package>
                         <Web-ContextPath>/tsdr</Web-ContextPath>
                     </instructions>

diff --git a/datastorage/pom.xml b/datastorage/pom.xml
index 6d24c619184a30fae3edd8743067ec861d206a1b..ca0473cbf25b422a4504131552be5badcdbf0ecc 100644 (file)
--- a/datastorage/pom.xml
+++ b/datastorage/pom.xml
@@ -98,16 +98,6 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.console</artifactId>
-            <version> ${karaf.shell.command.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.commands</artifactId>
-            <version> ${karaf.shell.command.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.tsdr</groupId>
             <artifactId>tsdr-persistence-spi</artifactId>

diff --git a/features/features-tsdr/pom.xml b/features/features-tsdr/pom.xml
index b7edc6d7a38a45c9ea6f03b0fe05231881a868ff..fe3dfd26300a89f934a7097a5cce5d69e417d360 100644 (file)
--- a/features/features-tsdr/pom.xml
+++ b/features/features-tsdr/pom.xml
@@ -24,6 +24,7 @@
     <protobuf.version>2.4.1</protobuf.version>
     <karaf.shell.command.version>3.0.1</karaf.shell.command.version>
     <sigar.version>1.6.4</sigar.version>
+    <felix.version>4.3.0</felix.version>
     <hadoop.version>1.2.0</hadoop.version>
     <hsqldb.version>1.8.0.10</hsqldb.version>
     <gson.version>2.5</gson.version>
@@ -132,6 +133,7 @@
           <classifier>config</classifier>
       </dependency>
 
+<!--
       <dependency>
           <groupId>org.opendaylight.tsdr</groupId>
           <artifactId>tsdr-snmp-data-collector</artifactId>
@@ -145,6 +147,7 @@
           <classifier>config</classifier>
       </dependency>
 
+-->
       <dependency>
           <groupId>org.opendaylight.tsdr</groupId>
           <artifactId>tsdr-openflow-statistics-collector</artifactId>
@@ -379,6 +382,7 @@
           <version>${project.version}</version>
           <type>cfg</type>
       </dependency>
+<!--
       <dependency>
           <groupId>org.opendaylight.tsdr</groupId>
           <artifactId>tsdr-snmp-data-collector</artifactId>
@@ -403,6 +407,7 @@
           <artifactId>snmp</artifactId>
           <version>1.4.0-SNAPSHOT</version>
       </dependency>
+-->
       <dependency>
           <groupId>org.apache.servicemix.bundles</groupId>
           <artifactId>org.apache.servicemix.bundles.snmp4j</artifactId>
@@ -421,7 +426,7 @@
       <dependency>
           <groupId>org.apache.felix</groupId>
           <artifactId>org.apache.felix.dependencymanager</artifactId>
-          <scope>provided</scope>
+          <version>${felix.version}</version>
       </dependency>
   </dependencies>
 

diff --git a/features/features4-tsdr/pom.xml b/features/features4-tsdr/pom.xml
index f2b60c99b37dd015191c4a14342f6fb8d41990d1..4f9edf312452937c73e1d4f22dc264e30ae4ef61 100644 (file)
--- a/features/features4-tsdr/pom.xml
+++ b/features/features4-tsdr/pom.xml
@@ -29,21 +29,79 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-tsdr-model</artifactId>
+            <artifactId>odl-tsdr-core</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-tsdr-model-rest</artifactId>
+            <artifactId>odl-tsdr-hsqldb</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-tsdr-all</artifactId>
+            <artifactId>odl-tsdr-cassandra</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-hbaseclient</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+<!--
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-tsdr-hbase</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+-->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-tsdr-elasticsearch</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-tsdr-syslog-collector</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-tsdr-openflow-statistics-collector</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-tsdr-netflow-statistics-collector</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-tsdr-restconf-collector</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-tsdr-hsqldb-all</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>

diff --git a/features/odl-hbaseclient/pom.xml b/features/odl-hbaseclient/pom.xml
new file mode 100644 (file)
index 0000000..840d32f
--- /dev/null
+++ b/features/odl-hbaseclient/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017 Red Hat, Inc. and others.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.tsdr</groupId>
+    <artifactId>odl-hbaseclient</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>ODL :: tsdr :: ${project.artifactId}</name>
+</project>

diff --git a/features/odl-hbaseclient/src/main/feature/feature.xml b/features/odl-hbaseclient/src/main/feature/feature.xml
new file mode 100644 (file)
index 0000000..ec41709
--- /dev/null
+++ b/features/odl-hbaseclient/src/main/feature/feature.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017 Red Hat, Inc. and others.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+ -->
+<features name="odl-tsdr-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
+    <feature name="odl-hbaseclient" version="${project.version}" start-level="50">
+       <feature>war</feature>
+       <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/1.9.0</bundle>
+       <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/1.9.0</bundle>
+       <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
+       <bundle dependency="true">mvn:javax.mail/mail/1.4.5</bundle>
+       <bundle dependency="true">mvn:commons-codec/commons-codec/1.6</bundle>
+       <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/1.8.3_1</bundle>
+       <bundle dependency="true">mvn:commons-collections/commons-collections/3.2.1</bundle>
+       <bundle dependency="true">mvn:commons-digester/commons-digester/2.1</bundle>
+       <bundle dependency="true">mvn:commons-jxpath/commons-jxpath/1.3</bundle>
+       <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/1.1_4</bundle>
+       <bundle dependency="true">mvn:commons-lang/commons-lang/2.6</bundle>
+       <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.7.0_6</bundle>
+       <bundle dependency="true">mvn:commons-configuration/commons-configuration/1.6</bundle>
+       <bundle dependency="true">mvn:commons-daemon/commons-daemon/1.0.5</bundle>
+       <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/3.1_7</bundle>
+       <bundle dependency="true">mvn:org.apache.commons/commons-math/2.2</bundle>
+       <bundle dependency="true">mvn:commons-net/commons-net/3.1</bundle>
+       <bundle dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/1.9.7</bundle>
+       <bundle dependency="true">mvn:org.codehaus.jackson/jackson-mapper-asl/1.9.7</bundle>
+       <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty/6.1.26_4</bundle>
+       <bundle dependency="true">mvn:org.apache.zookeeper/zookeeper/3.3.5</bundle>
+       <bundle>wrap:mvn:com.google.protobuf/protobuf-java/2.4.1</bundle>
+       <bundle>wrap:mvn:org.apache.hadoop/hadoop-core/1.2.0</bundle>
+       <bundle>wrap:mvn:org.apache.hbase/hbase/0.94.15</bundle>
+    </feature>
+</features>

diff --git a/features/odl-tsdr-model/pom.xml b/features/odl-tsdr-cassandra/pom.xml
similarity index 52%
rename from features/odl-tsdr-model/pom.xml
rename to features/odl-tsdr-cassandra/pom.xml
index 18edc0987a12c1aea963735dab575cf8ad241ff1..f62c680bae170b3f12a30d5e300b3d9820a18c39 100644 (file)
--- a/features/odl-tsdr-model/pom.xml
+++ b/features/odl-tsdr-cassandra/pom.xml
@@ -1,11 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2017 Red Hat, Inc. and others.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -19,26 +12,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </parent>
 
     <groupId>org.opendaylight.tsdr</groupId>
-    <artifactId>odl-tsdr-model</artifactId>
+    <artifactId>odl-tsdr-cassandra</artifactId>
     <version>1.4.0-SNAPSHOT</version>
     <packaging>feature</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
-    <name>ODL :: tsdr :: ${project.artifactId}</name>
+    <name>ODL :: tsdr :: Cassandra</name>
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.11.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>1.6.0-SNAPSHOT</version>
+             <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>tsdr-artifacts</artifactId>
+                <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -46,15 +32,24 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependencyManagement>
 
     <dependencies>
+         <!-- TSDR dependencies -->
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>odl-mdsal-models</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-tsdr-core</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
-            <artifactId>model-inventory</artifactId>
+            <groupId>org.opendaylight.tsdr</groupId>
+            <artifactId>tsdr-persistence-cassandra</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.tsdr</groupId>
+            <artifactId>tsdr-persistence-cassandra</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>config</classifier>
         </dependency>
     </dependencies>
 </project>

diff --git a/features/odl-tsdr-cassandra/src/main/feature/feature.xml b/features/odl-tsdr-cassandra/src/main/feature/feature.xml
new file mode 100644 (file)
index 0000000..3cf3b1c
--- /dev/null
+++ b/features/odl-tsdr-cassandra/src/main/feature/feature.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<features name="odl-tsdr-${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">
+    <!-- Cassandra persistence data store -->
+    <feature name='odl-tsdr-cassandra' version='${project.version}' description="OpenDaylight :: TSDR :: Cassandra Persistence">
+    <configfile finalname="etc/tsdr-persistence-cassandra.properties">mvn:org.opendaylight.tsdr/tsdr-persistence-cassandra/${project.version}/xml/config</configfile>
+    </feature>
+</features>

diff --git a/features/odl-tsdr-controller-metrics-collector/pom.xml b/features/odl-tsdr-controller-metrics-collector/pom.xml
new file mode 100644 (file)
index 0000000..c41f5d6
--- /dev/null
+++ b/features/odl-tsdr-controller-metrics-collector/pom.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.tsdr</groupId>
+    <artifactId>odl-tsdr-controller-metrics-collector</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>ODL :: tsdr :: controller collector</name>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>tsdr-artifacts</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+
+    <dependencies>
+         <!-- TSDR dependencies -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-tsdr-core</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.tsdr</groupId>
+            <artifactId>tsdr-controller-metrics-collector</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.tsdr</groupId>
+            <artifactId>tsdr-controller-metrics-collector</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>config</classifier>
+        </dependency>
+    </dependencies>
+</project>

diff --git a/features/odl-tsdr-controller-metrics-collector/src/main/feature/feature.xml b/features/odl-tsdr-controller-metrics-collector/src/main/feature/feature.xml
new file mode 100644 (file)
index 0000000..eee2379
--- /dev/null
+++ b/features/odl-tsdr-controller-metrics-collector/src/main/feature/feature.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<features name="odl-tsdr-${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">
+    <!-- OpenFlow collector -->
+    <feature name='odl-tsdr-controller-metrics-collector' version='${project.version}' description="OpenDaylight :: TSDR :: Controller Metrics  Collector">
+    <configfile finalname="${config.configfile.directory}/154-tsdr-controller-metrics-collector-config.xml">mvn:org.opendaylight.tsdr/tsdr-controller-metrics-collector/${project.version}/xml/config</configfile>
+    </feature>
+</features>

diff --git a/features/odl-tsdr-core/pom.xml b/features/odl-tsdr-core/pom.xml
new file mode 100644 (file)
index 0000000..913a9e7
--- /dev/null
+++ b/features/odl-tsdr-core/pom.xml
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.tsdr</groupId>
+    <artifactId>odl-tsdr-core</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+    <!-- <name> formatting is used by autorelease to parse and notify projects on
+         build failure. Please do not modify this unless you have a good reason. -->
+    <name>ODL :: tsdr :: core</name>
+    <properties>
+        <openflowplugin.version>0.5.0-SNAPSHOT</openflowplugin.version>
+        <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
+        <mdsal.common.version>2.3.0-SNAPSHOT</mdsal.common.version>
+        <restconf.version>1.6.0-SNAPSHOT</restconf.version>
+        <gson.version>2.5</gson.version>
+        <config.version>0.7.0-SNAPSHOT</config.version>
+        <controller.mdsal.version>1.6.0-SNAPSHOT</controller.mdsal.version>
+        <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
+        <felix.version>4.3.0</felix.version>
+    </properties>
+ 
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- ODL-TSDR-ARTICFACTS -->
+             <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>tsdr-artifacts</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <!-- ODL-OPENFLOWPLUGIN-ARTIFACTS -->
+            <dependency>
+                <groupId>org.opendaylight.openflowplugin</groupId>
+                <artifactId>openflowplugin-artifacts</artifactId>
+                <version>${openflowplugin.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+            <!-- ODL-CONTROLLER-ARTIFACTS -->
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>${controller.mdsal.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>config-artifacts</artifactId>
+                <version>${config.version}</version>
+               <type>pom</type>
+               <scope>import</scope>
+            </dependency>
+
+            <!-- ODL-MDSAL-ARTIFACTS -->
+             <dependency>
+                 <groupId>org.opendaylight.mdsal</groupId>
+                 <artifactId>mdsal-artifacts</artifactId>
+                 <version>${mdsal.common.version}</version>
+                 <scope>import</scope>
+                 <type>pom</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>mdsal-model-artifacts</artifactId>
+                <version>${mdsal.model.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <!-- ODL-NETCONF/RESTCONF-ARTIFACTS -->
+             <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>restconf-artifacts</artifactId>
+                <version>${restconf.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <!-- yangtools -->
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>odl-yangtools-common</artifactId>
+            <version>${yangtools.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <scope>runtime</scope>
+        </dependency>
+
+        <!-- Controller -->
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <scope>runtime</scope>
+        </dependency>
+
+        <!-- MDSAL MODEL -->
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>odl-mdsal-models</artifactId>
+            <version>${mdsal.model.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <scope>runtime</scope>
+        </dependency>
+
+         <!-- Openflow plugin -->
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-nsf-model</artifactId>
+            <version>${openflowplugin.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+             <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>ietf-inet-types-2013-07-15</artifactId>
+            <version>1.3.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>ietf-yang-types-20130715</artifactId>
+        </dependency>
+
+
+        <!-- restconf -->
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-restconf-all</artifactId>
+            <version>${restconf.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <!-- TSDR dependencies -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tsdr-persistence-spi</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tsdr-collector-spi</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tsdr-datastorage</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tsdr-datapurge</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tsdr-dataquery</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <!-- TSDR config file -->
+        <dependency>
+          <groupId>org.opendaylight.tsdr</groupId>
+          <artifactId>tsdr-collector-spi</artifactId>
+          <version>${project.version}</version>
+          <type>xml</type>
+          <classifier>config</classifier>
+      </dependency>
+        <dependency>
+            <groupId>org.opendaylight.tsdr</groupId>
+            <artifactId>tsdr-datastorage</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>config</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.tsdr</groupId>
+            <artifactId>tsdr-datapurge</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>config</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.tsdr</groupId>
+            <artifactId>tsdr-datapurge</artifactId>
+            <version>${project.version}</version>
+            <type>cfg</type>
+            <classifier>config1</classifier>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.tsdr</groupId>
+          <artifactId>tsdr-dataquery</artifactId>
+          <version>${project.version}</version>
+          <type>xml</type>
+          <classifier>config</classifier>
+        </dependency>
+    </dependencies>
+</project>

diff --git a/features/odl-tsdr-core/src/main/feature/feature.xml b/features/odl-tsdr-core/src/main/feature/feature.xml
new file mode 100644 (file)
index 0000000..54e937b
--- /dev/null
+++ b/features/odl-tsdr-core/src/main/feature/feature.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<features name="odl-tsdr-${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">
+    <!-- TSDR core modules -->
+    <feature name='odl-tsdr-core' version='${project.version}' description="OpenDaylight :: TSDR :: Core">
+  <configfile finalname="${config.configfile.directory}/145-TSDR-collector-spi-config.xml">mvn:org.opendaylight.tsdr/tsdr-collector-spi/${project.version}/xml/config</configfile>
+  <configfile finalname="${config.configfile.directory}/150-TSDR-datastorage-config.xml">mvn:org.opendaylight.tsdr/tsdr-datastorage/${project.version}/xml/config</configfile>
+ <configfile finalname="${config.configfile.directory}/152-TSDR-datapurge-config.xml">mvn:org.opendaylight.tsdr/tsdr-datapurge/${project.version}/xml/config</configfile>
+  <configfile finalname="etc/tsdr.data.purge.cfg">mvn:org.opendaylight.tsdr/tsdr-datapurge/${project.version}/cfg/config1</configfile>
+  <configfile finalname="${config.configfile.directory}/155-TSDR-dataquery-config.xml">mvn:org.opendaylight.tsdr/tsdr-dataquery/${project.version}/xml/config</configfile>
+    </feature>
+</features>

diff --git a/features/odl-tsdr-elasticsearch/pom.xml b/features/odl-tsdr-elasticsearch/pom.xml
new file mode 100644 (file)
index 0000000..4d82f21
--- /dev/null
+++ b/features/odl-tsdr-elasticsearch/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.tsdr</groupId>
+    <artifactId>odl-tsdr-elasticsearch</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>ODL :: tsdr :: elasticsearch</name>
+
+     <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>tsdr-artifacts</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+
+    <dependencies>
+      <!-- TSDR dependencies -->
+      <dependency>
+          <groupId>org.opendaylight.tsdr</groupId>
+          <artifactId>odl-tsdr-core</artifactId>
+          <version>${project.version}</version>
+          <type>xml</type>
+          <classifier>features</classifier>
+      </dependency>
+        <dependency>
+          <groupId>org.opendaylight.tsdr</groupId>
+          <artifactId>tsdr-persistence-elasticsearch</artifactId>
+          <version>${project.version}</version>
+      </dependency>
+  </dependencies>
+</project>

diff --git a/features/odl-tsdr-elasticsearch/src/main/feature/feature.xml b/features/odl-tsdr-elasticsearch/src/main/feature/feature.xml
new file mode 100644 (file)
index 0000000..08aab1b
--- /dev/null
+++ b/features/odl-tsdr-elasticsearch/src/main/feature/feature.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<features name="odl-odl-sdni-aggregator-${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">
+    <!-- ElasticSearch persistence data store -->
+    <feature name='odl-tsdr-elasticsearch' version='${project.version}' description="OpenDaylight :: TSDR :: ElasticSearch Persistence">
+    <configfile finalname="etc/tsdr-persistence-elasticsearch.properties">mvn:org.opendaylight.tsdr/tsdr-persistence-elasticsearch/${project.version}/properties/config</configfile>
+    <configfile finalname="etc/tsdr-persistence-elasticsearch_metric_mapping.json">mvn:org.opendaylight.tsdr/tsdr-persistence-elasticsearch/${project.version}/json/metric_config</configfile>
+    <configfile finalname="etc/tsdr-persistence-elasticsearch_log_mapping.json">mvn:org.opendaylight.tsdr/tsdr-persistence-elasticsearch/${project.version}/json/log_config</configfile>
+    <configfile finalname="etc/tsdr-persistence-elasticsearch_binary_mapping.json">mvn:org.opendaylight.tsdr/tsdr-persistence-elasticsearch/${project.version}/json/binary_config</configfile>
+    </feature>
+</features>

diff --git a/features/odl-tsdr-hbase/pom.xml b/features/odl-tsdr-hbase/pom.xml
new file mode 100644 (file)
index 0000000..201b507
--- /dev/null
+++ b/features/odl-tsdr-hbase/pom.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.tsdr</groupId>
+    <artifactId>odl-tsdr-hbase</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>ODL :: tsdr :: hbase</name>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>tsdr-artifacts</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <!-- TSDR Dependencies -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-tsdr-core</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-hbaseclient</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.tsdr</groupId>
+            <artifactId>tsdr-persistence-hbase</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <!-- This is provided by odl-hbaseclient -->
+                <exclusion>
+                    <groupId>org.apache.hbase</groupId>
+                    <artifactId>hbase</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.tsdr</groupId>
+            <artifactId>tsdr-persistence-hbase</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>config</classifier>
+            <exclusions>
+                <!-- This is provided by odl-hbaseclient -->
+                <exclusion>
+                    <groupId>org.apache.hbase</groupId>
+                    <artifactId>hbase</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+</dependencies>
+</project>

diff --git a/features/odl-tsdr-hbase/src/main/feature/feature.xml b/features/odl-tsdr-hbase/src/main/feature/feature.xml
new file mode 100644 (file)
index 0000000..c303866
--- /dev/null
+++ b/features/odl-tsdr-hbase/src/main/feature/feature.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright © 2016 Tata Consultancy Services and others. All rights reserved.
+        This program and the accompanying materials are made available under the
+        terms of the Eclipse Public License v1.0 which accompanies this distribution,
+        and is available at http://www.eclipse.org/legal/epl-v10.html -->
+<features name="odl-tsdr-${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">
+
+    <!-- HBase persistence data store -->
+    <feature name='odl-tsdr-hbase' version='${project.version}' description="OpenDaylight :: TSDR :: HBase Persistence">
+       <configfile finalname="etc/tsdr-persistence-hbase.properties">mvn:org.opendaylight.tsdr/tsdr-persistence-hbase/${project.version}/xml/config</configfile>
+    </feature>
+
+
+    <!-- HBase client wrapped in Karaf -->
+  <!--
+    <feature name="odl-hbaseclient" version="0.94.15" resolver="(obr)" start-level="50" description='OpenDaylight :: TSDR :: HBase Client'>
+
+    <feature name="odl-hbaseclient" version="0.94.15"  start-level="50" description='OpenDaylight :: TSDR :: HBase Client'>
+       <feature>war</feature>
+       <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/1.9.0</bundle>
+       <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/1.9.0</bundle>
+       <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
+       <bundle dependency="true">mvn:javax.mail/mail/1.4.5</bundle>
+       <bundle dependency="true">mvn:commons-codec/commons-codec/1.6</bundle>
+       <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/1.8.3_1</bundle>
+       <bundle dependency="true">mvn:commons-collections/commons-collections/3.2.1</bundle>
+       <bundle dependency="true">mvn:commons-digester/commons-digester/2.1</bundle>
+       <bundle dependency="true">mvn:commons-jxpath/commons-jxpath/1.3</bundle>
+       <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/1.1_4</bundle>
+       <bundle dependency="true">mvn:commons-lang/commons-lang/2.6</bundle>
+       <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.7.0_6</bundle>
+       <bundle dependency="true">mvn:commons-configuration/commons-configuration/1.6</bundle>
+       <bundle dependency="true">mvn:commons-daemon/commons-daemon/1.0.5</bundle>
+       <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/3.1_7</bundle>
+       <bundle dependency="true">mvn:org.apache.commons/commons-math/2.2</bundle>
+       <bundle dependency="true">mvn:commons-net/commons-net/3.1</bundle>
+       <bundle dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/1.9.7</bundle>
+       <bundle dependency="true">mvn:org.codehaus.jackson/jackson-mapper-asl/1.9.7</bundle>
+       <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty/6.1.26_4</bundle>
+       <bundle dependency="true">mvn:org.apache.zookeeper/zookeeper/3.3.5</bundle>
+       <bundle>wrap:mvn:com.google.protobuf/protobuf-java/2.4.1</bundle>
+       <bundle>wrap:mvn:org.apache.hadoop/hadoop-core/1.2.0</bundle>
+       <bundle>wrap:mvn:org.apache.hbase/hbase/0.94.27</bundle>
+    </feature>
+       -->
+</features>

diff --git a/features/odl-tsdr-hsqldb-all/pom.xml b/features/odl-tsdr-hsqldb-all/pom.xml
new file mode 100644 (file)
index 0000000..1aba6c5
--- /dev/null
+++ b/features/odl-tsdr-hsqldb-all/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.tsdr</groupId>
+    <artifactId>odl-tsdr-hsqldb-all</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+    <!-- <name> formatting is used by autorelease to parse and notify projects on
+         build failure. Please do not modify this unless you have a good reason. -->
+    <name>ODL :: tsdr :: hsqldb all</name>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-tsdr-core</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-tsdr-hsqldb</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-tsdr-openflow-statistics-collector</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+    </dependencies>
+</project>

diff --git a/features/odl-tsdr-hsqldb-all/src/main/feature/feature.xml b/features/odl-tsdr-hsqldb-all/src/main/feature/feature.xml
new file mode 100644 (file)
index 0000000..0f84d58
--- /dev/null
+++ b/features/odl-tsdr-hsqldb-all/src/main/feature/feature.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<features name="odl-tsdr-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
+    <!-- TSDR HSQL DataStore -->
+    <feature name="odl-tsdr-hsqldb-all" version="${project.version}" >
+  <configfile finalname="/etc/tsdr-persistence-hsqldb.properties">mvn:org.opendaylight.tsdr/tsdr-persistence-hsqldb/${project.version}/xml/config</configfile>
+  <configfile finalname="${config.configfile.directory}/151-tsdr-openflow-statistics-collector-config.xml">mvn:org.opendaylight.tsdr/tsdr-openflow-statistics-collector/${project.version}/xml/config</configfile>
+   <configfile finalname="${config.configfile.directory}/145-TSDR-collector-spi-config.xml">mvn:org.opendaylight.tsdr/tsdr-collector-spi/${project.version}/xml/config</configfile>
+  <configfile finalname="${config.configfile.directory}/150-TSDR-datastorage-config.xml">mvn:org.opendaylight.tsdr/tsdr-datastorage/${project.version}/xml/config</configfile>
+ <configfile finalname="${config.configfile.directory}/152-TSDR-datapurge-config.xml">mvn:org.opendaylight.tsdr/tsdr-datapurge/${project.version}/xml/config</configfile>
+  <configfile finalname="etc/tsdr.data.purge.cfg">mvn:org.opendaylight.tsdr/tsdr-datapurge/${project.version}/cfg/config1</configfile>
+  <configfile finalname="${config.configfile.directory}/155-TSDR-dataquery-config.xml">mvn:org.opendaylight.tsdr/tsdr-dataquery/${project.version}/xml/config</configfile>
+    </feature>
+</features>

diff --git a/features/odl-tsdr-all/pom.xml b/features/odl-tsdr-hsqldb/pom.xml
similarity index 52%
rename from features/odl-tsdr-all/pom.xml
rename to features/odl-tsdr-hsqldb/pom.xml
index 699a19857e046ceab4425dfae845972be380686d..8d645894093dabfc4e59e594f5d8ccba636ce345 100644 (file)
--- a/features/odl-tsdr-all/pom.xml
+++ b/features/odl-tsdr-hsqldb/pom.xml
@@ -1,11 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2017 Red Hat, Inc. and others.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -19,26 +12,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </parent>
 
     <groupId>org.opendaylight.tsdr</groupId>
-    <artifactId>odl-tsdr-all</artifactId>
+    <artifactId>odl-tsdr-hsqldb</artifactId>
     <version>1.4.0-SNAPSHOT</version>
     <packaging>feature</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
-    <name>ODL :: tsdr :: ${project.artifactId}</name>
+    <name>ODL :: tsdr :: HSQLDB</name>
 
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.11.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>1.6.0-SNAPSHOT</version>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>tsdr-artifacts</artifactId>
+                <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -46,15 +32,24 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependencyManagement>
 
     <dependencies>
+        <!-- TSDR dependencies -->
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>odl-mdsal-models</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-tsdr-core</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
-            <artifactId>model-inventory</artifactId>
-        </dependency>
+          <groupId>org.opendaylight.tsdr</groupId>
+          <artifactId>tsdr-persistence-hsqldb</artifactId>
+          <version>${project.version}</version>
+      </dependency>
+      <dependency>
+          <groupId>org.opendaylight.tsdr</groupId>
+          <artifactId>tsdr-persistence-hsqldb</artifactId>
+          <version>${project.version}</version>
+          <type>xml</type>
+          <classifier>config</classifier>
+      </dependency>
     </dependencies>
 </project>

diff --git a/features/odl-tsdr-hsqldb/src/main/feature/feature.xml b/features/odl-tsdr-hsqldb/src/main/feature/feature.xml
new file mode 100644 (file)
index 0000000..6f097b9
--- /dev/null
+++ b/features/odl-tsdr-hsqldb/src/main/feature/feature.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<features name="odl-tsdr-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
+    <!-- TSDR HSQL DataStore -->
+    <feature name="odl-tsdr-hsqldb" version="${project.version}" >
+  <configfile finalname="/etc/tsdr-persistence-hsqldb.properties">mvn:org.opendaylight.tsdr/tsdr-persistence-hsqldb/${project.version}/xml/config</configfile>
+    </feature>
+</features>

diff --git a/features/odl-tsdr-model-rest/pom.xml b/features/odl-tsdr-model-rest/pom.xml
deleted file mode 100644 (file)
index 2b5e68b..0000000
--- a/features/odl-tsdr-model-rest/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2017 Red Hat, Inc. and others.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.tsdr</groupId>
-    <artifactId>odl-tsdr-model-rest</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-    <!-- <name> formatting is used by autorelease to parse and notify projects on
-         build failure. Please do not modify this unless you have a good reason. -->
-    <name>ODL :: tsdr :: ${project.artifactId}</name>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.11.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>1.6.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>odl-mdsal-models</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
-            <artifactId>model-inventory</artifactId>
-        </dependency>
-    </dependencies>
-</project>

diff --git a/features/odl-tsdr-netflow-statistics-collector/pom.xml b/features/odl-tsdr-netflow-statistics-collector/pom.xml
new file mode 100644 (file)
index 0000000..bc5235b
--- /dev/null
+++ b/features/odl-tsdr-netflow-statistics-collector/pom.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.tsdr</groupId>
+    <artifactId>odl-tsdr-netflow-statistics-collector</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>ODL :: tsdr :: netflow statistics collector</name>
+    <properties>
+          <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
+          <config.version>0.7.0-SNAPSHOT</config.version>
+          <l2switch.version>0.6.0-SNAPSHOT</l2switch.version>
+    </properties>
+
+ <dependencyManagement>
+        <dependencies>
+        <!-- To replace with  the actual version of l2swith -->
+            <dependency>
+                <groupId>org.opendaylight.l2switch</groupId>
+                <artifactId>l2switch-artifacts</artifactId>
+                <version>${l2switch.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>tsdr-artifacts</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+        </dependencies>
+</dependencyManagement>
+
+
+    <dependencies>
+        <!-- TSDR dependencies -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-tsdr-core</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.tsdr</groupId>
+          <artifactId>tsdr-netflow-statistics-collector</artifactId>
+          <version>${project.version}</version>
+      </dependency>
+      <dependency>
+          <groupId>org.opendaylight.tsdr</groupId>
+          <artifactId>tsdr-netflow-statistics-collector</artifactId>
+          <version>${project.version}</version>
+          <type>xml</type>
+          <classifier>config</classifier>
+      </dependency>
+      <!-- ODL dependencies -->
+      <dependency>
+          <groupId>org.opendaylight.l2switch</groupId>
+          <artifactId>odl-l2switch-switch</artifactId>
+          <classifier>features</classifier>
+          <version>${l2switch.version}</version>
+          <type>xml</type>
+      </dependency>
+    </dependencies>
+</project>

diff --git a/features/odl-tsdr-netflow-statistics-collector/src/main/feature/feature.xml b/features/odl-tsdr-netflow-statistics-collector/src/main/feature/feature.xml
new file mode 100644 (file)
index 0000000..50d62da
--- /dev/null
+++ b/features/odl-tsdr-netflow-statistics-collector/src/main/feature/feature.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<features name="odl-tsdr-${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">
+    <!-- NetFlow collector -->
+    <feature name='odl-tsdr-netflow-statistics-collector' version='${project.version}' description="OpenDaylight :: TSDR :: Netflow Statistics Collector">
+    <configfile finalname="${config.configfile.directory}/156-tsdr-netflow-statistics-collector-config.xml">mvn:org.opendaylight.tsdr/tsdr-netflow-statistics-collector/${project.version}/xml/config</configfile>
+    </feature>
+</features>

diff --git a/features/odl-tsdr-openflow-statistics-collector/pom.xml b/features/odl-tsdr-openflow-statistics-collector/pom.xml
new file mode 100644 (file)
index 0000000..f72b1e8
--- /dev/null
+++ b/features/odl-tsdr-openflow-statistics-collector/pom.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.tsdr</groupId>
+    <artifactId>odl-tsdr-openflow-statistics-collector</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>ODL :: tsdr :: openflowcollector</name>
+    <properties>
+          <l2switch.version>0.6.0-SNAPSHOT</l2switch.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+        <!-- To replace with  the actual version of l2swith -->
+            <dependency>
+                <groupId>org.opendaylight.l2switch</groupId>
+                <artifactId>l2switch-artifacts</artifactId>
+                <version>${l2switch.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>tsdr-artifacts</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <!-- TSDR dependencies -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-tsdr-core</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.tsdr</groupId>
+            <artifactId>tsdr-openflow-statistics-collector</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.tsdr</groupId>
+            <artifactId>tsdr-openflow-statistics-collector</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>config</classifier>
+        </dependency>
+
+        <!-- ODL dependencies -->
+        <dependency>
+            <groupId>org.opendaylight.l2switch</groupId>
+            <artifactId>odl-l2switch-switch</artifactId>
+            <classifier>features</classifier>
+            <version>${l2switch.version}</version>
+            <type>xml</type>
+        </dependency>
+    </dependencies>
+</project>

diff --git a/features/odl-tsdr-openflow-statistics-collector/src/main/feature/feature.xml b/features/odl-tsdr-openflow-statistics-collector/src/main/feature/feature.xml
new file mode 100644 (file)
index 0000000..581da6f
--- /dev/null
+++ b/features/odl-tsdr-openflow-statistics-collector/src/main/feature/feature.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<features name="odl-tsdr-${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">
+    <!-- OpenFlow collector -->
+    <feature name='odl-tsdr-openflow-statistics-collector' version='${project.version}' description="OpenDaylight :: TSDR :: Openflow Statistics Collector">
+    <configfile finalname="${config.configfile.directory}/151-tsdr-openflow-statistics-collector-config.xml">mvn:org.opendaylight.tsdr/tsdr-openflow-statistics-collector/${project.version}/xml/config</configfile>
+
+    </feature>
+</features>

diff --git a/features/odl-tsdr-restconf-collector/pom.xml b/features/odl-tsdr-restconf-collector/pom.xml
new file mode 100644 (file)
index 0000000..71e4351
--- /dev/null
+++ b/features/odl-tsdr-restconf-collector/pom.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.tsdr</groupId>
+    <artifactId>odl-tsdr-restconf-collector</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>ODL :: tsdr :: restconfcollector</name>
+    <properties>
+          <aaa.version>0.6.0-SNAPSHOT</aaa.version>
+          <restconf.version>1.6.0-SNAPSHOT</restconf.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+        <!-- ODL-TSDR-ARTIFACTS -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tsdr-artifacts</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>import</scope>
+        </dependency>
+
+         <!-- ODL-NETCONF/RESTCONF-ARTIFACTS -->
+         <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>restconf-artifacts</artifactId>
+            <version>${restconf.version}</version>
+            <type>pom</type>
+            <scope>import</scope>
+         </dependency>
+
+         <dependency>
+            <groupId>org.opendaylight.aaa</groupId>
+            <artifactId>aaa-artifacts</artifactId>
+            <version>${aaa.version}</version>
+            <type>pom</type>
+            <scope>import</scope>
+         </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <dependencies>
+          <!-- TSDR dependencies -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-tsdr-core</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.tsdr</groupId>
+          <artifactId>tsdr-restconf-collector</artifactId>
+          <version>${project.version}</version>
+      </dependency>
+      <dependency>
+          <groupId>org.opendaylight.tsdr</groupId>
+          <artifactId>tsdr-restconf-collector</artifactId>
+          <classifier>config</classifier>
+          <version>${project.version}</version>
+          <type>xml</type>
+      </dependency>
+       <dependency>
+          <groupId>org.opendaylight.tsdr</groupId>
+          <artifactId>tsdr-restconf-collector</artifactId>
+          <classifier>config1</classifier>
+          <version>${project.version}</version>
+          <type>cfg</type>
+      </dependency>
+      <!-- ODL dependencies -->
+       <dependency>
+          <groupId>org.opendaylight.netconf</groupId>
+          <artifactId>features-restconf</artifactId>
+          <classifier>features</classifier>
+          <version>${restconf.version}</version>
+          <type>xml</type>
+      </dependency>
+      <dependency>
+          <groupId>org.opendaylight.aaa</groupId>
+          <artifactId>odl-aaa-authn</artifactId>
+          <classifier>features</classifier>
+          <version>${aaa.version}</version>
+          <type>xml</type>
+      </dependency>
+    </dependencies>
+</project>
+                       

diff --git a/features/odl-tsdr-restconf-collector/src/main/feature/feature.xml b/features/odl-tsdr-restconf-collector/src/main/feature/feature.xml
new file mode 100644 (file)
index 0000000..863b9d4
--- /dev/null
+++ b/features/odl-tsdr-restconf-collector/src/main/feature/feature.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<features name="odl-tsdr-${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">
+
+    <!-- RestConf collector -->
+    <feature name='odl-tsdr-restconf-collector' version='${project.version}' description="OpenDaylight :: TSDR :: Restconf Collector">
+  <configfile finalname="${config.configfile.directory}/156-tsdr-restconf-collector-config.xml">mvn:org.opendaylight.tsdr/tsdr-restconf-collector/${project.version}/xml/config</configfile>
+        <configfile finalname="etc/tsdr.restconf.collector.cfg">mvn:org.opendaylight.tsdr/tsdr-restconf-collector/${project.version}/cfg/config1</configfile>
+
+    </feature>
+</features>

diff --git a/features/odl-tsdr-syslog-collector/pom.xml b/features/odl-tsdr-syslog-collector/pom.xml
new file mode 100644 (file)
index 0000000..8973634
--- /dev/null
+++ b/features/odl-tsdr-syslog-collector/pom.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.tsdr</groupId>
+    <artifactId>odl-tsdr-syslog-collector</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>ODL :: tsdr :: syslogcollector</name>
+    <properties>
+         <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
+         <config.version>0.7.0-SNAPSHOT</config.version>
+         <sigar.version>1.6.4</sigar.version>
+         <io.netty4.version>4.0.33.Final</io.netty4.version>
+    </properties>
+
+     <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>tsdr-artifacts</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+
+    <dependencies>
+        <!-- TSDR dependencies -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-tsdr-core</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.tsdr</groupId>
+            <artifactId>tsdr-syslog-collector</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.tsdr</groupId>
+            <artifactId>tsdr-syslog-collector</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>config</classifier>
+        </dependency>
+    </dependencies>
+</project>

diff --git a/features/odl-tsdr-syslog-collector/src/main/feature/feature.xml b/features/odl-tsdr-syslog-collector/src/main/feature/feature.xml
new file mode 100644 (file)
index 0000000..30cd9b0
--- /dev/null
+++ b/features/odl-tsdr-syslog-collector/src/main/feature/feature.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright © 2016 Tata Consultancy Services and others. All rights reserved.
+       This program and the accompanying materials are made available under the
+       terms of the Eclipse Public License v1.0 which accompanies this distribution,
+       and is available at http://www.eclipse.org/legal/epl-v10.html -->
+<features name="odl-odl-sdni-aggregator-${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">
+    <!-- Syslog Data Collector -->
+    <feature name='odl-tsdr-syslog-collector' version='${project.version}' description="OpenDaylight :: TSDR :: Syslog Collector">
+      <configfile finalname="${config.configfile.directory}/154-tsdr-syslog-collector-config.xml">mvn:org.opendaylight.tsdr/tsdr-syslog-collector/${project.version}/xml/config</configfile>
+    </feature>
+</features>

diff --git a/features/pom.xml b/features/pom.xml
index d7c737c427fee56b276ece256aeac4fce441eca8..a2fe2fff8128717727c7dfcbf6fab6f6df1b81ee 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -18,11 +18,20 @@
     <packaging>pom</packaging>
 
     <modules>
+      <module>odl-hbaseclient</module>
+      <module>odl-tsdr-core</module>
+      <module>odl-tsdr-openflow-statistics-collector</module>
+      <module>odl-tsdr-elasticsearch</module>
+      <module>odl-tsdr-netflow-statistics-collector</module>
+      <module>odl-tsdr-syslog-collector</module>
+      <module>odl-tsdr-restconf-collector</module>
+      <module>odl-tsdr-controller-metrics-collector</module>
+      <module>odl-tsdr-cassandra</module>
+      <module>odl-tsdr-hsqldb</module>
+      <module>odl-tsdr-hsqldb-all</module>
+      <module>odl-tsdr-hbase</module>
       <module>features-tsdr</module>
-      <module>features4-tsdr</module> <!--  karaf 4 -->
-      <module>odl-tsdr-all</module>   <!--  karaf 4 -->
-      <module>odl-tsdr-model</module> <!--  karaf 4 -->
-      <module>odl-tsdr-model-rest</module> <!--  karaf 4 -->
+      <module>features4-tsdr</module>
     </modules>
 </project>
 

diff --git a/persistence-cassandra/pom.xml b/persistence-cassandra/pom.xml
index e5410707cea18cf5806c074c5b833073d1063592..2e2f1feec5383ff7b2f716ecaf65ace45e28ce44 100644 (file)
--- a/persistence-cassandra/pom.xml
+++ b/persistence-cassandra/pom.xml
@@ -87,7 +87,6 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.dependencymanager</artifactId>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

diff --git a/persistence-elasticsearch/pom.xml b/persistence-elasticsearch/pom.xml
index 98e708c1daacf6fb66120b98755fb4d5353f6f56..d61504bbd5c0fc77a26275ae9a0e25980ad69dfb 100644 (file)
--- a/persistence-elasticsearch/pom.xml
+++ b/persistence-elasticsearch/pom.xml
@@ -106,15 +106,9 @@
             <artifactId>tsdr-persistence-spi</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.console</artifactId>
-            <version>${karaf.shell.command.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.dependencymanager</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>

diff --git a/persistence-h2/pom.xml b/persistence-h2/pom.xml
index 96d186f276ad60665745945aa80842a269070076..ab32761238b115a5da7ded3986482d59f7945488 100644 (file)
--- a/persistence-h2/pom.xml
+++ b/persistence-h2/pom.xml
@@ -51,6 +51,8 @@
                                 org.hibernate.proxy,
                                 javassist.util.proxy,
                                 javax.persistence,
+                                org.apache.karaf.shell.commands;version="[3.0.0,4.1)",
+                                org.apache.karaf.shell.console;version="[3.0.0,4.1)",
                                 *
 
                             </ImportPackage>
@@ -72,12 +74,13 @@
             <version>${project.version}</version>
         </dependency>
 
-
+<!--
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
             <artifactId>org.apache.karaf.shell.console</artifactId>
             <version>${karaf.shell.command.version}</version>
         </dependency>
+-->
 
         <dependency>
             <groupId>org.hibernate.javax.persistence</groupId>

diff --git a/persistence-hbase/pom.xml b/persistence-hbase/pom.xml
index 00bb0909de440dac1f05e861a23026d859b41adb..44a6058fd66249ef4b0dc3652e87e44076aea5d7 100644 (file)
--- a/persistence-hbase/pom.xml
+++ b/persistence-hbase/pom.xml
@@ -76,7 +76,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.dependencymanager</artifactId>
-            <scope>provided</scope>
+            <version>4.3.0</version>
         </dependency>
     </dependencies>
 </project>

diff --git a/persistence-hsqldb/pom.xml b/persistence-hsqldb/pom.xml
index 809508ebc13852646d2a5abdedf4b7067e6c60d9..b6110395c5f9b5e089ab08218d7e89ed0d82e321 100644 (file)
--- a/persistence-hsqldb/pom.xml
+++ b/persistence-hsqldb/pom.xml
@@ -73,7 +73,6 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.dependencymanager</artifactId>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

diff --git a/persistence-spi/pom.xml b/persistence-spi/pom.xml
index 6aa8c4c393dd711c3d2b3ba5619285ad154dd24e..8e699436bc552fa1a2dd095108a989a0b8acd65b 100644 (file)
--- a/persistence-spi/pom.xml
+++ b/persistence-spi/pom.xml
@@ -23,6 +23,11 @@
                     <instructions>
                         <Bundle-Name>org.opendaylight.tsdr.spi</Bundle-Name>
                         <Bundle-Activator>org.opendaylight.tsdr.spi.command.Activator</Bundle-Activator>
+                        <!-- This bundle works with Karaf 3 and 4.0 -->
+                        <Import-Package>
+                             org.apache.karaf.shell.*;version="[3.0.0,4.1)",
+                             *
+                         </Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
@@ -62,12 +67,18 @@
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
             <artifactId>org.apache.karaf.shell.console</artifactId>
-            <version>${karaf.shell.command.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
             <artifactId>org.apache.karaf.shell.commands</artifactId>
-            <version>${karaf.shell.command.version}</version>
+            <version>${karaf.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jledit</groupId>
+            <artifactId>core</artifactId>
+            <version>0.2.1</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
@@ -99,7 +110,6 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.dependencymanager</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/persistence-spi/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/persistence-spi/src/main/resources/org/opendaylight/blueprint/blueprint.xml
similarity index 80%
rename from persistence-spi/src/main/resources/OSGI-INF/blueprint/blueprint.xml
rename to persistence-spi/src/main/resources/org/opendaylight/blueprint/blueprint.xml
index 67f34af7c6852e9262e41f13a9793288b634fa83..5c2e53c83aa6a1f9201be2f603d2814c23391209 100644 (file)
--- a/persistence-spi/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/persistence-spi/src/main/resources/org/opendaylight/blueprint/blueprint.xml
@@ -22,13 +22,8 @@
       <command name="tsdr/list">
         <action class="org.opendaylight.tsdr.spi.command.ListMetricsCommand">
         </action>
-           <completers>
-                <ref component-id="listMetricsCommandCompleter"/>
-                <null/>
-            </completers>
       </command>
     </command-bundle>
-    <bean id="listMetricsCommandCompleter" class="org.opendaylight.tsdr.spi.command.completer.ListMetricsCommandCompleter"/>
 </blueprint>
 
 

diff --git a/pom.xml b/pom.xml
index 58d4669129a57871e6e640b3289defae809f4f07..8eea6d6b81f1e9c2e090675462955b922eee6189 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -16,6 +16,7 @@
     <properties>
         <guava.old.version>16.0.1</guava.old.version>
         <config.version>0.7.0-SNAPSHOT</config.version>
+        <felix.version>4.3.0</felix.version>
         <features.test.version>1.9.0-SNAPSHOT</features.test.version>
         <hbase.version>0.94.15</hbase.version>
         <hadoop.version>1.2.0</hadoop.version>
@@ -24,7 +25,7 @@
         <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
         <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
         <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
-        <model.version>1.9.0-SNAPSHOT</model.version>
+        <mdsal.common.version>2.3.0-SNAPSHOT</mdsal.common.version>
         <model.flow.statistics>0.5.0-SNAPSHOT</model.flow.statistics>
         <aaa.version>0.6.0-SNAPSHOT</aaa.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -33,7 +34,9 @@
         <sal.binding.config>1.6.0-SNAPSHOT</sal.binding.config>
         <sal.core.api>1.6.0-SNAPSHOT</sal.core.api>
         <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
+<!--
         <karaf.shell.command.version>3.0.1</karaf.shell.command.version>
+-->
         <!--
         <hibernate.jpa.api.version>1.0.0.Final</hibernate.jpa.api.version>
         <hibernate.entity.manager.version>4.3.6.Final</hibernate.entity.manager.version>
@@ -78,14 +81,14 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>2.3.0-SNAPSHOT</version>
+        <version>${mdsal.common.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.mdsal.model</groupId>
         <artifactId>mdsal-model-artifacts</artifactId>
-        <version>0.11.0-SNAPSHOT</version>
+        <version>${mdsal.model.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -253,10 +256,8 @@
     <module>configuration</module>
     -->
     <module>persistence-spi</module>
+    <module>artifacts</module>
     <module>persistence-hbase</module>
-    <!--
-    <module>persistence-h2</module>
-    -->
     <module>persistence-cassandra</module>
     <module>persistence-hsqldb</module>
     <module>persistence-elasticsearch</module>