Add netvirt-features

Change-Id: I8e2afcf08d523219f488c1b9ec9ad82330ba4557
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/vpnservice/vpnservice-artifacts/pom.xml b/artifacts/pom.xml
similarity index 95%
rename from vpnservice/vpnservice-artifacts/pom.xml
rename to artifacts/pom.xml
index d72b566ab7d14455b6e5f67375685a2c8b7af3c5..91870b6c144f66ec6846b8396b3bd13f522fcfa2 100644 (file)
--- a/vpnservice/vpnservice-artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -19,7 +19,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   </parent>
 
   <groupId>org.opendaylight.netvirt</groupId>
-  <artifactId>vpnservice-artifacts</artifactId>
+  <artifactId>netvirt-artifacts</artifactId>
   <name>ODL :: netvirt :: ${project.artifactId}</name>
   <version>0.6.0-SNAPSHOT</version>
   <packaging>pom</packaging>
@@ -28,7 +28,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependencies>
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>vpnservice-features</artifactId>
+        <artifactId>netvirt-features</artifactId>
         <version>${project.version}</version>
         <classifier>features</classifier>
         <type>xml</type>

diff --git a/pom.xml b/pom.xml
index 154a11dce34d3dd05bb29a44b0cb51dfdcd34443..f45fe17c1ab5d614af2887a833d3d0c781f9e3e1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <modules>
     <module>vpnservice</module>
+    <module>artifacts</module>
   </modules>
 
   <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->

diff --git a/vpnservice/distribution/karaf/pom.xml b/vpnservice/distribution/karaf/pom.xml
index 713bd5375ff2b7823ac2d8662d822aa995dc9b98..0bf40db35c34eff054f210413d6e81e88a24924f 100644 (file)
--- a/vpnservice/distribution/karaf/pom.xml
+++ b/vpnservice/distribution/karaf/pom.xml
@@ -35,7 +35,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>vpnservice-features</artifactId>
+      <artifactId>netvirt-features</artifactId>
       <version>${project.version}</version>
       <classifier>features</classifier>
       <type>xml</type>

diff --git a/vpnservice/features/vpnservice-features/pom.xml b/vpnservice/features/netvirt-features/pom.xml
similarity index 97%
rename from vpnservice/features/vpnservice-features/pom.xml
rename to vpnservice/features/netvirt-features/pom.xml
index 3f5a6adea5ad88926ce13e39b93616f8e536633f..69f6ca91682c72e44c01cc531d895a2ceeffb9bb 100644 (file)
--- a/vpnservice/features/vpnservice-features/pom.xml
+++ b/vpnservice/features/netvirt-features/pom.xml
@@ -19,7 +19,7 @@
     </parent>
 
     <groupId>org.opendaylight.netvirt</groupId>
-    <artifactId>vpnservice-features</artifactId>
+    <artifactId>netvirt-features</artifactId>
     <version>0.6.0-SNAPSHOT</version>
     <name>ODL :: netvirt :: ${project.artifactId}</name>
     <packaging>feature</packaging>

diff --git a/vpnservice/features/vpnservice-sfc-features/pom.xml b/vpnservice/features/netvirt-sfc-features/pom.xml
similarity index 95%
rename from vpnservice/features/vpnservice-sfc-features/pom.xml
rename to vpnservice/features/netvirt-sfc-features/pom.xml
index 884d402dd76bec0f632deebc3007f1bac323891c..3faff9a1cfd65ff5e99e8fa7fe46675d49099e81 100644 (file)
--- a/vpnservice/features/vpnservice-sfc-features/pom.xml
+++ b/vpnservice/features/netvirt-sfc-features/pom.xml
@@ -19,7 +19,7 @@
     </parent>
 
     <groupId>org.opendaylight.netvirt</groupId>
-    <artifactId>vpnservice-sfc-features</artifactId>
+    <artifactId>netvirt-sfc-features</artifactId>
     <version>0.6.0-SNAPSHOT</version>
     <name>ODL :: netvirt :: ${project.artifactId}</name>
     <packaging>feature</packaging>

diff --git a/vpnservice/features/pom.xml b/vpnservice/features/pom.xml
index 176de1aafba152aa8ea03a30a1bf18d91df58348..a30760993e6b9a75700dce35e68129d5f5abb628 100644 (file)
--- a/vpnservice/features/pom.xml
+++ b/vpnservice/features/pom.xml
@@ -22,7 +22,7 @@
     <name>ODL :: netvirt :: ${project.artifactId}</name>
 
     <modules>
-        <module>vpnservice-features</module>
+        <module>netvirt-features</module>
         <module>odl-netvirt-api</module>
         <module>odl-netvirt-coe</module>
         <module>odl-netvirt-impl</module>
@@ -37,7 +37,7 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>vpnservice-sfc-features</module>
+                <module>netvirt-sfc-features</module>
                 <module>odl-netvirt-sfc</module>
             </modules>
         </profile>

diff --git a/vpnservice/pom.xml b/vpnservice/pom.xml
index 4c699bfafe2f8937dbb120e9b857ec7632fdec24..145f35c3e100772cfb9415e1fb5d7d6995a99f25 100644 (file)
--- a/vpnservice/pom.xml
+++ b/vpnservice/pom.xml
@@ -38,7 +38,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <!--<module>policyservice</module>-->
     <module>distribution/karaf</module>
     <module>features</module>
-    <module>vpnservice-artifacts</module>
     <module>statemanager</module>
     <module>statistics</module>
     <!--<module>ovsdb-ui</module>-->
@@ -53,7 +52,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       </activation>
       <modules>
         <module>sfc</module>
-        <module>vpnservice-sfc-artifacts</module>
+        <module>sfc-artifacts</module>
       </modules>
     </profile>
     <profile>

diff --git a/vpnservice/vpnservice-sfc-artifacts/pom.xml b/vpnservice/sfc-artifacts/pom.xml
similarity index 95%
rename from vpnservice/vpnservice-sfc-artifacts/pom.xml
rename to vpnservice/sfc-artifacts/pom.xml
index 22c726f8dc71e5aacbc9bfaa81d94dbb96b1444e..34c271e496d172910757e71a2f473e70bbdb6655 100644 (file)
--- a/vpnservice/vpnservice-sfc-artifacts/pom.xml
+++ b/vpnservice/sfc-artifacts/pom.xml
@@ -18,7 +18,7 @@
     </parent>
 
     <groupId>org.opendaylight.netvirt</groupId>
-    <artifactId>vpnservice-sfc-artifacts</artifactId>
+    <artifactId>netvirt-sfc-artifacts</artifactId>
     <version>0.6.0-SNAPSHOT</version>
     <name>ODL :: netvirt :: ${project.artifactId}</name>