Add Karaf 4 features.

Change-Id: I31781439d7b5cba76f6e6a52109b13b2546ee924
Signed-off-by: Jozef Bacigal <jozef.bacigal@pantheon.tech>
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/.gitignore b/.gitignore
index 1b78296903f38bf0b5cc8c6cf93b2e88a3335f33..20741a412cb7ce77f211d3849d41ae3d107861ea 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ maven-metadata-local.xml
 /.pydevproject
 *.log
 .tox/
+nbactions.xml

diff --git a/applications/inventory-manager/pom.xml b/applications/inventory-manager/pom.xml
index e8ef899f5d5bc0d7383a011b1b205f957525be89..05af5cdc398b358a77d1e319a17151581f237e44 100644 (file)
--- a/applications/inventory-manager/pom.xml
+++ b/applications/inventory-manager/pom.xml
@@ -45,11 +45,6 @@
       <groupId>org.opendaylight.controller.model</groupId>
       <artifactId>model-inventory</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <scope>provided</scope>
-    </dependency>
   </dependencies>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</connection>

diff --git a/applications/lldp-speaker/src/main/resources/org/opendaylight/blueprint/lldp-speaker.xml b/applications/lldp-speaker/src/main/resources/org/opendaylight/blueprint/lldp-speaker.xml
index d07cc2d1eeee4de99a88a18100f8370384f6f8be..c9a89ddc86611ef07e494689736cc289ab90c1db 100644 (file)
--- a/applications/lldp-speaker/src/main/resources/org/opendaylight/blueprint/lldp-speaker.xml
+++ b/applications/lldp-speaker/src/main/resources/org/opendaylight/blueprint/lldp-speaker.xml
@@ -40,4 +40,7 @@
   </bean>
 
   <odl:rpc-implementation ref="operationalStatusChangeService"/>
+
+  <odl:action-provider interface="org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService"/>
+
 </blueprint>

diff --git a/applications/statistics-manager/pom.xml b/applications/statistics-manager/pom.xml
index 4dab36565d7779654939de9f6099e092032f9afc..2c1916a77e6dbc85cff31191e28142ea3208f3b0 100644 (file)
--- a/applications/statistics-manager/pom.xml
+++ b/applications/statistics-manager/pom.xml
@@ -56,11 +56,6 @@
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>openflowplugin-common</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>

diff --git a/applications/topology-lldp-discovery/pom.xml b/applications/topology-lldp-discovery/pom.xml
index 9ce1b67feea34322343bc6d6d9e5f8e6672e0941..8d783c28876e78c9b7a13befbabfdda10a295166 100644 (file)
--- a/applications/topology-lldp-discovery/pom.xml
+++ b/applications/topology-lldp-discovery/pom.xml
@@ -37,10 +37,6 @@
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.tycho</groupId>
-      <artifactId>org.eclipse.osgi</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-api</artifactId>

diff --git a/applications/topology-manager/pom.xml b/applications/topology-manager/pom.xml
index 81d35d3f84c9f1363e45f7b357a4824a655a7aaf..555d9bb7ab0590d59e56762dfa5fd30ff824bbdf 100644 (file)
--- a/applications/topology-manager/pom.xml
+++ b/applications/topology-manager/pom.xml
@@ -57,11 +57,6 @@
       <groupId>org.opendaylight.controller.model</groupId>
       <artifactId>model-topology</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/drop-test-karaf/pom.xml b/drop-test-karaf/pom.xml
index d1c9dd19eb343e75deaf27ec32a662d4ceb045bd..75666a472b8c69715cbf2664afff7dc47aeef702 100644 (file)
--- a/drop-test-karaf/pom.xml
+++ b/drop-test-karaf/pom.xml
@@ -51,10 +51,6 @@
             <artifactId>org.apache.karaf.shell.console</artifactId>
             <version>${karaf.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
@@ -67,6 +63,17 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <!-- This bundle works with Karaf 3 and 4.0 -->
+                        <Import-Package>
+                            org.apache.karaf.shell.commands;version="[3.0.0,4.1)",
+                            org.apache.karaf.shell.console.*;version="[3.0.0,4.1)",
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>
             </plugin>
         </plugins>
     </build>

diff --git a/drop-test-karaf/src/main/resources/OSGI-INF/blueprint/commands.xml b/drop-test-karaf/src/main/resources/org/opendaylight/blueprint/commands.xml
similarity index 100%
rename from drop-test-karaf/src/main/resources/OSGI-INF/blueprint/commands.xml
rename to drop-test-karaf/src/main/resources/org/opendaylight/blueprint/commands.xml

diff --git a/drop-test-karaf/src/main/resources/OSGI-INF/blueprint/drop-test.xml b/drop-test-karaf/src/main/resources/org/opendaylight/blueprint/drop-test-karaf.xml
similarity index 100%
rename from drop-test-karaf/src/main/resources/OSGI-INF/blueprint/drop-test.xml
rename to drop-test-karaf/src/main/resources/org/opendaylight/blueprint/drop-test-karaf.xml

diff --git a/extension/features/pom.xml b/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml
similarity index 100%
rename from extension/features/pom.xml
rename to extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml

diff --git a/extension/features/src/main/features/features.xml b/extension/features-extension-aggregator/features-openflowplugin-extension/src/main/features/features.xml
similarity index 100%
rename from extension/features/src/main/features/features.xml
rename to extension/features-extension-aggregator/features-openflowplugin-extension/src/main/features/features.xml

diff --git a/extension/features-extension-aggregator/features4-openflowplugin-extension/pom.xml b/extension/features-extension-aggregator/features4-openflowplugin-extension/pom.xml
new file mode 100644 (file)
index 0000000..dfc012b
--- /dev/null
+++ b/extension/features-extension-aggregator/features4-openflowplugin-extension/pom.xml
@@ -0,0 +1,27 @@
+<?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>feature-repo-parent</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>features4-openflowplugin-extension</artifactId>
+    <packaging>feature</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-nxm-extensions</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+    </dependencies>
+
+</project>

diff --git a/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml b/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml
new file mode 100644 (file)
index 0000000..169d94c
--- /dev/null
+++ b/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml
@@ -0,0 +1,50 @@
+<?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.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>odl-openflowplugin-nxm-extensions</artifactId>
+    <packaging>feature</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <name>OpenDaylight :: Openflow Plugin :: Nicira Extensions</name>
+
+    <dependencies>
+        <!-- feature dependencies -->
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-southbound</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>openflowjava-extension-nicira-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>openflowjava-extension-nicira</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>openflowplugin-extension-nicira</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+
+
+</project>

diff --git a/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/src/main/features/features.xml b/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/src/main/features/features.xml
new file mode 100644 (file)
index 0000000..b6ece06
--- /dev/null
+++ b/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/src/main/features/features.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<features name="openflowplugin-extension-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
+    <feature name="odl-openflowplugin-nxm-extensions" version="${project.version}">
+        <configfile finalname="etc/opendaylight/karaf/43-openflowjava-nx-config.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-extension-nicira-config/${project.version}/xml/config</configfile>
+    </feature>
+</features>
\ No newline at end of file

diff --git a/extension/features-extension-aggregator/pom.xml b/extension/features-extension-aggregator/pom.xml
new file mode 100644 (file)
index 0000000..2f0adca
--- /dev/null
+++ b/extension/features-extension-aggregator/pom.xml
@@ -0,0 +1,24 @@
+<?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">
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>features-extension-aggregator</artifactId>
+    <packaging>pom</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <modules>
+        <module>features-openflowplugin-extension</module>
+        <module>odl-openflowplugin-nxm-extensions</module>
+        <module>features4-openflowplugin-extension</module>
+    </modules>
+
+</project>
\ No newline at end of file

diff --git a/extension/features-he/pom.xml b/extension/features-he-extension-aggregator/features-openflowplugin-extension-he/pom.xml
similarity index 97%
rename from extension/features-he/pom.xml
rename to extension/features-he-extension-aggregator/features-openflowplugin-extension-he/pom.xml
index 1ec283ac3b303a26a6a839768840b457af146e24..f8f21f7839623ea7edcb35311b2b78c09104f87a 100644 (file)
--- a/extension/features-he/pom.xml
+++ b/extension/features-he-extension-aggregator/features-openflowplugin-extension-he/pom.xml
@@ -34,7 +34,7 @@
     <!-- feature dependencies -->
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>features-openflowplugin-he</artifactId>
+      <artifactId>features-openflowplugin</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>

diff --git a/extension/features-he/src/main/features/features.xml b/extension/features-he-extension-aggregator/features-openflowplugin-extension-he/src/main/features/features.xml
similarity index 57%
rename from extension/features-he/src/main/features/features.xml
rename to extension/features-he-extension-aggregator/features-openflowplugin-extension-he/src/main/features/features.xml
index 52869fa1c117124ae7a60443149c2ce7b87b9533..9655736c656f481edb9ac4a0a6ddea9823eb7201 100644 (file)
--- a/extension/features-he/src/main/features/features.xml
+++ b/extension/features-he-extension-aggregator/features-openflowplugin-extension-he/src/main/features/features.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<features name="openflowplugin-extension-he-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-he/${project.version}/xml/features</repository>
+<features name="openflowplugin-extension-${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">
 
-    <feature name="odl-openflowplugin-nxm-extensions-he" description="OpenDaylight :: Openflow Plugin :: Nicira Extensions" version='${project.version}'>
-        <feature version="${project.version}">odl-openflowplugin-southbound-he</feature>
-        <configfile finalname="etc/opendaylight/karaf/43-openflowjava-nx-config.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-extension-nicira-config/{{VERSION}}/xml/config</configfile>
+    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${project.version}/xml/features</repository>
+
+    <feature name="odl-openflowplugin-nxm-extensions" description="OpenDaylight :: Openflow Plugin :: Nicira Extensions" version='${project.version}'>
+        <feature version="${project.version}">odl-openflowplugin-southbound</feature>
         <bundle>mvn:org.opendaylight.openflowplugin/openflowjava-extension-nicira-api/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.openflowplugin/openflowjava-extension-nicira/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-extension-nicira/{{VERSION}}</bundle>
+        <configfile finalname="etc/opendaylight/karaf/43-openflowjava-nx-config.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-extension-nicira-config/{{VERSION}}/xml/config</configfile>
     </feature>
 
 </features>

diff --git a/extension/features-he-extension-aggregator/features4-openflowplugin-extension-he/pom.xml b/extension/features-he-extension-aggregator/features4-openflowplugin-extension-he/pom.xml
new file mode 100644 (file)
index 0000000..204f8f6
--- /dev/null
+++ b/extension/features-he-extension-aggregator/features4-openflowplugin-extension-he/pom.xml
@@ -0,0 +1,27 @@
+<?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>feature-repo-parent</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>features4-openflowplugin-extension-he</artifactId>
+    <packaging>feature</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-nxm-extensions-he</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+    </dependencies>
+
+</project>

diff --git a/extension/features-he-extension-aggregator/odl-openflowplugin-nxm-extensions-he/pom.xml b/extension/features-he-extension-aggregator/odl-openflowplugin-nxm-extensions-he/pom.xml
new file mode 100644 (file)
index 0000000..190f6ac
--- /dev/null
+++ b/extension/features-he-extension-aggregator/odl-openflowplugin-nxm-extensions-he/pom.xml
@@ -0,0 +1,50 @@
+<?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.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>odl-openflowplugin-nxm-extensions-he</artifactId>
+    <packaging>feature</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <name>OpenDaylight :: Openflow Plugin :: Nicira Extensions</name>
+
+    <dependencies>
+        <!-- feature dependencies -->
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-southbound</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>openflowjava-extension-nicira-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>openflowjava-extension-nicira</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>openflowplugin-extension-nicira</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+
+
+</project>

diff --git a/extension/features-he-extension-aggregator/odl-openflowplugin-nxm-extensions-he/src/main/features/features.xml b/extension/features-he-extension-aggregator/odl-openflowplugin-nxm-extensions-he/src/main/features/features.xml
new file mode 100644 (file)
index 0000000..655e572
--- /dev/null
+++ b/extension/features-he-extension-aggregator/odl-openflowplugin-nxm-extensions-he/src/main/features/features.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<features name="openflowplugin-extension-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
+    <feature name="odl-openflowplugin-nxm-extensions-he" version="${project.version}">
+        <configfile finalname="etc/opendaylight/karaf/43-openflowjava-nx-config.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-extension-nicira-config/${project.version}/xml/config</configfile>
+    </feature>
+</features>
\ No newline at end of file

diff --git a/extension/features-he-extension-aggregator/pom.xml b/extension/features-he-extension-aggregator/pom.xml
new file mode 100644 (file)
index 0000000..dc52079
--- /dev/null
+++ b/extension/features-he-extension-aggregator/pom.xml
@@ -0,0 +1,24 @@
+<?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">
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>features-he-extension-aggregator</artifactId>
+    <packaging>pom</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <modules>
+        <module>features-openflowplugin-extension-he</module>
+        <module>odl-openflowplugin-nxm-extensions-he</module>
+        <module>features4-openflowplugin-extension-he</module>
+    </modules>
+
+</project>
\ No newline at end of file

diff --git a/extension/pom.xml b/extension/pom.xml
index e55e41f7ff8fd370f02c937262938214f6b7ea80..0b774eaed3c693432c9e8b9c9ed333785ff85b24 100644 (file)
--- a/extension/pom.xml
+++ b/extension/pom.xml
@@ -18,8 +18,8 @@
         <module>openflowplugin-extension-api</module>
         <module>openflowplugin-extension-nicira</module>
         <module>openflowplugin-extension-nicira-config</module>
-        <module>features-he</module>
-        <module>features</module>
         <module>test-extension</module>
+        <module>features-extension-aggregator</module>
+        <module>features-he-extension-aggregator</module>
     </modules>
 </project>

diff --git a/features/pom.xml b/features-aggregator/features-openflowplugin/pom.xml
similarity index 99%
rename from features/pom.xml
rename to features-aggregator/features-openflowplugin/pom.xml
index 7147f5381f535ee9892d838ee6e454a289de362f..c47fcbc73fe9f7006b5e8ffd1ec0260d12bfdbf4 100644 (file)
--- a/features/pom.xml
+++ b/features-aggregator/features-openflowplugin/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.opendaylight.openflowplugin</groupId>
     <artifactId>features-openflowplugin</artifactId>
-    <packaging>jar</packaging>
+    <packaging>pom</packaging>
     <version>0.4.0-SNAPSHOT</version>
 
     <properties>

diff --git a/features/src/main/features/features.xml b/features-aggregator/features-openflowplugin/src/main/features/features.xml
similarity index 100%
rename from features/src/main/features/features.xml
rename to features-aggregator/features-openflowplugin/src/main/features/features.xml

diff --git a/features-aggregator/features4-openflowplugin/pom.xml b/features-aggregator/features4-openflowplugin/pom.xml
new file mode 100644 (file)
index 0000000..9c61a34
--- /dev/null
+++ b/features-aggregator/features4-openflowplugin/pom.xml
@@ -0,0 +1,111 @@
+<?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>feature-repo-parent</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>features4-openflowplugin</artifactId>
+    <packaging>feature</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-app-bulk-o-matic</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-app-config-pusher</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-app-forwardingrules-manager</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-app-forwardingrules-sync</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-app-notifications</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-app-table-miss-enforcer</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-app-topology</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-drop-test</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-flow-services</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-flow-services-rest</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-flow-services-ui</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-nsf-model</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-southbound</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+    </dependencies>
+
+</project>

diff --git a/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml b/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml
new file mode 100644 (file)
index 0000000..f5d43b7
--- /dev/null
+++ b/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml
@@ -0,0 +1,38 @@
+<?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.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>odl-openflowplugin-app-bulk-o-matic</artifactId>
+    <packaging>feature</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <name>OpenDaylight :: Openflow Plugin :: Application -  bulk flow operations support</name>
+
+    <dependencies>
+        <!-- feature dependencies -->
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-southbound</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.applications</groupId>
+            <artifactId>bulk-o-matic</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+
+
+</project>

diff --git a/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml b/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml
new file mode 100644 (file)
index 0000000..be93b0d
--- /dev/null
+++ b/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml
@@ -0,0 +1,37 @@
+<?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.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>odl-openflowplugin-app-config-pusher</artifactId>
+    <packaging>feature</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <name>OpenDaylight :: Openflow Plugin :: Application - default config-pusher</name>
+
+    <dependencies>
+        <!-- feature dependencies -->
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-southbound</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.applications</groupId>
+            <artifactId>of-switch-config-pusher</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+
+</project>

diff --git a/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml b/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml
new file mode 100644 (file)
index 0000000..b60289e
--- /dev/null
+++ b/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml
@@ -0,0 +1,37 @@
+<?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.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>odl-openflowplugin-app-forwardingrules-manager</artifactId>
+    <packaging>feature</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <name>OpenDaylight :: Openflow Plugin :: Application - FRM</name>
+
+    <dependencies>
+        <!-- feature dependencies -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-southbound</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.applications</groupId>
+            <artifactId>forwardingrules-manager</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+
+</project>

diff --git a/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml b/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml
new file mode 100644 (file)
index 0000000..8423830
--- /dev/null
+++ b/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml
@@ -0,0 +1,37 @@
+<?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.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>odl-openflowplugin-app-forwardingrules-sync</artifactId>
+    <packaging>feature</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <name>OpenDaylight :: Openflow Plugin :: Application - FRS</name>
+
+    <dependencies>
+        <!-- feature dependencies -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-southbound</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.applications</groupId>
+            <artifactId>forwardingrules-sync</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+
+</project>

diff --git a/features-aggregator/odl-openflowplugin-app-notifications/pom.xml b/features-aggregator/odl-openflowplugin-app-notifications/pom.xml
new file mode 100644 (file)
index 0000000..54cc50a
--- /dev/null
+++ b/features-aggregator/odl-openflowplugin-app-notifications/pom.xml
@@ -0,0 +1,37 @@
+<?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.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>odl-openflowplugin-app-notifications</artifactId>
+    <packaging>feature</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <name>OpenDaylight :: Openflow Plugin :: Application - notifications supplier</name>
+
+    <dependencies>
+        <!-- feature dependencies -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-southbound</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.applications</groupId>
+            <artifactId>notification-supplier</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+
+</project>

diff --git a/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml b/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml
new file mode 100644 (file)
index 0000000..2f57cd4
--- /dev/null
+++ b/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml
@@ -0,0 +1,36 @@
+<?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.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>odl-openflowplugin-app-table-miss-enforcer</artifactId>
+    <packaging>feature</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <name>OpenDaylight :: Openflow Plugin :: Application - table-miss-enforcer</name>
+
+    <dependencies>
+        <!-- feature dependencies -->
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-southbound</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.applications</groupId>
+            <artifactId>table-miss-enforcer</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+</project>

diff --git a/features-aggregator/odl-openflowplugin-app-topology/pom.xml b/features-aggregator/odl-openflowplugin-app-topology/pom.xml
new file mode 100644 (file)
index 0000000..cfb6840
--- /dev/null
+++ b/features-aggregator/odl-openflowplugin-app-topology/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.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>odl-openflowplugin-app-topology</artifactId>
+    <packaging>feature</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <name>OpenDaylight :: Openflow Plugin :: Application - topology</name>
+
+    <dependencies>
+        <!-- feature dependencies -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-southbound</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.applications</groupId>
+            <artifactId>lldp-speaker</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.applications</groupId>
+            <artifactId>topology-lldp-discovery</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.applications</groupId>
+            <artifactId>topology-manager</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+
+</project>

diff --git a/features-aggregator/odl-openflowplugin-drop-test/pom.xml b/features-aggregator/odl-openflowplugin-drop-test/pom.xml
new file mode 100644 (file)
index 0000000..ae44b05
--- /dev/null
+++ b/features-aggregator/odl-openflowplugin-drop-test/pom.xml
@@ -0,0 +1,43 @@
+<?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.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>odl-openflowplugin-drop-test</artifactId>
+    <packaging>feature</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <name>OpenDaylight :: Openflow Plugin :: Drop Test</name>
+
+    <dependencies>
+        <!-- feature dependencies -->
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-flow-services</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>test-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>drop-test-karaf</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+
+</project>

diff --git a/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml b/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml
new file mode 100644 (file)
index 0000000..4ffa098
--- /dev/null
+++ b/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml
@@ -0,0 +1,54 @@
+<?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.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>odl-openflowplugin-flow-services-rest</artifactId>
+    <packaging>feature</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <name>OpenDaylight :: Openflow Plugin :: Flow Services :: REST</name>
+
+    <properties>
+        <restconf.version>1.5.0-SNAPSHOT</restconf.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- restconf -->
+            <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>restconf-artifacts</artifactId>
+                <version>${restconf.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <!-- feature dependencies -->
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-flow-services</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-restconf</artifactId>
+            <version>${restconf.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+    </dependencies>
+
+</project>

diff --git a/features-aggregator/odl-openflowplugin-flow-services-ui/pom.xml b/features-aggregator/odl-openflowplugin-flow-services-ui/pom.xml
new file mode 100644 (file)
index 0000000..83191c1
--- /dev/null
+++ b/features-aggregator/odl-openflowplugin-flow-services-ui/pom.xml
@@ -0,0 +1,72 @@
+<?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.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>odl-openflowplugin-flow-services-ui</artifactId>
+    <packaging>feature</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <name>OpenDaylight :: Openflow Plugin :: Flow Services :: UI</name>
+
+    <properties>
+        <dlux.version>0.5.0-SNAPSHOT</dlux.version>
+        <restconf.version>1.5.0-SNAPSHOT</restconf.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- DLUX -->
+            <dependency>
+                <groupId>org.opendaylight.dlux</groupId>
+                <artifactId>odl-dlux-core</artifactId>
+                <version>${dlux.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+
+            <!-- restconf -->
+            <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>restconf-artifacts</artifactId>
+                <version>${restconf.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <!-- feature dependencies -->
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-flow-services-rest</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.dlux</groupId>
+            <artifactId>odl-dlux-core</artifactId>
+            <version>${dlux.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-mdsal-apidocs</artifactId>
+            <version>${restconf.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+    </dependencies>
+
+</project>

diff --git a/features-aggregator/odl-openflowplugin-flow-services/pom.xml b/features-aggregator/odl-openflowplugin-flow-services/pom.xml
new file mode 100644 (file)
index 0000000..874d876
--- /dev/null
+++ b/features-aggregator/odl-openflowplugin-flow-services/pom.xml
@@ -0,0 +1,43 @@
+<?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.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>odl-openflowplugin-flow-services</artifactId>
+    <packaging>feature</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <name>OpenDaylight :: Openflow Plugin :: Flow Services</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-app-config-pusher</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-app-topology</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-app-forwardingrules-manager</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+    </dependencies>
+
+</project>

diff --git a/features-aggregator/odl-openflowplugin-nsf-model/pom.xml b/features-aggregator/odl-openflowplugin-nsf-model/pom.xml
new file mode 100644 (file)
index 0000000..925357e
--- /dev/null
+++ b/features-aggregator/odl-openflowplugin-nsf-model/pom.xml
@@ -0,0 +1,88 @@
+<?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.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>odl-openflowplugin-nsf-model</artifactId>
+    <packaging>feature</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <name>OpenDaylight :: OpenflowPlugin :: NSF :: Model</name>
+
+    <properties>
+        <mdsal.version>1.5.0-SNAPSHOT</mdsal.version>
+        <openflowjava.version>0.9.0-SNAPSHOT</openflowjava.version>
+        <mdsal.model.version>0.10.0-SNAPSHOT</mdsal.model.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- Controller infrastructure -->
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>${mdsal.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <!-- feature dependencies -->
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>odl-mdsal-models</artifactId>
+            <version>${mdsal.model.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.controller.model</groupId>
+            <artifactId>model-inventory</artifactId>
+            <version>${mdsal.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.controller.model</groupId>
+            <artifactId>model-topology</artifactId>
+            <version>${mdsal.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowjava</groupId>
+            <artifactId>odl-openflowjava-protocol</artifactId>
+            <version>${openflowjava.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <artifactId>model-flow-base</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <artifactId>model-flow-statistics</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <artifactId>model-flow-service</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+
+</project>

diff --git a/features-aggregator/odl-openflowplugin-southbound/pom.xml b/features-aggregator/odl-openflowplugin-southbound/pom.xml
new file mode 100644 (file)
index 0000000..353b1f3
--- /dev/null
+++ b/features-aggregator/odl-openflowplugin-southbound/pom.xml
@@ -0,0 +1,87 @@
+<?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.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>odl-openflowplugin-southbound</artifactId>
+    <packaging>feature</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <name>OpenDaylight :: Openflow Plugin :: Li southbound API implementation</name>
+
+    <properties>
+        <mdsal.version>1.5.0-SNAPSHOT</mdsal.version>
+        <lldp.version>0.12.0-SNAPSHOT</lldp.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- Controller infrastructure -->
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>${mdsal.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <!-- feature dependencies -->
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
+            <version>${mdsal.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-nsf-model</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>openflowplugin-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>openflowplugin-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>openflowplugin</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>openflowplugin-impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>openflowplugin-extension-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>liblldp</artifactId>
+            <version>${lldp.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>

diff --git a/features-aggregator/odl-openflowplugin-southbound/src/main/features/features.xml b/features-aggregator/odl-openflowplugin-southbound/src/main/features/features.xml
new file mode 100644 (file)
index 0000000..8113d2c
--- /dev/null
+++ b/features-aggregator/odl-openflowplugin-southbound/src/main/features/features.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<features name="openflowplugin-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
+    <feature name="odl-openflowplugin-southbound" version="${project.version}">
+        <configfile finalname="etc/org.opendaylight.openflowplugin.cfg">mvn:org.opendaylight.openflowplugin/openflowplugin-blueprint-config/${project.version}/cfg/config</configfile>
+        <configfile finalname="etc/opendaylight/karaf/42-openflowplugin-Li.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-controller-config/${project.version}/xml/config-Li</configfile>
+    </feature>
+</features>
\ No newline at end of file

diff --git a/features-aggregator/pom.xml b/features-aggregator/pom.xml
new file mode 100644 (file)
index 0000000..9b392d7
--- /dev/null
+++ b/features-aggregator/pom.xml
@@ -0,0 +1,35 @@
+<?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>odlparent-lite</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>features-aggregator</artifactId>
+    <packaging>pom</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <modules>
+        <module>features-openflowplugin</module>
+        <module>features4-openflowplugin</module>
+        <module>odl-openflowplugin-flow-services-ui</module>
+        <module>odl-openflowplugin-flow-services-rest</module>
+        <module>odl-openflowplugin-flow-services</module>
+        <module>odl-openflowplugin-southbound</module>
+        <module>odl-openflowplugin-nsf-model</module>
+        <module>odl-openflowplugin-drop-test</module>
+        <module>odl-openflowplugin-app-table-miss-enforcer</module>
+        <module>odl-openflowplugin-app-config-pusher</module>
+        <module>odl-openflowplugin-app-topology</module>
+        <module>odl-openflowplugin-app-bulk-o-matic</module>
+        <module>odl-openflowplugin-app-notifications</module>
+        <module>odl-openflowplugin-app-forwardingrules-manager</module>
+        <module>odl-openflowplugin-app-forwardingrules-sync</module>
+    </modules>
+
+</project>

diff --git a/features-he/pom.xml b/features-he-aggregator/features-openflowplugin-he/pom.xml
similarity index 99%
rename from features-he/pom.xml
rename to features-he-aggregator/features-openflowplugin-he/pom.xml
index 3462845a288db31fad36b766484efbba861e2b1e..37ef827f8e4808160349da5879994ab227a2636b 100644 (file)
--- a/features-he/pom.xml
+++ b/features-he-aggregator/features-openflowplugin-he/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.opendaylight.openflowplugin</groupId>
     <artifactId>features-openflowplugin-he</artifactId>
-    <packaging>jar</packaging>
+    <packaging>pom</packaging>
     <version>0.4.0-SNAPSHOT</version>
 
     <properties>

diff --git a/features-he/src/main/features/features.xml b/features-he-aggregator/features-openflowplugin-he/src/main/features/features.xml
similarity index 93%
rename from features-he/src/main/features/features.xml
rename to features-he-aggregator/features-openflowplugin-he/src/main/features/features.xml
index 58acd5231a2f096cf185e6b8242e8e48b9adfda8..383abd030535bb25c854e571750bab62d4660d10 100644 (file)
--- a/features-he/src/main/features/features.xml
+++ b/features-he-aggregator/features-openflowplugin-he/src/main/features/features.xml
@@ -18,17 +18,10 @@
     <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository>
 
-    <feature name='odl-openflowplugin-all-he' description="OpenDaylight :: Openflow Plugin :: All" version='${project.version}'>
-        <feature version="${project.version}">odl-openflowplugin-southbound-he</feature>
-        <feature version="${project.version}">odl-openflowplugin-flow-services-he</feature>
-        <feature version="${project.version}">odl-openflowplugin-flow-services-rest-he</feature>
-        <feature version="${project.version}">odl-openflowplugin-flow-services-ui-he</feature>
-    </feature>
-
     <feature name='odl-openflowplugin-southbound-he' description="OpenDaylight :: Openflow Plugin :: SouthBound" version='${project.version}'>
         <feature version="${mdsal.version}">odl-mdsal-broker</feature>
-        <feature version="${project.version}">odl-openflowplugin-nsf-model-he</feature>
         <feature version="${openflowjava.version}">odl-openflowjava-protocol</feature>
+        <feature version="${project.version}">odl-openflowplugin-nsf-model-he</feature>
         <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-common/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-api/{{VERSION}}</bundle>

diff --git a/features-he-aggregator/features4-openflowplugin-he/pom.xml b/features-he-aggregator/features4-openflowplugin-he/pom.xml
new file mode 100644 (file)
index 0000000..ac97b65
--- /dev/null
+++ b/features-he-aggregator/features4-openflowplugin-he/pom.xml
@@ -0,0 +1,97 @@
+<?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>feature-repo-parent</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>features4-openflowplugin-he</artifactId>
+    <packaging>feature</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-app-bulk-o-matic-he</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-app-config-pusher-he</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-app-lldp-speaker-he</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-app-table-miss-enforcer-he</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-drop-test-he</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-flow-services-he</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-flow-services-rest-he</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-flow-services-ui-he</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-nsf-model-he</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-nsf-services-he</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-openflowplugin-southbound-he</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+    </dependencies>
+
+</project>

diff --git a/features-he-aggregator/odl-openflowplugin-app-bulk-o-matic-he/pom.xml b/features-he-aggregator/odl-openflowplugin-app-bulk-o-matic-he/pom.xml
new file mode 100644 (file)
index 0000000..a6e41d7
--- /dev/null
+++ b/features-he-aggregator/odl-openflowplugin-app-bulk-o-matic-he/pom.xml
@@ -0,0 +1,38 @@
+<?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.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>odl-openflowplugin-app-bulk-o-matic-he</artifactId>
+    <packaging>feature</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <name>OpenDaylight :: Openflow Plugin :: Application -  bulk flow operations support</name>
+
+    <dependencies>
+        <!-- feature dependencies -->
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-southbound-he</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.applications</groupId>
+            <artifactId>bulk-o-matic</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+
+
+</project>

diff --git a/features-he-aggregator/odl-openflowplugin-app-config-pusher-he/pom.xml b/features-he-aggregator/odl-openflowplugin-app-config-pusher-he/pom.xml
new file mode 100644 (file)
index 0000000..485c338
--- /dev/null
+++ b/features-he-aggregator/odl-openflowplugin-app-config-pusher-he/pom.xml
@@ -0,0 +1,37 @@
+<?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.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>odl-openflowplugin-app-config-pusher-he</artifactId>
+    <packaging>feature</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <name>OpenDaylight :: Openflow Plugin :: Application - default config-pusher</name>
+
+    <dependencies>
+        <!-- feature dependencies -->
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-southbound-he</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.applications</groupId>
+            <artifactId>of-switch-config-pusher</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+
+</project>

diff --git a/features-he-aggregator/odl-openflowplugin-app-lldp-speaker-he/pom.xml b/features-he-aggregator/odl-openflowplugin-app-lldp-speaker-he/pom.xml
new file mode 100644 (file)
index 0000000..639dd24
--- /dev/null
+++ b/features-he-aggregator/odl-openflowplugin-app-lldp-speaker-he/pom.xml
@@ -0,0 +1,42 @@
+<?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.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>odl-openflowplugin-app-lldp-speaker-he</artifactId>
+    <packaging>feature</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <name>OpenDaylight :: Openflow Plugin :: app lldp-speaker</name>
+
+    <dependencies>
+        <!-- feature dependencies -->
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-southbound-he</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.applications</groupId>
+            <artifactId>topology-lldp-discovery</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.applications</groupId>
+            <artifactId>lldp-speaker</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+
+</project>

diff --git a/features-he-aggregator/odl-openflowplugin-app-table-miss-enforcer-he/pom.xml b/features-he-aggregator/odl-openflowplugin-app-table-miss-enforcer-he/pom.xml
new file mode 100644 (file)
index 0000000..ce8e822
--- /dev/null
+++ b/features-he-aggregator/odl-openflowplugin-app-table-miss-enforcer-he/pom.xml
@@ -0,0 +1,36 @@
+<?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.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>odl-openflowplugin-app-table-miss-enforcer-he</artifactId>
+    <packaging>feature</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <name>OpenDaylight :: Openflow Plugin :: Application - table-miss-enforcer</name>
+
+    <dependencies>
+        <!-- feature dependencies -->
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-southbound-he</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.applications</groupId>
+            <artifactId>table-miss-enforcer</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+</project>

diff --git a/features-he-aggregator/odl-openflowplugin-drop-test-he/pom.xml b/features-he-aggregator/odl-openflowplugin-drop-test-he/pom.xml
new file mode 100644 (file)
index 0000000..048fa00
--- /dev/null
+++ b/features-he-aggregator/odl-openflowplugin-drop-test-he/pom.xml
@@ -0,0 +1,43 @@
+<?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.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>odl-openflowplugin-drop-test-he</artifactId>
+    <packaging>feature</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <name>OpenDaylight :: Openflow Plugin :: Drop Test</name>
+
+    <dependencies>
+        <!-- feature dependencies -->
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-flow-services-he</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>test-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>drop-test-karaf</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+
+</project>

diff --git a/features-he-aggregator/odl-openflowplugin-flow-services-he/pom.xml b/features-he-aggregator/odl-openflowplugin-flow-services-he/pom.xml
new file mode 100644 (file)
index 0000000..54d4919
--- /dev/null
+++ b/features-he-aggregator/odl-openflowplugin-flow-services-he/pom.xml
@@ -0,0 +1,50 @@
+<?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.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>odl-openflowplugin-flow-services-he</artifactId>
+    <packaging>feature</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <name>OpenDaylight :: Openflow Plugin :: Flow Services</name>
+
+    <dependencies>
+        <!-- feature dependencies -->
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-southbound-he</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-app-config-pusher-he</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-app-lldp-speaker-he</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-nsf-services-he</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+    </dependencies>
+</project>

diff --git a/features-he-aggregator/odl-openflowplugin-flow-services-rest-he/pom.xml b/features-he-aggregator/odl-openflowplugin-flow-services-rest-he/pom.xml
new file mode 100644 (file)
index 0000000..55baa48
--- /dev/null
+++ b/features-he-aggregator/odl-openflowplugin-flow-services-rest-he/pom.xml
@@ -0,0 +1,54 @@
+<?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.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>odl-openflowplugin-flow-services-rest-he</artifactId>
+    <packaging>feature</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <name>OpenDaylight :: Openflow Plugin :: Flow Services :: REST</name>
+
+    <properties>
+        <restconf.version>1.5.0-SNAPSHOT</restconf.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- restconf -->
+            <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>restconf-artifacts</artifactId>
+                <version>${restconf.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <!-- feature dependencies -->
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-flow-services-he</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-restconf</artifactId>
+            <version>${restconf.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+    </dependencies>
+
+</project>

diff --git a/features-he-aggregator/odl-openflowplugin-flow-services-ui-he/pom.xml b/features-he-aggregator/odl-openflowplugin-flow-services-ui-he/pom.xml
new file mode 100644 (file)
index 0000000..3df3c48
--- /dev/null
+++ b/features-he-aggregator/odl-openflowplugin-flow-services-ui-he/pom.xml
@@ -0,0 +1,72 @@
+<?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.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>odl-openflowplugin-flow-services-ui-he</artifactId>
+    <packaging>feature</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <name>OpenDaylight :: Openflow Plugin :: Flow Services :: UI</name>
+
+    <properties>
+        <dlux.version>0.5.0-SNAPSHOT</dlux.version>
+        <restconf.version>1.5.0-SNAPSHOT</restconf.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- DLUX -->
+            <dependency>
+                <groupId>org.opendaylight.dlux</groupId>
+                <artifactId>odl-dlux-core</artifactId>
+                <version>${dlux.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+
+            <!-- restconf -->
+            <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>restconf-artifacts</artifactId>
+                <version>${restconf.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <!-- feature dependencies -->
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-flow-services-rest-he</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.dlux</groupId>
+            <artifactId>odl-dlux-core</artifactId>
+            <version>${dlux.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-mdsal-apidocs</artifactId>
+            <version>${restconf.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+    </dependencies>
+
+</project>

diff --git a/features-he-aggregator/odl-openflowplugin-nsf-model-he/pom.xml b/features-he-aggregator/odl-openflowplugin-nsf-model-he/pom.xml
new file mode 100644 (file)
index 0000000..7c9e919
--- /dev/null
+++ b/features-he-aggregator/odl-openflowplugin-nsf-model-he/pom.xml
@@ -0,0 +1,88 @@
+<?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.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>odl-openflowplugin-nsf-model-he</artifactId>
+    <packaging>feature</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <name>OpenDaylight :: OpenflowPlugin :: NSF :: Model</name>
+
+    <properties>
+        <mdsal.version>1.5.0-SNAPSHOT</mdsal.version>
+        <openflowjava.version>0.9.0-SNAPSHOT</openflowjava.version>
+        <mdsal.model.version>0.10.0-SNAPSHOT</mdsal.model.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- Controller infrastructure -->
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>${mdsal.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <!-- feature dependencies -->
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>odl-mdsal-models</artifactId>
+            <version>${mdsal.model.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.controller.model</groupId>
+            <artifactId>model-inventory</artifactId>
+            <version>${mdsal.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.controller.model</groupId>
+            <artifactId>model-topology</artifactId>
+            <version>${mdsal.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowjava</groupId>
+            <artifactId>odl-openflowjava-protocol</artifactId>
+            <version>${openflowjava.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <artifactId>model-flow-base</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <artifactId>model-flow-statistics</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <artifactId>model-flow-service</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+
+</project>

diff --git a/features-he-aggregator/odl-openflowplugin-nsf-services-he/pom.xml b/features-he-aggregator/odl-openflowplugin-nsf-services-he/pom.xml
new file mode 100644 (file)
index 0000000..3278c85
--- /dev/null
+++ b/features-he-aggregator/odl-openflowplugin-nsf-services-he/pom.xml
@@ -0,0 +1,82 @@
+<?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.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>odl-openflowplugin-nsf-services-he</artifactId>
+    <packaging>feature</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <name>OpenDaylight :: OpenflowPlugin :: NSF :: Services</name>
+
+    <properties>
+        <mdsal.version>1.5.0-SNAPSHOT</mdsal.version>
+        <lldp.version>0.12.0-SNAPSHOT</lldp.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- Controller infrastructure -->
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>${mdsal.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <!-- feature dependencies -->
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
+            <version>${mdsal.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-nsf-model-he</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>openflowplugin-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.applications</groupId>
+            <artifactId>topology-manager</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.applications</groupId>
+            <artifactId>topology-lldp-discovery</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.applications</groupId>
+            <artifactId>forwardingrules-manager</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>liblldp</artifactId>
+            <version>${lldp.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>

diff --git a/features-he-aggregator/odl-openflowplugin-southbound-he/pom.xml b/features-he-aggregator/odl-openflowplugin-southbound-he/pom.xml
new file mode 100644 (file)
index 0000000..efcc32f
--- /dev/null
+++ b/features-he-aggregator/odl-openflowplugin-southbound-he/pom.xml
@@ -0,0 +1,92 @@
+<?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.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>odl-openflowplugin-southbound-he</artifactId>
+    <packaging>feature</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <name>OpenDaylight :: Openflow Plugin :: He southbound API implementation</name>
+
+    <properties>
+        <mdsal.version>1.5.0-SNAPSHOT</mdsal.version>
+        <lldp.version>0.12.0-SNAPSHOT</lldp.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- Controller infrastructure -->
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>${mdsal.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <!-- feature dependencies -->
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
+            <version>${mdsal.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-nsf-model-he</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>openflowplugin-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>openflowplugin-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>openflowplugin</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>openflowplugin-extension-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>liblldp</artifactId>
+            <version>${lldp.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.applications</groupId>
+            <artifactId>inventory-manager</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.applications</groupId>
+            <artifactId>statistics-manager</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>

diff --git a/features-he-aggregator/odl-openflowplugin-southbound-he/src/main/features/features.xml b/features-he-aggregator/odl-openflowplugin-southbound-he/src/main/features/features.xml
new file mode 100644 (file)
index 0000000..cdd2eec
--- /dev/null
+++ b/features-he-aggregator/odl-openflowplugin-southbound-he/src/main/features/features.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<features name="openflowplugin-he-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
+    <feature name="odl-openflowplugin-southbound-he" version="${project.version}">
+        <configfile finalname="etc/opendaylight/karaf/42-openflowplugin-He.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-controller-config/${project.version}/xml/config-He</configfile>
+        <configfile finalname="etc/opendaylight/karaf/43-msg-spy.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-controller-config/${project.version}/xml/configmsgspy</configfile>
+    </feature>
+</features>
\ No newline at end of file

diff --git a/features-he-aggregator/pom.xml b/features-he-aggregator/pom.xml
new file mode 100644 (file)
index 0000000..231b3ed
--- /dev/null
+++ b/features-he-aggregator/pom.xml
@@ -0,0 +1,33 @@
+<?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>odlparent-lite</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>features-he-aggregator</artifactId>
+    <packaging>pom</packaging>
+    <version>0.4.0-SNAPSHOT</version>
+
+    <modules>
+        <module>features-openflowplugin-he</module>
+        <module>features4-openflowplugin-he</module>
+        <module>odl-openflowplugin-southbound-he</module>
+        <module>odl-openflowplugin-flow-services-he</module>
+        <module>odl-openflowplugin-nsf-services-he</module>
+        <module>odl-openflowplugin-nsf-model-he</module>
+        <module>odl-openflowplugin-app-bulk-o-matic-he</module>
+        <module>odl-openflowplugin-app-lldp-speaker-he</module>
+        <module>odl-openflowplugin-app-config-pusher-he</module>
+        <module>odl-openflowplugin-app-table-miss-enforcer-he</module>
+        <module>odl-openflowplugin-drop-test-he</module>
+        <module>odl-openflowplugin-flow-services-ui-he</module>
+        <module>odl-openflowplugin-flow-services-rest-he</module>
+    </modules>
+
+</project>

diff --git a/openflowplugin-api/src/main/resources/org/opendaylight/blueprint/openflowplugin-api.xml b/openflowplugin-api/src/main/resources/org/opendaylight/blueprint/openflowplugin-api.xml
new file mode 100644 (file)
index 0000000..8b9bbd4
--- /dev/null
+++ b/openflowplugin-api/src/main/resources/org/opendaylight/blueprint/openflowplugin-api.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0">
+
+  <odl:action-provider interface="org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService"/>
+</blueprint>

diff --git a/openflowplugin-blueprint-config-he/src/main/resources/org/opendaylight/blueprint/openflowplugin-helium.xml b/openflowplugin-blueprint-config-he/src/main/resources/org/opendaylight/blueprint/openflowplugin.xml
similarity index 97%
rename from openflowplugin-blueprint-config-he/src/main/resources/org/opendaylight/blueprint/openflowplugin-helium.xml
rename to openflowplugin-blueprint-config-he/src/main/resources/org/opendaylight/blueprint/openflowplugin.xml
index f449e2083fee9d143f53f9cf42950882ff7d55fc..dcf389dc30dd14775ca1181bb0034f3e2cda9d7f 100644 (file)
--- a/openflowplugin-blueprint-config-he/src/main/resources/org/opendaylight/blueprint/openflowplugin-helium.xml
+++ b/openflowplugin-blueprint-config-he/src/main/resources/org/opendaylight/blueprint/openflowplugin.xml
@@ -5,7 +5,7 @@
 
   <reference id="dataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker" odl:type="pingpong"/>
   <reference id="rpcRegistry" interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry"/>
-  <reference id="notificationService" interface="org.opendaylight.controller.sal.binding.api.NotificationProviderService"/>
+  <reference id="notificationService" interface="org.opendaylight.controller.md.sal.binding.api.NotificationService"/>
   <reference id="entityOwnershipService" interface="org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipService"/>
 
   <!-- Create the StatisticsManager -->

diff --git a/openflowplugin-impl/pom.xml b/openflowplugin-impl/pom.xml
index 103608214d943608493bdc70a9c6429099022441..07916a4288c34479d5850d31e57d9dfc7841d9f8 100644 (file)
--- a/openflowplugin-impl/pom.xml
+++ b/openflowplugin-impl/pom.xml
@@ -16,6 +16,17 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <!-- This bundle works with Karaf 3 and 4.0 -->
+                        <Import-Package>
+                            org.apache.karaf.shell.commands;version="[3.0.0,4.1)",
+                            org.apache.karaf.shell.console;version="[3.0.0,4.1)",
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>

diff --git a/openflowplugin-impl/src/main/resources/org/opendaylight/blueprint/openflowplugin-impl.xml b/openflowplugin-impl/src/main/resources/org/opendaylight/blueprint/openflowplugin-impl.xml
index 976efaabee28c5b988d888fe4959faa73f1d2503..5b67ceaf702f3ec098510f81914424c488dcbeb6 100644 (file)
--- a/openflowplugin-impl/src/main/resources/org/opendaylight/blueprint/openflowplugin-impl.xml
+++ b/openflowplugin-impl/src/main/resources/org/opendaylight/blueprint/openflowplugin-impl.xml
@@ -7,5 +7,4 @@
   <service ref="ofPluginProviderFactory" interface="org.opendaylight.openflowplugin.api.openflow.OpenFlowPluginProviderFactory"
           odl:type="default"/>
 
-  <odl:action-provider interface="org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService"/>
 </blueprint>

diff --git a/pom.xml b/pom.xml
index d33525f7d83f1bb287f8fba830a4627eabba11e6..1c1cea642e538657cb2b35cb8cd73a116a4ba285 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -40,8 +40,8 @@
       <module>drop-test</module>
       <module>drop-test-karaf</module>
       <module>test-common</module>
-      <module>features</module>
-      <module>features-he</module>
+      <module>features-aggregator</module>
+      <module>features-he-aggregator</module>
       <module>samples/sample-consumer</module>
       <module>samples/learning-switch</module>
       <module>applications</module>