Revert "Retructuring the utils folder to make it a broader toolkit beyond just a...

This reverts commit 353b7ec925f3a82aabf52bb21a40189397c5176e.

Change-Id: I73a57bc8d6c2fee5bb79838e99af1500e0b99cc1
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 58dd813936be212df177842e664459b4ec1e4322..57ab9a9a4dbb3c1f711b07c36a446812541fa1c1 100755 (executable)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -33,7 +33,7 @@
     <schema.openvswitch.version>1.1.0-SNAPSHOT</schema.openvswitch.version>
     <schema.hardwarevtep.version>1.1.0-SNAPSHOT</schema.hardwarevtep.version>
     <ovsdb.ofextension.version>1.1.0-SNAPSHOT</ovsdb.ofextension.version>
-    <ovsdb.utils.version>1.1.0-SNAPSHOT</ovsdb.utils.version>
+    <utils.mdsal.openflow>1.1.0-SNAPSHOT</utils.mdsal.openflow>
     <ovsdb.ovssfc.version>0.1.0-SNAPSHOT</ovsdb.ovssfc.version>
     <!-- Skip Coverage and IT by default -->
     <skip.coverage>true</skip.coverage>
@@ -314,11 +314,6 @@
         <artifactId>of-extension.nx-sal</artifactId>
         <version>${ovsdb.ofextension.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.ovsdb</groupId>
-        <artifactId>utils</artifactId>
-        <version>${ovsdb.utils.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.sfc</groupId>
         <artifactId>sfc-model</artifactId>

diff --git a/openstack/net-virt-providers/pom.xml b/openstack/net-virt-providers/pom.xml
index 0be16ce50293b1fc6e03d9d4ed4c052a38cc4ede..82fb684dc706ba73b98ff5a9f91410b4b0355ec5 100644 (file)
--- a/openstack/net-virt-providers/pom.xml
+++ b/openstack/net-virt-providers/pom.xml
@@ -62,7 +62,8 @@
         </dependency>
         <dependency>
           <groupId>org.opendaylight.ovsdb</groupId>
-          <artifactId>utils</artifactId>
+          <artifactId>utils.mdsal-openflow</artifactId>
+          <version>1.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>junit</groupId>
@@ -103,7 +104,7 @@
                             org.osgi.framework,
                             *
                         </Import-Package>
-                        <Embed-Dependency>utils;type=!pom;inline=false</Embed-Dependency>
+                        <Embed-Dependency>utils.mdsal-openflow;type=!pom;inline=false</Embed-Dependency>
                         <Embed-Transitive>true</Embed-Transitive>
                         <Bundle-Activator>org.opendaylight.ovsdb.openstack.netvirt.providers.Activator</Bundle-Activator>
                     </instructions>

diff --git a/ovs-sfc/pom.xml b/ovs-sfc/pom.xml
index 73f9a8931f5cf7cec8c3454336a88866532e4b51..0d58e465a4c3f715c7a663b48a5bcb144a6067c9 100644 (file)
--- a/ovs-sfc/pom.xml
+++ b/ovs-sfc/pom.xml
@@ -77,7 +77,8 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.ovsdb</groupId>
-            <artifactId>utils</artifactId>
+            <artifactId>utils.mdsal-openflow</artifactId>
+            <version>1.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.sfc</groupId>
@@ -109,7 +110,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Embed-Dependency>utils;type=!pom;inline=false</Embed-Dependency>
+                        <Embed-Dependency>utils.mdsal-openflow;type=!pom;inline=false</Embed-Dependency>
                         <Embed-Transitive>true</Embed-Transitive>
                         <Include-Resource>
                             /OSGI-OPT/ovs-sfc/53-ovssfc-provider.xml=${project.basedir}/src/main/resources/initial/53-ovssfc-provider.xml,{maven-resources}

diff --git a/pom.xml b/pom.xml
index c494a6f9e5c2b76aedd22fb97d5ebef8012cb66f..455060a01d24c1498cb1ccf62e649f7ead53c9c5 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <module>plugin-shell</module>
     <module>plugin-mdsal-adapter</module>
     <module>northbound</module>
-    <module>utils</module>
+    <module>utils/mdsal-openflow</module>
     <module>openstack/net-virt</module>
     <module>openstack/net-virt-providers</module>
     <module>of-extension/nx-ofjava</module>

diff --git a/utils/pom.xml b/utils/mdsal-openflow/pom.xml
similarity index 95%
rename from utils/pom.xml
rename to utils/mdsal-openflow/pom.xml
index de2a8b292ad7ee4a47dc35a8705e20c8bada7088..b1da6ef2cfeffd691cc14e61813fa76f09f97ddb 100644 (file)
--- a/utils/pom.xml
+++ b/utils/mdsal-openflow/pom.xml
@@ -6,11 +6,11 @@
     <artifactId>commons</artifactId>
     <groupId>org.opendaylight.ovsdb</groupId>
     <version>1.3.0-SNAPSHOT</version>
-    <relativePath>../commons/parent/pom.xml</relativePath>
+    <relativePath>../../commons/parent/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>utils</artifactId>
+  <artifactId>utils.mdsal-openflow</artifactId>
   <name>OpenDaylight OVS utility for md-sal based OpenFlow</name>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>jar</packaging>

diff --git a/utils/src/main/java/org/opendaylight/ovsdb/utils/mdsal/openflow/ActionUtils.java b/utils/mdsal-openflow/src/main/java/org/opendaylight/ovsdb/utils/mdsal/openflow/ActionUtils.java
similarity index 100%
rename from utils/src/main/java/org/opendaylight/ovsdb/utils/mdsal/openflow/ActionUtils.java
rename to utils/mdsal-openflow/src/main/java/org/opendaylight/ovsdb/utils/mdsal/openflow/ActionUtils.java

diff --git a/utils/src/main/java/org/opendaylight/ovsdb/utils/mdsal/openflow/InstructionUtils.java b/utils/mdsal-openflow/src/main/java/org/opendaylight/ovsdb/utils/mdsal/openflow/InstructionUtils.java
similarity index 100%
rename from utils/src/main/java/org/opendaylight/ovsdb/utils/mdsal/openflow/InstructionUtils.java
rename to utils/mdsal-openflow/src/main/java/org/opendaylight/ovsdb/utils/mdsal/openflow/InstructionUtils.java

diff --git a/utils/src/main/java/org/opendaylight/ovsdb/utils/mdsal/openflow/MatchUtils.java b/utils/mdsal-openflow/src/main/java/org/opendaylight/ovsdb/utils/mdsal/openflow/MatchUtils.java
similarity index 100%
rename from utils/src/main/java/org/opendaylight/ovsdb/utils/mdsal/openflow/MatchUtils.java
rename to utils/mdsal-openflow/src/main/java/org/opendaylight/ovsdb/utils/mdsal/openflow/MatchUtils.java