Bring features/neutron into the same parent dir as everything else

This will ease breaking the code out to the neutron northbound project

Change-Id: Idf887c14cdbc7e77b74f4964b516ac16ab6877e6
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/features/pom.xml b/features/pom.xml
index ed4fa49..9363d9e 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -22,6 +22,5 @@
     <module>netconf-connector</module>
     <module>restconf</module>
     <module>extras</module>
-    <module>neutron</module>
   </modules>
 </project>

diff --git a/features/neutron/pom.xml b/opendaylight/networkconfiguration/neutron/features/pom.xml
similarity index 100%
rename from features/neutron/pom.xml
rename to opendaylight/networkconfiguration/neutron/features/pom.xml

diff --git a/features/neutron/src/main/resources/features.xml b/opendaylight/networkconfiguration/neutron/features/src/main/resources/features.xml
similarity index 100%
rename from features/neutron/src/main/resources/features.xml
rename to opendaylight/networkconfiguration/neutron/features/src/main/resources/features.xml

diff --git a/pom.xml b/pom.xml
index 1c4bc4d..f49456a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -30,6 +30,7 @@
     <module>opendaylight/networkconfiguration/neutron</module>
     <module>opendaylight/networkconfiguration/neutron/implementation</module>
     <module>opendaylight/networkconfiguration/neutron/northbound</module>
+    <module>opendaylight/networkconfiguration/neutron/features</module>
 
     <!-- Parents -->
     <module>opendaylight/commons/concepts</module>