From 721e833bec7d967c8c3fa57db2bf80d8812c2c4e Mon Sep 17 00:00:00 2001
From: Vaclav Demcak <vdemcak@cisco.com>
Date: Tue, 13 Oct 2015 14:05:32 +0200
Subject: [PATCH] Bug 4460 -  Util project is too general project name

Project with name "util" is too general. I guess, this project
is not common util project for whole Openflow or ODL projects.
So name has to be change to "openflowjava-util" because it looks
like util project only for openflowjava parent.

Change-Id: I5e5477b10c2542ae84a0cf4ffa3a5bec95e07004
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
---
 artifacts/pom.xml                                               | 2 +-
 features/pom.xml                                                | 2 +-
 features/src/main/features/features.xml                         | 2 +-
 openflow-protocol-impl/pom.xml                                  | 2 +-
 {util => openflowjava-util}/pom.xml                             | 2 +-
 .../java/org/opendaylight/openflowjava/util/ByteBufUtils.java   | 0
 .../openflowjava/util/ExperimenterDeserializerKeyFactory.java   | 0
 .../openflowjava/util/ExperimenterSerializerKeyFactory.java     | 0
 .../org/opendaylight/openflowjava/util/ByteBufUtilsTest.java    | 0
 .../util/ExperimenterDeserializerKeyFactoryTest.java            | 0
 .../openflowjava/util/ExperimenterSerializerKeyFactoryTest.java | 0
 pom.xml                                                         | 2 +-
 12 files changed, 6 insertions(+), 6 deletions(-)
 rename {util => openflowjava-util}/pom.xml (94%)
 rename {util => openflowjava-util}/src/main/java/org/opendaylight/openflowjava/util/ByteBufUtils.java (100%)
 rename {util => openflowjava-util}/src/main/java/org/opendaylight/openflowjava/util/ExperimenterDeserializerKeyFactory.java (100%)
 rename {util => openflowjava-util}/src/main/java/org/opendaylight/openflowjava/util/ExperimenterSerializerKeyFactory.java (100%)
 rename {util => openflowjava-util}/src/test/java/org/opendaylight/openflowjava/util/ByteBufUtilsTest.java (100%)
 rename {util => openflowjava-util}/src/test/java/org/opendaylight/openflowjava/util/ExperimenterDeserializerKeyFactoryTest.java (100%)
 rename {util => openflowjava-util}/src/test/java/org/opendaylight/openflowjava/util/ExperimenterSerializerKeyFactoryTest.java (100%)

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 5b452b21..eaa3779f 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -46,7 +46,7 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>util</artifactId>
+                <artifactId>openflowjava-util</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
diff --git a/features/pom.xml b/features/pom.xml
index 9bb6181a..b6e92a39 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -113,7 +113,7 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowjava</groupId>
-      <artifactId>util</artifactId>
+      <artifactId>openflowjava-util</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index ad8963a3..689c1927 100644
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -24,7 +24,7 @@
         <bundle>mvn:org.opendaylight.openflowjava/openflow-protocol-api/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.openflowjava/openflow-protocol-spi/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.openflowjava/openflow-protocol-impl/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.openflowjava/util/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.openflowjava/openflowjava-util/{{VERSION}}</bundle>
         <configfile finalname="etc/opendaylight/karaf/45-openflowjava-stats.xml">mvn:org.opendaylight.openflowjava/openflowjava-config/${project.version}/xml/configstats</configfile>
     </feature>
 </features>
diff --git a/openflow-protocol-impl/pom.xml b/openflow-protocol-impl/pom.xml
index 272c909a..fae2c30b 100644
--- a/openflow-protocol-impl/pom.xml
+++ b/openflow-protocol-impl/pom.xml
@@ -104,7 +104,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowjava</groupId>
-            <artifactId>util</artifactId>
+            <artifactId>openflowjava-util</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
diff --git a/util/pom.xml b/openflowjava-util/pom.xml
similarity index 94%
rename from util/pom.xml
rename to openflowjava-util/pom.xml
index 4d4f3361..7b78d39e 100644
--- a/util/pom.xml
+++ b/openflowjava-util/pom.xml
@@ -9,7 +9,7 @@
         <relativePath>../parent</relativePath>
     </parent>
     <packaging>bundle</packaging>
-    <artifactId>util</artifactId>
+    <artifactId>openflowjava-util</artifactId>
 
     <dependencies>
         <dependency>
diff --git a/util/src/main/java/org/opendaylight/openflowjava/util/ByteBufUtils.java b/openflowjava-util/src/main/java/org/opendaylight/openflowjava/util/ByteBufUtils.java
similarity index 100%
rename from util/src/main/java/org/opendaylight/openflowjava/util/ByteBufUtils.java
rename to openflowjava-util/src/main/java/org/opendaylight/openflowjava/util/ByteBufUtils.java
diff --git a/util/src/main/java/org/opendaylight/openflowjava/util/ExperimenterDeserializerKeyFactory.java b/openflowjava-util/src/main/java/org/opendaylight/openflowjava/util/ExperimenterDeserializerKeyFactory.java
similarity index 100%
rename from util/src/main/java/org/opendaylight/openflowjava/util/ExperimenterDeserializerKeyFactory.java
rename to openflowjava-util/src/main/java/org/opendaylight/openflowjava/util/ExperimenterDeserializerKeyFactory.java
diff --git a/util/src/main/java/org/opendaylight/openflowjava/util/ExperimenterSerializerKeyFactory.java b/openflowjava-util/src/main/java/org/opendaylight/openflowjava/util/ExperimenterSerializerKeyFactory.java
similarity index 100%
rename from util/src/main/java/org/opendaylight/openflowjava/util/ExperimenterSerializerKeyFactory.java
rename to openflowjava-util/src/main/java/org/opendaylight/openflowjava/util/ExperimenterSerializerKeyFactory.java
diff --git a/util/src/test/java/org/opendaylight/openflowjava/util/ByteBufUtilsTest.java b/openflowjava-util/src/test/java/org/opendaylight/openflowjava/util/ByteBufUtilsTest.java
similarity index 100%
rename from util/src/test/java/org/opendaylight/openflowjava/util/ByteBufUtilsTest.java
rename to openflowjava-util/src/test/java/org/opendaylight/openflowjava/util/ByteBufUtilsTest.java
diff --git a/util/src/test/java/org/opendaylight/openflowjava/util/ExperimenterDeserializerKeyFactoryTest.java b/openflowjava-util/src/test/java/org/opendaylight/openflowjava/util/ExperimenterDeserializerKeyFactoryTest.java
similarity index 100%
rename from util/src/test/java/org/opendaylight/openflowjava/util/ExperimenterDeserializerKeyFactoryTest.java
rename to openflowjava-util/src/test/java/org/opendaylight/openflowjava/util/ExperimenterDeserializerKeyFactoryTest.java
diff --git a/util/src/test/java/org/opendaylight/openflowjava/util/ExperimenterSerializerKeyFactoryTest.java b/openflowjava-util/src/test/java/org/opendaylight/openflowjava/util/ExperimenterSerializerKeyFactoryTest.java
similarity index 100%
rename from util/src/test/java/org/opendaylight/openflowjava/util/ExperimenterSerializerKeyFactoryTest.java
rename to openflowjava-util/src/test/java/org/opendaylight/openflowjava/util/ExperimenterSerializerKeyFactoryTest.java
diff --git a/pom.xml b/pom.xml
index e35a9786..6f178361 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,6 @@
         <module>openflow-protocol-spi</module>
         <module>parent</module>
         <module>simple-client</module>
-        <module>util</module>
+        <module>openflowjava-util</module>
     </modules>
 </project>
-- 
2.36.6