OPNFLWPLUG-972: Add liblldp module to openflowplugin pom

1. Change package from org.opendaylight.controller
   to org.opendaylight.openflowplugin.libraries
2. Enable liblldp module - Add to openfloplugin pom.xml

Change-Id: I0d6fa73a78e4fea587e250aed5577c10375e6b31
Signed-off-by: D Arunprakash <d.arunprakash@ericsson.com>

diff --git a/libraries/liblldp/pom.xml b/libraries/liblldp/pom.xml
index ccb265a428227ac87e802334515d7efde3452abe..136cd72f082be4fd7c16ade2c2018c7619663768 100644 (file)
--- a/libraries/liblldp/pom.xml
+++ b/libraries/liblldp/pom.xml
@@ -3,16 +3,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>bundle-parent</artifactId>
-    <version>3.0.2</version>
-    <relativePath/>
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>libraries</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
+  <groupId>org.opendaylight.openflowplugin.libraries</groupId>
   <artifactId>liblldp</artifactId>
-  <version>0.14.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
+
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
@@ -46,7 +45,7 @@
         <configuration>
           <instructions>
             <Export-Package>
-              org.opendaylight.controller.liblldp</Export-Package>
+              org.opendaylight.openflowplugin.libraries.liblldp</Export-Package>
           </instructions>
         </configuration>
       </plugin>
@@ -54,9 +53,9 @@
   </build>
 
   <scm>
-    <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</developerConnection>
+    <url>https://wiki.opendaylight.org/view/OpenDaylight_OpenFlow_Plugin:Main</url>
     <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
   </scm>
-</project>
+</project>
\ No newline at end of file

diff --git a/libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/BitBufferHelper.java b/libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/BitBufferHelper.java
similarity index 99%
rename from libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/BitBufferHelper.java
rename to libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/BitBufferHelper.java
index a184d40d1ee96ed5d3986b3ffb3872fb76a269f0..fc849c5aec4e8e5b6780eaa945dd6c99708d3f08 100644 (file)
--- a/libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/BitBufferHelper.java
+++ b/libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/BitBufferHelper.java
@@ -9,7 +9,7 @@
 /**
  *
  */
-package org.opendaylight.controller.liblldp;
+package org.opendaylight.openflowplugin.libraries.liblldp;
 
 import java.util.Arrays;
 

diff --git a/libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/BufferException.java b/libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/BufferException.java
similarity index 90%
rename from libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/BufferException.java
rename to libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/BufferException.java
index f584a2379075ec49038b0a8ed25270184f6c291b..b4c87048194833f6db01c8485bd2aabbdf3adde6 100644 (file)
--- a/libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/BufferException.java
+++ b/libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/BufferException.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.liblldp;
+package org.opendaylight.openflowplugin.libraries.liblldp;
 
 /**
  * Describes an exception that is raised during BitBufferHelper operations.

diff --git a/libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/ConstructionException.java b/libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/ConstructionException.java
similarity index 92%
rename from libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/ConstructionException.java
rename to libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/ConstructionException.java
index d5f854f4fa2976ee9e22e0ac29b276da1cfdb162..451e347012f0d1449c519ec93703e3d17eeaf8a7 100644 (file)
--- a/libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/ConstructionException.java
+++ b/libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/ConstructionException.java
@@ -16,7 +16,7 @@
  *
  *
  */
-package org.opendaylight.controller.liblldp;
+package org.opendaylight.openflowplugin.libraries.liblldp;
 
 public class ConstructionException extends Exception {
     private static final long serialVersionUID = 1L;

diff --git a/libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/CustomTLVKey.java b/libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/CustomTLVKey.java
similarity index 96%
rename from libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/CustomTLVKey.java
rename to libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/CustomTLVKey.java
index fd5c2100632fc26ef921fcceed3c82318c8a51b1..66225b0c4cdcf9b58873c5d3e7c3161ea44cafac 100644 (file)
--- a/libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/CustomTLVKey.java
+++ b/libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/CustomTLVKey.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.liblldp;
+package org.opendaylight.openflowplugin.libraries.liblldp;
 
 public class CustomTLVKey {
 

diff --git a/libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/DataLinkAddress.java b/libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/DataLinkAddress.java
similarity index 97%
rename from libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/DataLinkAddress.java
rename to libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/DataLinkAddress.java
index a9bc910ffc4c4cb6e0199e0b251ef8b2571eef4f..5aff4773d3ce64fec76d25745efec6abbd06fc69 100644 (file)
--- a/libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/DataLinkAddress.java
+++ b/libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/DataLinkAddress.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.liblldp;
+package org.opendaylight.openflowplugin.libraries.liblldp;
 
 import java.io.Serializable;
 

diff --git a/libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/EtherTypes.java b/libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/EtherTypes.java
similarity index 98%
rename from libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/EtherTypes.java
rename to libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/EtherTypes.java
index 84f47da8a83a4ff05f75e75e8c004d7d0d3cce44..8009a0bbf1bb324f96b006a533c603fdf5fedee0 100644 (file)
--- a/libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/EtherTypes.java
+++ b/libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/EtherTypes.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.liblldp;
+package org.opendaylight.openflowplugin.libraries.liblldp;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/Ethernet.java b/libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/Ethernet.java
similarity index 98%
rename from libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/Ethernet.java
rename to libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/Ethernet.java
index a78ff6a1d1026438f67e67df0adfcde52b6f6630..d4b904d85a72dba749669b639438f705c859095e 100644 (file)
--- a/libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/Ethernet.java
+++ b/libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/Ethernet.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.liblldp;
+package org.opendaylight.openflowplugin.libraries.liblldp;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;

diff --git a/libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/EthernetAddress.java b/libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/EthernetAddress.java
similarity index 98%
rename from libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/EthernetAddress.java
rename to libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/EthernetAddress.java
index fb75532e395caa8712b91203fa4c849913a257fe..e9d041c7d9f8837498d20df54482d3880d23b6eb 100644 (file)
--- a/libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/EthernetAddress.java
+++ b/libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/EthernetAddress.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.liblldp;
+package org.opendaylight.openflowplugin.libraries.liblldp;
 
 import java.util.Arrays;
 

diff --git a/libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/HexEncode.java b/libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/HexEncode.java
similarity index 98%
rename from libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/HexEncode.java
rename to libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/HexEncode.java
index bb181492a78d622793f5d29b97487a3b8681bdc8..5958c5d88c0fb720ed0f58d30ffb7d83f4866e7a 100644 (file)
--- a/libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/HexEncode.java
+++ b/libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/HexEncode.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.liblldp;
+package org.opendaylight.openflowplugin.libraries.liblldp;
 
 import java.math.BigInteger;
 

diff --git a/libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/LLDP.java b/libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/LLDP.java
similarity index 99%
rename from libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/LLDP.java
rename to libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/LLDP.java
index 7ed1ede781b8cf99c372bd6100ce2841c5a86764..27b638dbb12978668276abb333cce025e7ed2b66 100644 (file)
--- a/libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/LLDP.java
+++ b/libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/LLDP.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.liblldp;
+package org.opendaylight.openflowplugin.libraries.liblldp;
 
 import com.google.common.collect.Iterables;
 import java.util.LinkedHashMap;

diff --git a/libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/LLDPTLV.java b/libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/LLDPTLV.java
similarity index 99%
rename from libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/LLDPTLV.java
rename to libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/LLDPTLV.java
index 24b350cdc622efd7db3eaee4a1da76dd38c028b0..a030d1b59bb174b3e2a0d4b40dfe57a93780633b 100644 (file)
--- a/libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/LLDPTLV.java
+++ b/libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/LLDPTLV.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.liblldp;
+package org.opendaylight.openflowplugin.libraries.liblldp;
 
 import org.apache.commons.lang3.ArrayUtils;
 import org.slf4j.LoggerFactory;

diff --git a/libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/NetUtils.java b/libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/NetUtils.java
similarity index 99%
rename from libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/NetUtils.java
rename to libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/NetUtils.java
index 2ed77879cba48e470987be89d275bd00b5be902a..f92ec9045ca7a7259fd48837672272724e6357e3 100644 (file)
--- a/libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/NetUtils.java
+++ b/libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/NetUtils.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.liblldp;
+package org.opendaylight.openflowplugin.libraries.liblldp;
 
 import java.net.Inet4Address;
 import java.net.Inet6Address;

diff --git a/libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/Packet.java b/libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/Packet.java
similarity index 99%
rename from libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/Packet.java
rename to libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/Packet.java
index 3e3ad14a6f49664c0154761dac1fcc8fce6e5f53..927fcc7c211c9f738522211d559c7ac28e8780f1 100644 (file)
--- a/libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/Packet.java
+++ b/libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/Packet.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.liblldp;
+package org.opendaylight.openflowplugin.libraries.liblldp;
 
 import java.util.Arrays;
 import java.util.Map;

diff --git a/libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/PacketException.java b/libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/PacketException.java
similarity index 93%
rename from libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/PacketException.java
rename to libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/PacketException.java
index 14990e1ccbfd3ab1234745c8d9da38302e85b553..57ff2f360abe3d2b31b9a0d1f952ac74db78cf01 100644 (file)
--- a/libraries/liblldp/src/main/java/org/opendaylight/controller/liblldp/PacketException.java
+++ b/libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/PacketException.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.liblldp;
+package org.opendaylight.openflowplugin.libraries.liblldp;
 
 /**
  * Describes an exception that is raised when the process of serializing or

diff --git a/libraries/liblldp/src/test/java/org/opendaylight/controller/liblldp/HexEncodeTest.java b/libraries/liblldp/src/test/java/org/opendaylight/openflowplugin/libraries/liblldp/HexEncodeTest.java
similarity index 97%
rename from libraries/liblldp/src/test/java/org/opendaylight/controller/liblldp/HexEncodeTest.java
rename to libraries/liblldp/src/test/java/org/opendaylight/openflowplugin/libraries/liblldp/HexEncodeTest.java
index 18aa3001faf8dddffae691a5cdb2bf4c1aa4c707..d6bad9ab11f0a14dd83846371df9ef045823552d 100644 (file)
--- a/libraries/liblldp/src/test/java/org/opendaylight/controller/liblldp/HexEncodeTest.java
+++ b/libraries/liblldp/src/test/java/org/opendaylight/openflowplugin/libraries/liblldp/HexEncodeTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.liblldp;
+package org.opendaylight.openflowplugin.libraries.liblldp;
 
 import org.junit.Assert;
 import org.junit.Test;

diff --git a/libraries/liblldp/src/test/java/org/opendaylight/controller/liblldp/LLDPTLVTest.java b/libraries/liblldp/src/test/java/org/opendaylight/openflowplugin/libraries/liblldp/LLDPTLVTest.java
similarity index 90%
rename from libraries/liblldp/src/test/java/org/opendaylight/controller/liblldp/LLDPTLVTest.java
rename to libraries/liblldp/src/test/java/org/opendaylight/openflowplugin/libraries/liblldp/LLDPTLVTest.java
index 23f8ae6f96e132739e7880d4c0905bfba1419f45..6f19a49281581cdad78078a09d7ee6dd2f29778f 100644 (file)
--- a/libraries/liblldp/src/test/java/org/opendaylight/controller/liblldp/LLDPTLVTest.java
+++ b/libraries/liblldp/src/test/java/org/opendaylight/openflowplugin/libraries/liblldp/LLDPTLVTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.liblldp;
+package org.opendaylight.openflowplugin.libraries.liblldp;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -33,7 +33,7 @@ public class LLDPTLVTest {
 
     /**
      * Test method for
-     * {@link org.opendaylight.controller.liblldp.LLDPTLV#createCustomTLVValue(java.lang.String)}
+     * {@link org.opendaylight.openflowplugin.libraries.liblldp.LLDPTLV#createCustomTLVValue(java.lang.String)}
      * .
      */
     @Test
@@ -58,7 +58,7 @@ public class LLDPTLVTest {
 
     /**
      * Test method for
-     * {@link org.opendaylight.controller.liblldp.LLDPTLV#getCustomString(byte[], int)}
+     * {@link org.opendaylight.openflowplugin.libraries.liblldp.LLDPTLV#getCustomString(byte[], int)}
      * .
      * @throws Exception
      */

diff --git a/libraries/liblldp/src/test/java/org/opendaylight/controller/liblldp/LLDPTest.java b/libraries/liblldp/src/test/java/org/opendaylight/openflowplugin/libraries/liblldp/LLDPTest.java
similarity index 99%
rename from libraries/liblldp/src/test/java/org/opendaylight/controller/liblldp/LLDPTest.java
rename to libraries/liblldp/src/test/java/org/opendaylight/openflowplugin/libraries/liblldp/LLDPTest.java
index 6716ffa085bfb6640ff9b13e35835976e99124df..808dce614757c8ff532104e2a959f3a8c3231ca3 100644 (file)
--- a/libraries/liblldp/src/test/java/org/opendaylight/controller/liblldp/LLDPTest.java
+++ b/libraries/liblldp/src/test/java/org/opendaylight/openflowplugin/libraries/liblldp/LLDPTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.liblldp;
+package org.opendaylight.openflowplugin.libraries.liblldp;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;

diff --git a/libraries/liblldp/src/test/java/org/opendaylight/controller/sal/packet/BitBufferHelperTest.java b/libraries/liblldp/src/test/java/org/opendaylight/openflowplugin/libraries/sal/packet/BitBufferHelperTest.java
similarity index 99%
rename from libraries/liblldp/src/test/java/org/opendaylight/controller/sal/packet/BitBufferHelperTest.java
rename to libraries/liblldp/src/test/java/org/opendaylight/openflowplugin/libraries/sal/packet/BitBufferHelperTest.java
index 0ba5476e52cb5141d9f345670aff36a03e526177..d8314a7efbd0734dfb7492e027a2496221ac2ce5 100644 (file)
--- a/libraries/liblldp/src/test/java/org/opendaylight/controller/sal/packet/BitBufferHelperTest.java
+++ b/libraries/liblldp/src/test/java/org/opendaylight/openflowplugin/libraries/sal/packet/BitBufferHelperTest.java
@@ -6,11 +6,11 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.sal.packet;
+package org.opendaylight.openflowplugin.libraries.sal.packet;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.opendaylight.controller.liblldp.BitBufferHelper;
+import org.opendaylight.openflowplugin.libraries.liblldp.BitBufferHelper;
 
 public class BitBufferHelperTest {
 

diff --git a/libraries/liblldp/src/test/java/org/opendaylight/controller/sal/packet/address/EthernetAddressTest.java b/libraries/liblldp/src/test/java/org/opendaylight/openflowplugin/libraries/sal/packet/address/EthernetAddressTest.java
similarity index 94%
rename from libraries/liblldp/src/test/java/org/opendaylight/controller/sal/packet/address/EthernetAddressTest.java
rename to libraries/liblldp/src/test/java/org/opendaylight/openflowplugin/libraries/sal/packet/address/EthernetAddressTest.java
index 5730dc75e9884d39247001f24e0d345bb67b197c..7e8c6124a1597752711e4852e41dc06f048ff5cf 100644 (file)
--- a/libraries/liblldp/src/test/java/org/opendaylight/controller/sal/packet/address/EthernetAddressTest.java
+++ b/libraries/liblldp/src/test/java/org/opendaylight/openflowplugin/libraries/sal/packet/address/EthernetAddressTest.java
@@ -13,12 +13,12 @@
  *
  * Unit Tests for EthernetAddress class
  */
-package org.opendaylight.controller.sal.packet.address;
+package org.opendaylight.openflowplugin.libraries.sal.packet.address;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.opendaylight.controller.liblldp.ConstructionException;
-import org.opendaylight.controller.liblldp.EthernetAddress;
+import org.opendaylight.openflowplugin.libraries.liblldp.ConstructionException;
+import org.opendaylight.openflowplugin.libraries.liblldp.EthernetAddress;
 
 public class EthernetAddressTest {
     @Test

diff --git a/libraries/liblldp/src/test/resources/log4j.xml b/libraries/liblldp/src/test/resources/log4j.xml
index e47e51a467396d054d6961d9f100db60b4ad3bce..aacbf8c7d1bd832821aea59a3a71a54fa22ab90e 100644 (file)
--- a/libraries/liblldp/src/test/resources/log4j.xml
+++ b/libraries/liblldp/src/test/resources/log4j.xml
@@ -8,7 +8,7 @@
         </layout>
     </appender>
 
-    <logger name="org.opendaylight.controller.liblldp" additivity="false">
+    <logger name="org.opendaylight.openflowplugin.libraries.liblldp" additivity="false">
         <level value="DEBUG" />
         <appender-ref ref="console" />
     </logger>

diff --git a/libraries/pom.xml b/libraries/pom.xml
new file mode 100644 (file)
index 0000000..d4cc9ec
--- /dev/null
+++ b/libraries/pom.xml
@@ -0,0 +1,45 @@
+<?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.openflowplugin</groupId>
+        <artifactId>openflowplugin-parent</artifactId>
+        <version>0.6.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
+
+    <artifactId>libraries</artifactId>
+    <name>libraries</name>
+    <url>http://maven.apache.org</url>
+    <packaging>pom</packaging>
+
+    <build>
+        <plugins>
+            <!-- TODO: Fix checkstyle issues later
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
+                </configuration>
+            </plugin>
+            -->
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+    <scm>
+        <connection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</developerConnection>
+        <url>https://wiki.opendaylight.org/view/OpenDaylight_OpenFlow_Plugin:Main</url>
+        <tag>HEAD</tag>
+    </scm>
+
+    <modules>
+        <module>liblldp</module>
+    </modules>
+</project>
\ No newline at end of file

diff --git a/pom.xml b/pom.xml
index 769b252d12ea9c38f14258eb34feb420982f0fce..dad8ad896ef743848e805d8ef7b5002c174a5c66 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,7 @@
     <modules>
         <module>artifacts</module>
         <module>parent</module>
+        <module>libraries</module>
         <module>openflowjava</module>
         <module>openflowplugin-api</module>
         <module>openflowplugin</module>