Package name changes to reflect functionality differences between Library and Plugin.

This is just the first step towards pulling the OVSDB Library into its own bundle.

Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/database/ColumnSchema.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/ColumnSchema.java
similarity index 81%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/database/ColumnSchema.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/ColumnSchema.java
index 8ec68f9987baa60ac5a4ee9691b31a8d7ea3c4d2..55cdf43a383a453f8ea89bd841de90fe3b5569d2 100755 (executable)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/database/ColumnSchema.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/ColumnSchema.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.database;\r
+package org.opendaylight.ovsdb.lib.database;\r
 \r
 import com.fasterxml.jackson.annotation.JsonProperty;\r
 \r

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/database/DatabaseSchema.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/DatabaseSchema.java
similarity index 84%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/database/DatabaseSchema.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/DatabaseSchema.java
index 7df70f2abadadcbbc247e991587c4a3f3007f986..8d7daa6cf82b8cf5aaadb9067ddd36559f93e18c 100755 (executable)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/database/DatabaseSchema.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/DatabaseSchema.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.database;\r
+package org.opendaylight.ovsdb.lib.database;\r
 \r
 import java.util.Map;\r
 \r

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/database/OVSBridge.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/OVSBridge.java
similarity index 89%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/database/OVSBridge.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/OVSBridge.java
index 35c671960eb0c46b35524e64fc734c0aa100dfa0..f44fc13430a2ee545f2c92f5de91926ea02166da 100755 (executable)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/database/OVSBridge.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/OVSBridge.java
@@ -1,8 +1,8 @@
-package org.opendaylight.ovsdb.database;\r
+package org.opendaylight.ovsdb.lib.database;\r
 \r
 \r
-import org.opendaylight.ovsdb.internal.Connection;\r
-import org.opendaylight.ovsdb.internal.OvsdbMessage;\r
+import org.opendaylight.ovsdb.plugin.Connection;\r
+import org.opendaylight.ovsdb.plugin.OvsdbMessage;\r
 \r
 import java.util.*;\r
 \r

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/database/OVSInstance.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/OVSInstance.java
similarity index 87%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/database/OVSInstance.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/OVSInstance.java
index 610993a0ff4242132a33432588461c255dbf6d89..fdecbb73cf6b75fad28445d2bfcf7e3f9557f312 100755 (executable)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/database/OVSInstance.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/OVSInstance.java
@@ -1,8 +1,8 @@
-package org.opendaylight.ovsdb.database;\r
+package org.opendaylight.ovsdb.lib.database;\r
 \r
 \r
-import org.opendaylight.ovsdb.internal.Connection;\r
-import org.opendaylight.ovsdb.internal.OvsdbMessage;\r
+import org.opendaylight.ovsdb.plugin.Connection;\r
+import org.opendaylight.ovsdb.plugin.OvsdbMessage;\r
 \r
 import java.util.ArrayList;\r
 import java.util.HashMap;\r

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/database/OvsdbType.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/OvsdbType.java
similarity index 94%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/database/OvsdbType.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/OvsdbType.java
index bc4d0592772aec2a4b4a53d682d5f1adf971d8c6..94b920077ba8cf430323ab47a6e087fbf9ffecc0 100755 (executable)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/database/OvsdbType.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/OvsdbType.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.database;\r
+package org.opendaylight.ovsdb.lib.database;\r
 \r
 import com.fasterxml.jackson.annotation.JsonProperty;\r
 \r

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/database/TableSchema.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/TableSchema.java
similarity index 87%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/database/TableSchema.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/TableSchema.java
index 0172bb890ae41a654eaa09873c9c2c7c6238fe07..98c9326b3d53df2fe419ec5cfbd24ec489416260 100755 (executable)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/database/TableSchema.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/TableSchema.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.database;\r
+package org.opendaylight.ovsdb.lib.database;\r
 \r
 import java.util.Map;\r
 \r

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/database/Uuid.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/Uuid.java
similarity index 71%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/database/Uuid.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/Uuid.java
index c5b016ed9ebba54f8f66a5a5ed72ae922eb55b41..c871111a22e12d1084b5fe50fa4b7fe58c3da96d 100755 (executable)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/database/Uuid.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/Uuid.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.database;\r
+package org.opendaylight.ovsdb.lib.database;\r
 \r
 import com.fasterxml.jackson.annotation.JsonProperty;\r
 \r

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/OvsDBMap.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/OvsDBMap.java
similarity index 84%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/OvsDBMap.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/OvsDBMap.java
index f3455b6708fa229f88a14b4fe4a7abe06eb1fb23..3a991ce4d4c6cd2bec4b8963cc767e7129e8e4d3 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/OvsDBMap.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/OvsDBMap.java
@@ -1,10 +1,10 @@
-package org.opendaylight.ovsdb.datatype;
+package org.opendaylight.ovsdb.lib.datatype;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.google.common.collect.ForwardingMap;
 import com.google.common.collect.Maps;
 
-import org.opendaylight.ovsdb.datatype.json.Converter;
+import org.opendaylight.ovsdb.lib.datatype.json.Converter;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/OvsDBSet.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/OvsDBSet.java
similarity index 86%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/OvsDBSet.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/OvsDBSet.java
index e13b45461b0ed280a586c6728386b91226c3b0a7..639ff1e37e65cf8eb430c61ffa1e1051310afbf2 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/OvsDBSet.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/OvsDBSet.java
@@ -1,10 +1,10 @@
-package org.opendaylight.ovsdb.datatype;
+package org.opendaylight.ovsdb.lib.datatype;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.google.common.collect.ForwardingSet;
 import com.google.common.collect.Sets;
 
-import org.opendaylight.ovsdb.datatype.json.Converter;
+import org.opendaylight.ovsdb.lib.datatype.json.Converter;
 
 import java.util.Set;
 

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/UUID.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/UUID.java
similarity index 74%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/UUID.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/UUID.java
index 45a706470e44a42b46496232b23adb071add3e1b..9ba077871043d5a78e7d59d478ae56cb649bf475 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/UUID.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/UUID.java
@@ -1,11 +1,11 @@
-package org.opendaylight.ovsdb.datatype;
+package org.opendaylight.ovsdb.lib.datatype;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonTypeIdResolver;
 
-import org.opendaylight.ovsdb.datatype.json.OVSDBTypesIDResolver;
-import org.opendaylight.ovsdb.datatype.json.UUIDStringConverter;
+import org.opendaylight.ovsdb.lib.datatype.json.OVSDBTypesIDResolver;
+import org.opendaylight.ovsdb.lib.datatype.json.UUIDStringConverter;
 
 @JsonTypeIdResolver(OVSDBTypesIDResolver.class)
 @JsonTypeInfo(use = JsonTypeInfo.Id.CUSTOM, include = JsonTypeInfo.As.WRAPPER_ARRAY)

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/json/Converter.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/json/Converter.java
similarity index 94%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/json/Converter.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/json/Converter.java
index 0c8a44444d753c803f7412f3f69f861719ed4e2b..5bc27630c646d5d112f5138b675f2be8aef4fe0e 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/json/Converter.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/json/Converter.java
@@ -1,10 +1,11 @@
-package org.opendaylight.ovsdb.datatype.json;
+package org.opendaylight.ovsdb.lib.datatype.json;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.util.StdConverter;
-import org.opendaylight.ovsdb.datatype.OvsDBMap;
-import org.opendaylight.ovsdb.datatype.OvsDBSet;
-import org.opendaylight.ovsdb.datatype.UUID;
+
+import org.opendaylight.ovsdb.lib.datatype.OvsDBMap;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBSet;
+import org.opendaylight.ovsdb.lib.datatype.UUID;
 
 public class Converter {
 

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/json/OVSDBTypesIDResolver.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/json/OVSDBTypesIDResolver.java
similarity index 89%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/json/OVSDBTypesIDResolver.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/json/OVSDBTypesIDResolver.java
index b81a26f49089fcbcbf226242dd653b8e9abf31e9..9c4030abd01c299d5465bed7c727a7528b392a9b 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/json/OVSDBTypesIDResolver.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/json/OVSDBTypesIDResolver.java
@@ -1,11 +1,12 @@
-package org.opendaylight.ovsdb.datatype.json;
+package org.opendaylight.ovsdb.lib.datatype.json;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
 import com.fasterxml.jackson.databind.type.TypeFactory;
-import org.opendaylight.ovsdb.datatype.OvsDBSet;
-import org.opendaylight.ovsdb.datatype.UUID;
+
+import org.opendaylight.ovsdb.lib.datatype.OvsDBSet;
+import org.opendaylight.ovsdb.lib.datatype.UUID;
 
 public  class OVSDBTypesIDResolver implements TypeIdResolver {
 

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/json/UUIDStringConverter.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/json/UUIDStringConverter.java
similarity index 69%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/json/UUIDStringConverter.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/json/UUIDStringConverter.java
index 7790a7d67028c7e0cc51a05baad13ea6012d958d..70d7873fdaa300f800d12934f7ad82d273e0efb3 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/json/UUIDStringConverter.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/json/UUIDStringConverter.java
@@ -1,7 +1,8 @@
-package org.opendaylight.ovsdb.datatype.json;
+package org.opendaylight.ovsdb.lib.datatype.json;
 
 import com.fasterxml.jackson.databind.util.StdConverter;
-import org.opendaylight.ovsdb.datatype.UUID;
+
+import org.opendaylight.ovsdb.lib.datatype.UUID;
 
 public class UUIDStringConverter extends StdConverter<String, UUID> {
 

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/ExceptionHandler.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/ExceptionHandler.java
similarity index 91%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/ExceptionHandler.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/ExceptionHandler.java
index 4599fa5a45aa34b873e25a1c1b181929c0c362b4..8d7830256dd73827fef472314a275ceaa511200e 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/ExceptionHandler.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/ExceptionHandler.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.internal.jsonrpc;
+package org.opendaylight.ovsdb.lib.jsonrpc;
 
 import io.netty.channel.ChannelHandlerAdapter;
 import io.netty.channel.ChannelHandlerContext;

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/InvalidEncodingException.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/InvalidEncodingException.java
similarity index 85%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/InvalidEncodingException.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/InvalidEncodingException.java
index 35a3571d6169ab4dfb2a7c477a651e2394787226..8580f34297bb04e9aba766069b67cb83df68b16c 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/InvalidEncodingException.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/InvalidEncodingException.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.internal.jsonrpc;
+package org.opendaylight.ovsdb.lib.jsonrpc;
 
 public class InvalidEncodingException extends RuntimeException {
 

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpc10Request.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpc10Request.java
similarity index 95%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpc10Request.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpc10Request.java
index 93df4e02e2197af63f3d804dcff360229faeadcb..4c98a7c6b72daa098e4a6e543d34f3187fffcd64 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpc10Request.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpc10Request.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.internal.jsonrpc;
+package org.opendaylight.ovsdb.lib.jsonrpc;
 
 import com.google.common.collect.Lists;
 

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpc10Response.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpc10Response.java
similarity index 93%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpc10Response.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpc10Response.java
index e897197d0586b3a0f47a722e6d7f2e0a39fa229b..b13366dafd695d9552c53460b36af78470b73e0a 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpc10Response.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpc10Response.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.internal.jsonrpc;
+package org.opendaylight.ovsdb.lib.jsonrpc;
 
 import java.util.List;
 

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpcDecoder.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcDecoder.java
similarity index 99%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpcDecoder.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcDecoder.java
index 2430f02f061fa0082f07dff8dbf121a3969b3128..d76cd84308fb910f3aa6949e04e05bdb5b5eb49d 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpcDecoder.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcDecoder.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.internal.jsonrpc;
+package org.opendaylight.ovsdb.lib.jsonrpc;
 
 
 import com.fasterxml.jackson.core.JsonEncoding;

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpcEncoder.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcEncoder.java
similarity index 90%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpcEncoder.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcEncoder.java
index 9cfe09a20b4e35d607a1c85727c0a51874e95b3a..1b503cd88f8d373b33c43d76222309399442b37a 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpcEncoder.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcEncoder.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.internal.jsonrpc;
+package org.opendaylight.ovsdb.lib.jsonrpc;
 
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToMessageEncoder;

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpcEndpoint.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcEndpoint.java
similarity index 96%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpcEndpoint.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcEndpoint.java
index e2a1ee6f5037cb120379528fc7fc6fb4d0e83010..c3281b30ea5d54129741ccaa9ca78029b7b065d3 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpcEndpoint.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcEndpoint.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.internal.jsonrpc;
+package org.opendaylight.ovsdb.lib.jsonrpc;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -11,8 +11,8 @@ import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
 
 import org.opendaylight.controller.sal.core.Node;
-import org.opendaylight.ovsdb.internal.Connection;
-import org.opendaylight.ovsdb.internal.ConnectionService;
+import org.opendaylight.ovsdb.plugin.Connection;
+import org.opendaylight.ovsdb.plugin.ConnectionService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpcServiceBinderHandler.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcServiceBinderHandler.java
similarity index 93%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpcServiceBinderHandler.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcServiceBinderHandler.java
index 30b71ef128613cc80937d5a05375751b2bccf55c..de1454cd265919be7baee4351d630c917cea383c 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpcServiceBinderHandler.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcServiceBinderHandler.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.internal.jsonrpc;\r
+package org.opendaylight.ovsdb.lib.jsonrpc;\r
 \r
 import com.fasterxml.jackson.databind.JsonNode;\r
 import com.google.common.base.Strings;\r

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/Params.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/Params.java
similarity index 61%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/Params.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/Params.java
index ba93c7a0977ee514c666f1c558618c6551a9ebd9..89859bce390656fef7a1133dd47d245586a4fd57 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/Params.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/Params.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.internal.jsonrpc;
+package org.opendaylight.ovsdb.lib.jsonrpc;
 
 import java.util.List;
 

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/EchoResponse.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/EchoResponse.java
new file mode 100644 (file)
index 0000000..90cc98f
--- /dev/null
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/EchoResponse.java
@@ -0,0 +1,5 @@
+package org.opendaylight.ovsdb.lib.message;
+
+
+public class EchoResponse {
+}

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/message/MonitorRequest.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/MonitorRequest.java
similarity index 89%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/message/MonitorRequest.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/MonitorRequest.java
index b25e06e3df89dc841468fef87f18e5a553678e12..e1596a987474f0020be09ea08823053b1d4679b0 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/message/MonitorRequest.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/MonitorRequest.java
@@ -1,11 +1,11 @@
-package org.opendaylight.ovsdb.message;
+package org.opendaylight.ovsdb.lib.message;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.google.common.collect.Lists;
 
 import java.util.List;
 
-import org.opendaylight.ovsdb.table.internal.Column;
+import org.opendaylight.ovsdb.lib.table.internal.Column;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class MonitorRequest<E> {

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/message/MonitorRequestBuilder.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/MonitorRequestBuilder.java
similarity index 76%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/message/MonitorRequestBuilder.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/MonitorRequestBuilder.java
index c0ebe05f5625b180841826d2c2825fc00ea256da..e30e731b2f1c93c4d0fd20fe768cc1506d371b4f 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/message/MonitorRequestBuilder.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/MonitorRequestBuilder.java
@@ -1,11 +1,11 @@
-package org.opendaylight.ovsdb.message;
+package org.opendaylight.ovsdb.lib.message;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
-import org.opendaylight.ovsdb.internal.jsonrpc.Params;
-import org.opendaylight.ovsdb.table.Bridge;
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.jsonrpc.Params;
+import org.opendaylight.ovsdb.lib.table.Bridge;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
 
 import java.util.List;
 import java.util.Map;

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/message/MonitorSelect.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/MonitorSelect.java
similarity index 93%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/message/MonitorSelect.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/MonitorSelect.java
index 2601e306ba3df2ad96d7660b7eec6031fb2f574c..b1c0c98100562ef53a5d769d91673c3b06c3d68c 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/message/MonitorSelect.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/MonitorSelect.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.message;
+package org.opendaylight.ovsdb.lib.message;
 
 public class MonitorSelect {
 

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ovsdb/OVSDB.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/OVSDB.java
similarity index 69%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ovsdb/OVSDB.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/OVSDB.java
index 9a836080c837cd6d7c693c7a24cede4f89816098..2659ccebf73b54701ca22146985f535213e55623 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ovsdb/OVSDB.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/OVSDB.java
@@ -1,13 +1,10 @@
-package org.opendaylight.ovsdb.internal.ovsdb;
+package org.opendaylight.ovsdb.lib.message;
 
 import java.util.List;
 
 import com.google.common.util.concurrent.ListenableFuture;
 
-import org.opendaylight.ovsdb.database.DatabaseSchema;
-import org.opendaylight.ovsdb.message.EchoResponse;
-import org.opendaylight.ovsdb.message.MonitorRequestBuilder;
-import org.opendaylight.ovsdb.message.TableUpdates;
+import org.opendaylight.ovsdb.lib.database.DatabaseSchema;
 
 
 public interface OVSDB {

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/message/TableUpdate.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/TableUpdate.java
similarity index 94%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/message/TableUpdate.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/TableUpdate.java
index 8d8432b4aa4ca7445107e459f5704457f65b0851..1b89ba40aed09c715613f0ee3b5ab675d03d4048 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/message/TableUpdate.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/TableUpdate.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.message;
+package org.opendaylight.ovsdb.lib.message;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
@@ -10,7 +10,7 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
 
 
 public  class TableUpdate<T extends Table>  {

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/message/TableUpdates.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/TableUpdates.java
similarity index 96%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/message/TableUpdates.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/TableUpdates.java
index fc6a1233de23cd533d2a333d6e792df09dcc576e..f79826fdaeff760551947b5646d7e6b76f5e37b6 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/message/TableUpdates.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/TableUpdates.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.message;
+package org.opendaylight.ovsdb.lib.message;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.Maps;
@@ -6,8 +6,8 @@ import com.google.common.collect.Maps;
 import java.util.Map;
 import java.util.Set;
 
-import org.opendaylight.ovsdb.table.*;
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.table.*;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
 
 
 public  class TableUpdates {

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Bridge.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Bridge.java
similarity index 88%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/table/Bridge.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Bridge.java
index f8c4f09ac33b63767af939e704f11c0466dd8aea..f6da9eec537bd8182b7f42e1741a198ee54cb297 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Bridge.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Bridge.java
@@ -1,13 +1,13 @@
-package org.opendaylight.ovsdb.table;
+package org.opendaylight.ovsdb.lib.table;
 
-import org.opendaylight.ovsdb.datatype.OvsDBMap;
-import org.opendaylight.ovsdb.datatype.OvsDBSet;
-import org.opendaylight.ovsdb.datatype.UUID;
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBMap;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBSet;
+import org.opendaylight.ovsdb.lib.datatype.UUID;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
 
 public class Bridge extends Table<Bridge> {
     public static final Name<Bridge> NAME = new Name<Bridge>("Bridge"){};
-    public enum Column implements org.opendaylight.ovsdb.table.internal.Column<Bridge>{ controller, fail_mode, name, ports}
+    public enum Column implements org.opendaylight.ovsdb.lib.table.internal.Column<Bridge>{ controller, fail_mode, name, ports}
 
     private String name;
     private OvsDBSet<UUID> ports;

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Capability.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Capability.java
similarity index 79%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/table/Capability.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Capability.java
index 88c6d22f4c7dca4ac0ebcca19395e483b1fabb85..e7803e120cdd824a6875ca1a75fdccefdcca596d 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Capability.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Capability.java
@@ -1,7 +1,7 @@
-package org.opendaylight.ovsdb.table;
+package org.opendaylight.ovsdb.lib.table;
 
-import org.opendaylight.ovsdb.datatype.OvsDBMap;
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBMap;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
 
 public class Capability extends Table<Capability> {
 

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Controller.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Controller.java
similarity index 83%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/table/Controller.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Controller.java
index 94de6caa1ee3458ed15ca3e0a8f26e6e4de17983..278ffd306c83002d977e8f5ef9fd34b4b00fdc4b 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Controller.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Controller.java
@@ -1,6 +1,6 @@
-package org.opendaylight.ovsdb.table;
+package org.opendaylight.ovsdb.lib.table;
 
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
 
 public class Controller  extends Table<Controller> {
 

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Interface.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Interface.java
similarity index 92%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/table/Interface.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Interface.java
index 3a0ad28849c9ff44b56a73a9b6f022007b432075..8dbeeec20b6faf8757c30a983b1856aad86a1840 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Interface.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Interface.java
@@ -1,8 +1,8 @@
-package org.opendaylight.ovsdb.table;
+package org.opendaylight.ovsdb.lib.table;
 
-import org.opendaylight.ovsdb.datatype.OvsDBMap;
-import org.opendaylight.ovsdb.datatype.OvsDBSet;
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBMap;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBSet;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
 
 public class Interface extends Table<Interface> {
 

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Manager.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Manager.java
similarity index 83%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/table/Manager.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Manager.java
index edbf64844ce8db53c063330d8d69a7642c3e9c4e..478cfa36bba9c1ab062e06a5c8a76757241efb06 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Manager.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Manager.java
@@ -1,6 +1,6 @@
-package org.opendaylight.ovsdb.table;
+package org.opendaylight.ovsdb.lib.table;
 
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
 
 public class Manager  extends Table<Manager> {
 

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Mirror.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Mirror.java
similarity index 90%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/table/Mirror.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Mirror.java
index 2b80d607adb422e527c1a401026b4b868f4557da..7f17cad00edd20730d36c6dd58f0d5299257f3e1 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Mirror.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Mirror.java
@@ -1,9 +1,9 @@
-package org.opendaylight.ovsdb.table;
+package org.opendaylight.ovsdb.lib.table;
 
-import org.opendaylight.ovsdb.datatype.OvsDBMap;
-import org.opendaylight.ovsdb.datatype.OvsDBSet;
-import org.opendaylight.ovsdb.datatype.UUID;
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBMap;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBSet;
+import org.opendaylight.ovsdb.lib.datatype.UUID;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
 
 public class Mirror  extends Table<Mirror> {
 

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/NetFlow.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/NetFlow.java
similarity index 77%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/table/NetFlow.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/NetFlow.java
index 165ad395a445d7b90f2dc449f2e09a1ec378bb9e..359ec7cff193f286e724a1234d17e4728a9b081d 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/NetFlow.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/NetFlow.java
@@ -1,7 +1,7 @@
-package org.opendaylight.ovsdb.table;
+package org.opendaylight.ovsdb.lib.table;
 
-import org.opendaylight.ovsdb.datatype.OvsDBSet;
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBSet;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
 
 public class NetFlow  extends Table<NetFlow> {
 

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Open_vSwitch.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Open_vSwitch.java
similarity index 91%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/table/Open_vSwitch.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Open_vSwitch.java
index d6dd6533deba51991ee8a02884e672ef3e5a6e2f..ecfa80fca06de9666b331b80e69e7f6d4798b38a 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Open_vSwitch.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Open_vSwitch.java
@@ -1,9 +1,9 @@
-package org.opendaylight.ovsdb.table;
+package org.opendaylight.ovsdb.lib.table;
 
-import org.opendaylight.ovsdb.datatype.OvsDBMap;
-import org.opendaylight.ovsdb.datatype.OvsDBSet;
-import org.opendaylight.ovsdb.datatype.UUID;
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBMap;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBSet;
+import org.opendaylight.ovsdb.lib.datatype.UUID;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
 
 public class Open_vSwitch extends Table<Open_vSwitch> {
 
@@ -156,5 +156,5 @@ public class Open_vSwitch extends Table<Open_vSwitch> {
                 + external_ids + ", statistics=" + statistics + "]";
     }
 
-    public enum Column implements org.opendaylight.ovsdb.table.internal.Column<Open_vSwitch>{ controller, fail_mode, name, ports}
+    public enum Column implements org.opendaylight.ovsdb.lib.table.internal.Column<Open_vSwitch>{ controller, fail_mode, name, ports}
 }

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Port.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Port.java
similarity index 87%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/table/Port.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Port.java
index 53f605c5ad51a2cc0f14d83f681164bff02c8294..b109755bfc332f6a21b9331e3709af6675d84ed7 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Port.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Port.java
@@ -1,11 +1,11 @@
-package org.opendaylight.ovsdb.table;
+package org.opendaylight.ovsdb.lib.table;
 
 import java.math.BigInteger;
 
-import org.opendaylight.ovsdb.datatype.OvsDBMap;
-import org.opendaylight.ovsdb.datatype.OvsDBSet;
-import org.opendaylight.ovsdb.datatype.UUID;
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBMap;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBSet;
+import org.opendaylight.ovsdb.lib.datatype.UUID;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
 
 public class Port extends Table<Port> {
 
@@ -100,7 +100,7 @@ public class Port extends Table<Port> {
                 + external_ids + "]";
     }
 
-    public enum Column implements org.opendaylight.ovsdb.table.internal.Column<Port> {
+    public enum Column implements org.opendaylight.ovsdb.lib.table.internal.Column<Port> {
         interfaces,
         name,
         tag,

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Qos.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Qos.java
similarity index 80%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/table/Qos.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Qos.java
index c17389bbae15978d6d2644caa26761b3c21e867f..7973879eb7d55b8558561bea5988ae2728146089 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Qos.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Qos.java
@@ -1,11 +1,11 @@
-package org.opendaylight.ovsdb.table;
+package org.opendaylight.ovsdb.lib.table;
 
 import java.math.BigInteger;
 
-import org.opendaylight.ovsdb.datatype.OvsDBMap;
-import org.opendaylight.ovsdb.datatype.OvsDBSet;
-import org.opendaylight.ovsdb.datatype.UUID;
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBMap;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBSet;
+import org.opendaylight.ovsdb.lib.datatype.UUID;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
 
 public class Qos extends Table<Qos> {
 
@@ -62,7 +62,7 @@ public class Qos extends Table<Qos> {
                 + other_config + ", external_ids=" + external_ids + "]";
     }
 
-    public enum Column implements org.opendaylight.ovsdb.table.internal.Column<Qos> {
+    public enum Column implements org.opendaylight.ovsdb.lib.table.internal.Column<Qos> {
         queues,
         type,
         other_config,

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Queue.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Queue.java
similarity index 77%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/table/Queue.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Queue.java
index 1cba94d1fac9e201551aa64deaeec38951cdcacc..657e11282f3d66f8293058113fa98947e31de545 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Queue.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Queue.java
@@ -1,11 +1,11 @@
-package org.opendaylight.ovsdb.table;
+package org.opendaylight.ovsdb.lib.table;
 
 import java.math.BigInteger;
 
-import org.opendaylight.ovsdb.datatype.OvsDBMap;
-import org.opendaylight.ovsdb.datatype.OvsDBSet;
-import org.opendaylight.ovsdb.datatype.UUID;
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBMap;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBSet;
+import org.opendaylight.ovsdb.lib.datatype.UUID;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
 
 public class Queue extends Table<Queue> {
 
@@ -53,7 +53,7 @@ public class Queue extends Table<Queue> {
                 + ", external_ids=" + external_ids + "]";
     }
 
-    public enum Column implements org.opendaylight.ovsdb.table.internal.Column<Queue> {
+    public enum Column implements org.opendaylight.ovsdb.lib.table.internal.Column<Queue> {
         dscp,
         other_config,
         external_ids}

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/SFlow.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/SFlow.java
similarity index 89%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/table/SFlow.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/SFlow.java
index 9d96bfeed1ed5ccb9f9c850654dce2e4f8018b46..0242b08e7f8b132af39d8546e2f93d9c4213da64 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/SFlow.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/SFlow.java
@@ -1,8 +1,8 @@
-package org.opendaylight.ovsdb.table;
+package org.opendaylight.ovsdb.lib.table;
 
-import org.opendaylight.ovsdb.datatype.OvsDBMap;
-import org.opendaylight.ovsdb.datatype.OvsDBSet;
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBMap;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBSet;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
 
 public class SFlow  extends Table<SFlow> {
 

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/SSL.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/SSL.java
similarity index 82%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/table/SSL.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/SSL.java
index 584374142568ff64596873e97e414302a7509c5d..e764a0771108b4e8915968d0b11c9630d26ddd34 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/SSL.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/SSL.java
@@ -1,9 +1,9 @@
-package org.opendaylight.ovsdb.table;
+package org.opendaylight.ovsdb.lib.table;
 
-import org.opendaylight.ovsdb.datatype.OvsDBMap;
-import org.opendaylight.ovsdb.datatype.OvsDBSet;
-import org.opendaylight.ovsdb.table.internal.Table;
-import org.opendaylight.ovsdb.table.internal.Table.Name;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBMap;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBSet;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
+import org.opendaylight.ovsdb.lib.table.internal.Table.Name;
 
 public class SSL  extends Table<SSL> {
 
@@ -58,7 +58,7 @@ public class SSL  extends Table<SSL> {
                 + external_ids + "]";
     }
 
-    public enum Column implements org.opendaylight.ovsdb.table.internal.Column<SSL> {
+    public enum Column implements org.opendaylight.ovsdb.lib.table.internal.Column<SSL> {
         ca_cert,
         bootstrap_ca_cert,
         certificate,

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/internal/Column.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/internal/Column.java
new file mode 100644 (file)
index 0000000..21927c6
--- /dev/null
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/internal/Column.java
@@ -0,0 +1,5 @@
+package org.opendaylight.ovsdb.lib.table.internal;
+
+
+public interface Column<E> {
+}

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/internal/Table.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/internal/Table.java
similarity index 90%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/table/internal/Table.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/internal/Table.java
index ee8deb618ce1e17bd1c70901042e7097301d4e71..456aa24fe9acea6899fdf34454fbe9e3d7d2e7ac 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/internal/Table.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/internal/Table.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.table.internal;
+package org.opendaylight.ovsdb.lib.table.internal;
 
 public abstract class Table<E extends Table> {
 

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/internal/Tables.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/internal/Tables.java
similarity index 87%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/table/internal/Tables.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/internal/Tables.java
index 63a5ed2aacdf71ecb30650640fb21f553c0c4bae..4244d36c38f72f76193904a4f220f856cb93f7be 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/internal/Tables.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/internal/Tables.java
@@ -1,8 +1,9 @@
-package org.opendaylight.ovsdb.table.internal;
+package org.opendaylight.ovsdb.lib.table.internal;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.opendaylight.ovsdb.table.*;
+
+import org.opendaylight.ovsdb.lib.table.*;
 
 public class Tables {
     public static List<Table> tables = new ArrayList<Table>();

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/message/EchoResponse.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/message/EchoResponse.java
deleted file mode 100644 (file)
index 2af74c4..0000000
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/message/EchoResponse.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.opendaylight.ovsdb.message;
-
-
-public class EchoResponse {
-}

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/Activator.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/Activator.java
similarity index 99%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/Activator.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/Activator.java
index b5a1af4cc3ccc02488516f5006c9faf8212e0ae3..0826a00378761fdf5bb817edcaa8fd6f48543098 100755 (executable)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/Activator.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/Activator.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.internal;
+package org.opendaylight.ovsdb.plugin;
 
 import java.util.Dictionary;
 import java.util.Hashtable;

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConfigurationService.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java
similarity index 99%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConfigurationService.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java
index 27c570f801ae1741752b1b991c03763d13fe13f2..7f081769ab909e4f19200c8893ee58996e9cb898 100755 (executable)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConfigurationService.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.internal;
+package org.opendaylight.ovsdb.plugin;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -6,9 +6,9 @@ import java.util.*;
 
 import org.eclipse.osgi.framework.console.CommandInterpreter;
 import org.eclipse.osgi.framework.console.CommandProvider;
-import org.opendaylight.ovsdb.database.OVSBridge;
-import org.opendaylight.ovsdb.database.OVSInstance;
-import org.opendaylight.ovsdb.database.OvsdbType;
+import org.opendaylight.ovsdb.lib.database.OVSBridge;
+import org.opendaylight.ovsdb.lib.database.OVSInstance;
+import org.opendaylight.ovsdb.lib.database.OvsdbType;
 import org.opendaylight.controller.sal.connection.ConnectionConstants;
 import org.opendaylight.controller.sal.core.Node;
 import org.opendaylight.controller.sal.core.NodeConnector;

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/Connection.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/Connection.java
similarity index 98%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/Connection.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/Connection.java
index d901598c21bdd21461a9075eb79e6884c075d0b1..2f94cce667181f3f53e29b7c662e239062748b29 100755 (executable)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/Connection.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/Connection.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.internal;
+package org.opendaylight.ovsdb.plugin;
 
 import io.netty.channel.Channel;
 import org.opendaylight.controller.sal.core.Node;

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConnectionService.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/ConnectionService.java
similarity index 96%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConnectionService.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/ConnectionService.java
index 479ba5c2bc69dbd53b548cbb4705e4ec7ddf1644..14189d20f48f32c5ceb9d0054838883c85bef76d 100755 (executable)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConnectionService.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/ConnectionService.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.internal;
+package org.opendaylight.ovsdb.plugin;
 
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.*;
@@ -15,9 +15,9 @@ import org.opendaylight.controller.sal.connection.IPluginInConnectionService;
 import org.opendaylight.controller.sal.core.Node;
 import org.opendaylight.controller.sal.utils.Status;
 import org.opendaylight.controller.sal.utils.StatusCode;
-import org.opendaylight.ovsdb.internal.jsonrpc.JsonRpcDecoder;
-import org.opendaylight.ovsdb.internal.jsonrpc.JsonRpcEndpoint;
-import org.opendaylight.ovsdb.internal.jsonrpc.JsonRpcServiceBinderHandler;
+import org.opendaylight.ovsdb.lib.jsonrpc.JsonRpcDecoder;
+import org.opendaylight.ovsdb.lib.jsonrpc.JsonRpcEndpoint;
+import org.opendaylight.ovsdb.lib.jsonrpc.JsonRpcServiceBinderHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/Encapsulation.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/Encapsulation.java
similarity index 89%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/Encapsulation.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/Encapsulation.java
index 72b7a711a84b2f02d7527f5c004247aa93675506..34e21c5034d08b7ecf10b0d74452cd485b0f55f7 100755 (executable)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/Encapsulation.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/Encapsulation.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.internal;
+package org.opendaylight.ovsdb.plugin;
 
 public enum Encapsulation {
 

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/IConnectionServiceInternal.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/IConnectionServiceInternal.java
similarity index 88%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/IConnectionServiceInternal.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/IConnectionServiceInternal.java
index 612df88291e3b931b57ebc0f7a43d96c061e3455..9d84100f30decb5f7c695a27172bc8abb01f7791 100755 (executable)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/IConnectionServiceInternal.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/IConnectionServiceInternal.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.internal;
+package org.opendaylight.ovsdb.plugin;
 
 import java.util.Map;
 

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/InsertRequest.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/InsertRequest.java
similarity index 80%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/InsertRequest.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/InsertRequest.java
index 97a4edd5e0bb0530024c7014d23d2743b5aff566..dfc0a6676d129025df266576a34364ef67c564fc 100755 (executable)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/InsertRequest.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/InsertRequest.java
@@ -1,11 +1,11 @@
-package org.opendaylight.ovsdb.internal;\r
+package org.opendaylight.ovsdb.plugin;\r
 \r
 import java.util.ArrayList;\r
 import java.util.Map;\r
 \r
 import com.fasterxml.jackson.annotation.JsonProperty;\r
 \r
-import org.opendaylight.ovsdb.database.OvsdbType;\r
+import org.opendaylight.ovsdb.lib.database.OvsdbType;\r
 \r
 public class InsertRequest {\r
     public String op;\r

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/InventoryService.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/InventoryService.java
similarity index 98%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/InventoryService.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/InventoryService.java
index ffd615d3cfd5aaa03508452cf992fc6c2029bfd6..4302bf29f7c47ff3e30656b0099297ad61a54c40 100755 (executable)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/InventoryService.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/InventoryService.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.internal;
+package org.opendaylight.ovsdb.plugin;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/InventoryServiceInternal.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/InventoryServiceInternal.java
similarity index 53%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/InventoryServiceInternal.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/InventoryServiceInternal.java
index a74df7212954bda2642c4521e187484311315393..703583fa70af8715933a040f57bced2e1610c46e 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/InventoryServiceInternal.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/InventoryServiceInternal.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.internal;
+package org.opendaylight.ovsdb.plugin;
 
 public interface InventoryServiceInternal {
 

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/JSONMsg.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/JSONMsg.java
similarity index 74%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/JSONMsg.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/JSONMsg.java
index e7e01da582338baf769a215dd408b5a8e46f0f7b..d641726cea1bbc4dca4a463c89794eb25e06d518 100755 (executable)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/JSONMsg.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/JSONMsg.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.internal;\r
+package org.opendaylight.ovsdb.plugin;\r
 \r
 import java.lang.String;\r
 \r

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/MessageHandler.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/MessageHandler.java
similarity index 92%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/MessageHandler.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/MessageHandler.java
index 417d9ae47189ac1404afae4761cc7e27bc0f0984..a17b7b9b3e6a218db443d7d1d4582bb52ffbda8d 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/MessageHandler.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/MessageHandler.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.internal;\r
+package org.opendaylight.ovsdb.plugin;\r
 \r
 import com.fasterxml.jackson.databind.JsonNode;\r
 import com.fasterxml.jackson.databind.ObjectMapper;\r
@@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import io.netty.channel.ChannelHandlerContext;\r
 import io.netty.channel.ChannelInboundHandlerAdapter;\r
 \r
-import org.opendaylight.ovsdb.message.EchoResponse;\r
+import org.opendaylight.ovsdb.lib.message.EchoResponse;\r
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r
 \r

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/MessageHandlerFuture.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/MessageHandlerFuture.java
similarity index 95%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/MessageHandlerFuture.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/MessageHandlerFuture.java
index bae2054ea848956fc60ee97d8ba044c1f5196c01..2e5c6c754503bb0abde20e317d42f39ae3ed5130 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/MessageHandlerFuture.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/MessageHandlerFuture.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.internal;\r
+package org.opendaylight.ovsdb.plugin;\r
 \r
 import org.opendaylight.controller.sal.utils.Status;\r
 import org.opendaylight.controller.sal.utils.StatusCode;\r

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/MessageMapper.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/MessageMapper.java
similarity index 92%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/MessageMapper.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/MessageMapper.java
index 175874fecda2707aba6a0218d4e2297319a4e834..0f4d5a8de85c00ec1ce66099b1aa208d7af46fd4 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/MessageMapper.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/MessageMapper.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.internal;\r
+package org.opendaylight.ovsdb.plugin;\r
 \r
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/MutateRequest.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/MutateRequest.java
similarity index 87%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/MutateRequest.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/MutateRequest.java
index 342d25b8d85dcdb0a7820fb571c0e30a0455b8eb..793a10231cdbda93dbe8397bf6e40a6e33d03ce9 100755 (executable)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/MutateRequest.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/MutateRequest.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.internal;\r
+package org.opendaylight.ovsdb.plugin;\r
 \r
 import java.util.ArrayList;\r
 import java.util.List;\r

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/NodeConnectorFactory.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/NodeConnectorFactory.java
similarity index 97%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/NodeConnectorFactory.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/NodeConnectorFactory.java
index 3d1dc84d050317abbb548ae3aac3e2578963b7fe..5081f8a3f043b910ee69ae77e95ed73c9124f57a 100755 (executable)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/NodeConnectorFactory.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/NodeConnectorFactory.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.internal;
+package org.opendaylight.ovsdb.plugin;
 
 import org.opendaylight.controller.sal.core.NodeConnector;
 import org.opendaylight.controller.sal.utils.INodeConnectorFactory;

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/NodeFactory.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/NodeFactory.java
similarity index 96%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/NodeFactory.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/NodeFactory.java
index f6312e64aedaf5316ad19ff0160967ad09e789af..b34dc17df1cffb6e4228214fdb25aacd4a739779 100755 (executable)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/NodeFactory.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/NodeFactory.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.internal;
+package org.opendaylight.ovsdb.plugin;
 
 import org.opendaylight.controller.sal.core.ConstructionException;
 import org.opendaylight.controller.sal.utils.INodeFactory;

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/OvsdbMessage.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/OvsdbMessage.java
similarity index 85%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/OvsdbMessage.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/OvsdbMessage.java
index 88b2b0c360767f3ed7660526d1bde91e905beb5c..84d5be2867442e94f0901580beee2e6ca77fcd96 100755 (executable)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/OvsdbMessage.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/OvsdbMessage.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.internal;\r
+package org.opendaylight.ovsdb.plugin;\r
 \r
 import java.util.Random;\r
 \r

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ReadService.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/ReadService.java
similarity index 99%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ReadService.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/ReadService.java
index f91738bc2e8b9a62a1db6127a55ab18d38c39cb0..6df5bdc6580817ce37d9cd3d9813314ca0a06c33 100755 (executable)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ReadService.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/ReadService.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.internal;
+package org.opendaylight.ovsdb.plugin;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/UpdateRequest.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/UpdateRequest.java
similarity index 87%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/UpdateRequest.java
rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/UpdateRequest.java
index 8763825405112233833d95b9b3f9f821a5dd9334..a2bef9bcad0a97876cf5dc13f528305c268e3d37 100755 (executable)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/UpdateRequest.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/UpdateRequest.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.internal;\r
+package org.opendaylight.ovsdb.plugin;\r
 \r
 \r
 import java.util.ArrayList;\r

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/internal/Column.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/table/internal/Column.java
deleted file mode 100644 (file)
index 5321432..0000000
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/internal/Column.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.opendaylight.ovsdb.table.internal;
-
-
-public interface Column<E> {
-}

diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/internal/json/test.json b/ovsdb/src/test/java/org/opendaylight/ovsdb/internal/json/test.json
deleted file mode 100644 (file)
index 8763868..0000000
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/internal/json/test.json
+++ /dev/null
@@ -1,49 +0,0 @@
-[
-    "Open_vSwitch",
-    null,
-    {
-        "Bridge": {
-            "columns": [
-                "controller",
-                "fail_mode",
-                "name",
-                "ports"
-            ]
-        },
-        "Controller": {
-            "columns": [
-                "is_connected",
-                "target"
-            ]
-        },
-        "Interface": {
-            "columns": [
-                "name",
-                "options",
-                "type"
-            ]
-        },
-        "Manager": {
-            "columns": [
-                "is_connected",
-                "target"
-            ]
-        },
-        "Open_vSwitch": {
-            "columns": [
-                "bridges",
-                "cur_cfg",
-                "manager_options",
-                "ovs_version"
-            ]
-        },
-        "Port": {
-            "columns": [
-                "interfaces",
-                "name",
-                "tag",
-                "trunks"
-            ]
-        }
-    }
-]
\ No newline at end of file

diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/internal/jsonrpc/NettyBootStrapper.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/NettyBootStrapper.java
similarity index 97%
rename from ovsdb/src/test/java/org/opendaylight/ovsdb/internal/jsonrpc/NettyBootStrapper.java
rename to ovsdb/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/NettyBootStrapper.java
index 6f302761612e8b86b5f1268da39ca64fcde41a6f..c6ecb72f8a71a89fabbbaa823f2ce38cb1e1d8d2 100644 (file)
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/internal/jsonrpc/NettyBootStrapper.java
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/NettyBootStrapper.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.internal.jsonrpc;
+package org.opendaylight.ovsdb.lib.jsonrpc;
 
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.*;

diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/internal/jsonrpc/TestClient.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/TestClient.java
similarity index 96%
rename from ovsdb/src/test/java/org/opendaylight/ovsdb/internal/jsonrpc/TestClient.java
rename to ovsdb/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/TestClient.java
index c08699c4f305b4a18880e7e7f93ff4932479ee40..0039859622880b2a889cb19c7c469e8ba69c5546 100644 (file)
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/internal/jsonrpc/TestClient.java
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/TestClient.java
@@ -1,12 +1,14 @@
-package org.opendaylight.ovsdb.internal.jsonrpc;
+package org.opendaylight.ovsdb.lib.jsonrpc;
 
 import io.netty.handler.logging.LogLevel;
 import io.netty.handler.logging.LoggingHandler;
 import junit.framework.TestCase;
+
 import org.codehaus.jackson.map.ObjectMapper;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.opendaylight.ovsdb.lib.jsonrpc.JsonRpcDecoder;
 
 import java.io.*;
 import java.net.Socket;

diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/internal/jsonrpc/TestTokens.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/TestTokens.java
similarity index 95%
rename from ovsdb/src/test/java/org/opendaylight/ovsdb/internal/jsonrpc/TestTokens.java
rename to ovsdb/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/TestTokens.java
index 679befdf716bba4765ed81d110126d6f603d1016..44d48fd0f5c6deb84d5aee44aafa0822d766bc1e 100644 (file)
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/internal/jsonrpc/TestTokens.java
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/TestTokens.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.internal.jsonrpc;
+package org.opendaylight.ovsdb.lib.jsonrpc;
 
 import com.google.common.reflect.Invokable;
 import com.google.common.reflect.TypeToken;

diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/message/MonitorResponseTest.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/message/MonitorResponseTest.java
similarity index 89%
rename from ovsdb/src/test/java/org/opendaylight/ovsdb/message/MonitorResponseTest.java
rename to ovsdb/src/test/java/org/opendaylight/ovsdb/lib/message/MonitorResponseTest.java
index 8632809ab8c19194ce8d8e2d05e1acf74d74f9a3..900a84da984c281a16e1aca6d1daa191b73a24b6 100644 (file)
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/message/MonitorResponseTest.java
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/message/MonitorResponseTest.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.message;
+package org.opendaylight.ovsdb.lib.message;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
@@ -10,13 +10,15 @@ import com.google.common.io.Resources;
 
 import junit.framework.TestCase;
 
-import org.opendaylight.ovsdb.datatype.OvsDBMap;
-import org.opendaylight.ovsdb.datatype.OvsDBSet;
-import org.opendaylight.ovsdb.datatype.UUID;
-import org.opendaylight.ovsdb.table.Bridge;
-import org.opendaylight.ovsdb.table.Interface;
-import org.opendaylight.ovsdb.table.Port;
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBMap;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBSet;
+import org.opendaylight.ovsdb.lib.datatype.UUID;
+import org.opendaylight.ovsdb.lib.message.TableUpdate;
+import org.opendaylight.ovsdb.lib.message.TableUpdates;
+import org.opendaylight.ovsdb.lib.table.Bridge;
+import org.opendaylight.ovsdb.lib.table.Interface;
+import org.opendaylight.ovsdb.lib.table.Port;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
 import org.sonatype.inject.Nullable;
 
 import java.io.IOException;
@@ -88,7 +90,7 @@ public class MonitorResponseTest extends TestCase {
         assertEquals(2, rows.size());
         List<TableUpdate.Row<Port>> sorted = Ordering.natural().onResultOf(new Function<TableUpdate.Row<Port>, String>() {
             @Override
-            public String apply(@Nullable org.opendaylight.ovsdb.message.TableUpdate.Row<Port> input) {
+            public String apply(@Nullable org.opendaylight.ovsdb.lib.message.TableUpdate.Row<Port> input) {
                 return input.getId();
             }
         }).sortedCopy(rows);

diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/internal/jsonrpc/OVSDBNettyFactoryTest.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/message/OVSDBNettyFactoryTest.java
similarity index 82%
rename from ovsdb/src/test/java/org/opendaylight/ovsdb/internal/jsonrpc/OVSDBNettyFactoryTest.java
rename to ovsdb/src/test/java/org/opendaylight/ovsdb/lib/message/OVSDBNettyFactoryTest.java
index f49df9cbc217d6878b78af418692d2347a97b73d..31a8610d6cec82f7ea4caa3453cbf9b2cf5e1727 100644 (file)
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/internal/jsonrpc/OVSDBNettyFactoryTest.java
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/message/OVSDBNettyFactoryTest.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.internal.jsonrpc;
+package org.opendaylight.ovsdb.lib.message;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
@@ -17,16 +17,18 @@ import junit.framework.TestCase;
 import org.junit.Test;
 import org.opendaylight.controller.sal.connection.ConnectionConstants;
 import org.opendaylight.controller.sal.core.Node;
-import org.opendaylight.ovsdb.database.DatabaseSchema;
-import org.opendaylight.ovsdb.internal.ConnectionService;
-import org.opendaylight.ovsdb.internal.MessageHandler;
-import org.opendaylight.ovsdb.internal.jsonrpc.JsonRpcEndpoint;
-import org.opendaylight.ovsdb.internal.ovsdb.OVSDB;
-import org.opendaylight.ovsdb.message.EchoResponse;
-import org.opendaylight.ovsdb.message.MonitorRequestBuilder;
-import org.opendaylight.ovsdb.message.TableUpdates;
-import org.opendaylight.ovsdb.table.internal.Table;
-import org.opendaylight.ovsdb.table.internal.Tables;
+import org.opendaylight.ovsdb.lib.database.DatabaseSchema;
+import org.opendaylight.ovsdb.lib.jsonrpc.JsonRpcDecoder;
+import org.opendaylight.ovsdb.lib.jsonrpc.JsonRpcEndpoint;
+import org.opendaylight.ovsdb.lib.jsonrpc.JsonRpcServiceBinderHandler;
+import org.opendaylight.ovsdb.lib.message.EchoResponse;
+import org.opendaylight.ovsdb.lib.message.MonitorRequestBuilder;
+import org.opendaylight.ovsdb.lib.message.OVSDB;
+import org.opendaylight.ovsdb.lib.message.TableUpdates;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
+import org.opendaylight.ovsdb.lib.table.internal.Tables;
+import org.opendaylight.ovsdb.plugin.ConnectionService;
+import org.opendaylight.ovsdb.plugin.MessageHandler;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -43,7 +45,6 @@ public class OVSDBNettyFactoryTest {
     @Test
     public void testSome() throws InterruptedException, ExecutionException {
 
-        //todo(ashwin): this is a big mess without a bean factory like spring or guice
         ConnectionService service = new ConnectionService();
         ObjectMapper objectMapper = new ObjectMapper();
         objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);

diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/OVSDBTestGetBridgeDomains.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OVSDBTestGetBridgeDomains.java
similarity index 91%
rename from ovsdb/src/test/java/org/opendaylight/ovsdb/OVSDBTestGetBridgeDomains.java
rename to ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OVSDBTestGetBridgeDomains.java
index 65bb20c2baa0335bbfb9a5d650add3d1905900ac..3eba9d7d2393d67106d0ee7804ebfe732045d2b8 100644 (file)
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/OVSDBTestGetBridgeDomains.java
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OVSDBTestGetBridgeDomains.java
@@ -1,11 +1,11 @@
-package org.opendaylight.ovsdb;
+package org.opendaylight.ovsdb.plugin;
 
 import org.junit.Test;
 import org.opendaylight.controller.sal.connection.ConnectionConstants;
 import org.opendaylight.controller.sal.core.Node;
 import org.opendaylight.controller.sal.core.NodeConnector;
-import org.opendaylight.ovsdb.internal.ConfigurationService;
-import org.opendaylight.ovsdb.internal.ConnectionService;
+import org.opendaylight.ovsdb.plugin.ConfigurationService;
+import org.opendaylight.ovsdb.plugin.ConnectionService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddBridge.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddBridge.java
similarity index 89%
rename from ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddBridge.java
rename to ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddBridge.java
index b603779a3fc16a205a5337236f5dbf8e8f9866ed..21f0991413d75edf2d19658a7350635c3efc5de0 100755 (executable)
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddBridge.java
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddBridge.java
@@ -1,13 +1,14 @@
-package org.opendaylight.ovsdb;\r
+package org.opendaylight.ovsdb.plugin;\r
 \r
 import org.junit.Test;\r
 import org.opendaylight.controller.sal.core.Node;\r
 import org.opendaylight.controller.sal.core.NodeConnector;\r
-import org.opendaylight.ovsdb.internal.ConfigurationService;\r
-import org.opendaylight.ovsdb.internal.ConnectionService;\r
+import org.opendaylight.ovsdb.plugin.ConfigurationService;\r
+import org.opendaylight.ovsdb.plugin.ConnectionService;\r
 import org.opendaylight.controller.sal.connection.ConnectionConstants;\r
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r
+\r
 import java.util.HashMap;\r
 import java.util.Map;\r
 \r

diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddPort.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddPort.java
similarity index 91%
rename from ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddPort.java
rename to ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddPort.java
index b221c046507812560e12c2c850dcf3b461e221cf..f092535f0eafe160965cfbfa551a0d8ba56ac2ab 100755 (executable)
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddPort.java
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddPort.java
@@ -1,13 +1,14 @@
-package org.opendaylight.ovsdb;
+package org.opendaylight.ovsdb.plugin;
 
 import org.junit.Test;
 import org.opendaylight.controller.sal.core.Node;
 import org.opendaylight.controller.sal.core.NodeConnector;
-import org.opendaylight.ovsdb.internal.ConfigurationService;
-import org.opendaylight.ovsdb.internal.ConnectionService;
+import org.opendaylight.ovsdb.plugin.ConfigurationService;
+import org.opendaylight.ovsdb.plugin.ConnectionService;
 import org.opendaylight.controller.sal.connection.ConnectionConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import java.util.HashMap;
 import java.util.Map;
 

diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddTunnel.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddTunnel.java
similarity index 95%
rename from ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddTunnel.java
rename to ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddTunnel.java
index 16ac26ba65dc263a0a21a7a82dd485fac5453edb..ed3bdc67fa53a378e87dfc7c68764fd7548a50ec 100755 (executable)
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddTunnel.java
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddTunnel.java
@@ -1,17 +1,17 @@
-package org.opendaylight.ovsdb;
+package org.opendaylight.ovsdb.plugin;
 
 
 import java.util.HashMap;
 import java.util.Map;
+
 import org.junit.Test;
 import org.opendaylight.controller.sal.core.Node;
 import org.opendaylight.controller.sal.core.NodeConnector;
-import org.opendaylight.ovsdb.internal.*;
 import org.opendaylight.controller.sal.connection.ConnectionConstants;
 import org.opendaylight.controller.sal.networkconfig.bridgedomain.ConfigConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.opendaylight.ovsdb.internal.Encapsulation;
+import org.opendaylight.ovsdb.plugin.*;
 
 public class OvsdbTestAddTunnel {
     private static final Logger logger = LoggerFactory

diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddVlan.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddVlan.java
similarity index 93%
rename from ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddVlan.java
rename to ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddVlan.java
index b8f0b4f618532a25e0e8b55070700836f3ab23c5..cdd3ca4a278f217991b1de51609ec3059714a203 100755 (executable)
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddVlan.java
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddVlan.java
@@ -1,14 +1,15 @@
-package org.opendaylight.ovsdb;
+package org.opendaylight.ovsdb.plugin;
 
 import org.junit.Test;
 import org.opendaylight.controller.sal.core.Node;
 import org.opendaylight.controller.sal.core.NodeConnector;
-import org.opendaylight.ovsdb.internal.ConfigurationService;
-import org.opendaylight.ovsdb.internal.ConnectionService;
+import org.opendaylight.ovsdb.plugin.ConfigurationService;
+import org.opendaylight.ovsdb.plugin.ConnectionService;
 import org.opendaylight.controller.sal.connection.ConnectionConstants;
 import org.opendaylight.controller.sal.networkconfig.bridgedomain.ConfigConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import java.util.HashMap;
 import java.util.Map;
 

diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestSetManager.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestSetManager.java
similarity index 88%
rename from ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestSetManager.java
rename to ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestSetManager.java
index 6486827b107cc018afda7477f391576eb41b6c0b..f3421666bc27488f6c4aeb2ccc6221a100ef7b96 100755 (executable)
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestSetManager.java
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestSetManager.java
@@ -1,10 +1,10 @@
-package org.opendaylight.ovsdb;\r
+package org.opendaylight.ovsdb.plugin;\r
 \r
 import org.junit.Test;\r
 import org.opendaylight.controller.sal.core.Node;\r
 import org.opendaylight.controller.sal.core.NodeConnector;\r
-import org.opendaylight.ovsdb.internal.ConfigurationService;\r
-import org.opendaylight.ovsdb.internal.ConnectionService;\r
+import org.opendaylight.ovsdb.plugin.ConfigurationService;\r
+import org.opendaylight.ovsdb.plugin.ConnectionService;\r
 import org.opendaylight.controller.sal.connection.ConnectionConstants;\r
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r