diff options
author | Marek Gradzki <mgradzki@cisco.com> | 2016-09-28 10:12:04 +0200 |
---|---|---|
committer | Damjan Marion <dmarion.lists@gmail.com> | 2016-09-29 08:54:43 +0000 |
commit | e85581cd07cf70d19870d8f858420f252ced3405 (patch) | |
tree | 58c4e2fcaa02c7f324e684687e328b76f2e8bbe1 /vpp-api/java/jvpp-registry | |
parent | 85ecc810ca98550a250c74f32244760e459e3f87 (diff) |
VPP-378: rename jvpp package to the same as groupId of deployed jars
Related changes:
- NSH: https://gerrit.fd.io/r/#/c/3181/
- Honeycomb: https://gerrit.fd.io/r/#/c/3182
Change-Id: Ifdd6b8b575916fdf99794618dbe604c2e17e8e82
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'vpp-api/java/jvpp-registry')
-rw-r--r-- | vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVpp.java (renamed from vpp-api/java/jvpp-registry/org/openvpp/jvpp/JVpp.java) | 8 | ||||
-rw-r--r-- | vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistry.java (renamed from vpp-api/java/jvpp-registry/org/openvpp/jvpp/JVppRegistry.java) | 4 | ||||
-rw-r--r-- | vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistryImpl.java (renamed from vpp-api/java/jvpp-registry/org/openvpp/jvpp/JVppRegistryImpl.java) | 8 | ||||
-rw-r--r-- | vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/NativeLibraryLoader.java (renamed from vpp-api/java/jvpp-registry/org/openvpp/jvpp/NativeLibraryLoader.java) | 2 | ||||
-rw-r--r-- | vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppBaseCallException.java (renamed from vpp-api/java/jvpp-registry/org/openvpp/jvpp/VppBaseCallException.java) | 2 | ||||
-rw-r--r-- | vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppCallbackException.java (renamed from vpp-api/java/jvpp-registry/org/openvpp/jvpp/VppCallbackException.java) | 2 | ||||
-rw-r--r-- | vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppConnection.java (renamed from vpp-api/java/jvpp-registry/org/openvpp/jvpp/VppConnection.java) | 2 | ||||
-rw-r--r-- | vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppInvocationException.java (renamed from vpp-api/java/jvpp-registry/org/openvpp/jvpp/VppInvocationException.java) | 2 | ||||
-rw-r--r-- | vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppJNIConnection.java (renamed from vpp-api/java/jvpp-registry/org/openvpp/jvpp/VppJNIConnection.java) | 4 | ||||
-rw-r--r-- | vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/ControlPingCallback.java (renamed from vpp-api/java/jvpp-registry/org/openvpp/jvpp/callback/ControlPingCallback.java) | 4 | ||||
-rw-r--r-- | vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppCallback.java (renamed from vpp-api/java/jvpp-registry/org/openvpp/jvpp/callback/JVppCallback.java) | 4 | ||||
-rw-r--r-- | vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppNotificationCallback.java (renamed from vpp-api/java/jvpp-registry/org/openvpp/jvpp/callback/JVppNotificationCallback.java) | 2 | ||||
-rw-r--r-- | vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPing.java (renamed from vpp-api/java/jvpp-registry/org/openvpp/jvpp/dto/ControlPing.java) | 6 | ||||
-rw-r--r-- | vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPingReply.java (renamed from vpp-api/java/jvpp-registry/org/openvpp/jvpp/dto/ControlPingReply.java) | 2 | ||||
-rw-r--r-- | vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppDump.java (renamed from vpp-api/java/jvpp-registry/org/openvpp/jvpp/dto/JVppDump.java) | 2 | ||||
-rw-r--r-- | vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppNotification.java (renamed from vpp-api/java/jvpp-registry/org/openvpp/jvpp/dto/JVppNotification.java) | 2 | ||||
-rw-r--r-- | vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReply.java (renamed from vpp-api/java/jvpp-registry/org/openvpp/jvpp/dto/JVppReply.java) | 2 | ||||
-rw-r--r-- | vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReplyDump.java (renamed from vpp-api/java/jvpp-registry/org/openvpp/jvpp/dto/JVppReplyDump.java) | 2 | ||||
-rw-r--r-- | vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppRequest.java (renamed from vpp-api/java/jvpp-registry/org/openvpp/jvpp/dto/JVppRequest.java) | 6 | ||||
-rw-r--r-- | vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/future/AbstractFutureJVppInvoker.java (renamed from vpp-api/java/jvpp-registry/org/openvpp/jvpp/future/AbstractFutureJVppInvoker.java) | 16 | ||||
-rw-r--r-- | vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/future/FutureJVppInvoker.java (renamed from vpp-api/java/jvpp-registry/org/openvpp/jvpp/future/FutureJVppInvoker.java) | 14 | ||||
-rw-r--r-- | vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/notification/NotificationRegistry.java (renamed from vpp-api/java/jvpp-registry/org/openvpp/jvpp/notification/NotificationRegistry.java) | 2 | ||||
-rw-r--r-- | vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/notification/NotificationRegistryProvider.java (renamed from vpp-api/java/jvpp-registry/org/openvpp/jvpp/notification/NotificationRegistryProvider.java) | 2 | ||||
-rw-r--r-- | vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/test/ConnectionTest.java (renamed from vpp-api/java/jvpp-registry/org/openvpp/jvpp/test/ConnectionTest.java) | 8 | ||||
-rw-r--r-- | vpp-api/java/jvpp-registry/jvpp_registry.c | 18 |
25 files changed, 63 insertions, 63 deletions
diff --git a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/JVpp.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVpp.java index 53bae04c859..55f25a7bd2e 100644 --- a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/JVpp.java +++ b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVpp.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.openvpp.jvpp; +package io.fd.vpp.jvpp; -import org.openvpp.jvpp.callback.JVppCallback; -import org.openvpp.jvpp.dto.ControlPing; -import org.openvpp.jvpp.dto.JVppRequest; +import io.fd.vpp.jvpp.callback.JVppCallback; +import io.fd.vpp.jvpp.dto.ControlPing; +import io.fd.vpp.jvpp.dto.JVppRequest; /** * Base interface for plugin's Java API. diff --git a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/JVppRegistry.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistry.java index 4515bb3fc20..6535db02358 100644 --- a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/JVppRegistry.java +++ b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistry.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.openvpp.jvpp; +package io.fd.vpp.jvpp; -import org.openvpp.jvpp.callback.JVppCallback; +import io.fd.vpp.jvpp.callback.JVppCallback; /** * Manages VPP connection and stores plugin callbacks. diff --git a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/JVppRegistryImpl.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistryImpl.java index bb6730f4cae..fb2ef1c047f 100644 --- a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/JVppRegistryImpl.java +++ b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistryImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvpp.jvpp; +package io.fd.vpp.jvpp; import static java.util.Objects.requireNonNull; @@ -23,9 +23,9 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.logging.Level; import java.util.logging.Logger; -import org.openvpp.jvpp.callback.ControlPingCallback; -import org.openvpp.jvpp.callback.JVppCallback; -import org.openvpp.jvpp.dto.ControlPingReply; +import io.fd.vpp.jvpp.callback.ControlPingCallback; +import io.fd.vpp.jvpp.callback.JVppCallback; +import io.fd.vpp.jvpp.dto.ControlPingReply; /** * Default implementation of JVppRegistry. diff --git a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/NativeLibraryLoader.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/NativeLibraryLoader.java index d00c41d59b4..ce6d1bfc982 100644 --- a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/NativeLibraryLoader.java +++ b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/NativeLibraryLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvpp.jvpp; +package io.fd.vpp.jvpp; import java.io.IOException; import java.io.InputStream; diff --git a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/VppBaseCallException.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppBaseCallException.java index 792af2c69ec..d71e3055d1f 100644 --- a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/VppBaseCallException.java +++ b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppBaseCallException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvpp.jvpp; +package io.fd.vpp.jvpp; /** * Base exception representing failed operation of JVpp request call diff --git a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/VppCallbackException.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppCallbackException.java index 3d2a1cb2013..ccfcbd3c100 100644 --- a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/VppCallbackException.java +++ b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppCallbackException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvpp.jvpp; +package io.fd.vpp.jvpp; /** * Callback Exception representing failed operation of JVpp request call diff --git a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/VppConnection.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppConnection.java index e7055f9042f..e6fd3bdb257 100644 --- a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/VppConnection.java +++ b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppConnection.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvpp.jvpp; +package io.fd.vpp.jvpp; import java.io.IOException; diff --git a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/VppInvocationException.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppInvocationException.java index 298bcd0ae55..a7ccb197e00 100644 --- a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/VppInvocationException.java +++ b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppInvocationException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvpp.jvpp; +package io.fd.vpp.jvpp; /** * Exception thrown when Vpp jAPI method invocation failed. diff --git a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/VppJNIConnection.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppJNIConnection.java index f35298741b6..7178bcf7d05 100644 --- a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/VppJNIConnection.java +++ b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppJNIConnection.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.openvpp.jvpp; +package io.fd.vpp.jvpp; -import static org.openvpp.jvpp.NativeLibraryLoader.loadLibrary; +import static io.fd.vpp.jvpp.NativeLibraryLoader.loadLibrary; import java.io.IOException; import java.util.HashMap; diff --git a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/callback/ControlPingCallback.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/ControlPingCallback.java index 529ea220b0a..efddfdbb96c 100644 --- a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/callback/ControlPingCallback.java +++ b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/ControlPingCallback.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.openvpp.jvpp.callback; +package io.fd.vpp.jvpp.callback; -import org.openvpp.jvpp.dto.ControlPingReply; +import io.fd.vpp.jvpp.dto.ControlPingReply; /** * Represents callback for control_ping message. diff --git a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/callback/JVppCallback.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppCallback.java index f681e379bfd..ae02063bb2f 100644 --- a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/callback/JVppCallback.java +++ b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppCallback.java @@ -14,8 +14,8 @@ * limitations under the License. */ -package org.openvpp.jvpp.callback; -import org.openvpp.jvpp.VppCallbackException; +package io.fd.vpp.jvpp.callback; +import io.fd.vpp.jvpp.VppCallbackException; /** * Base JVppCallback interface diff --git a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/callback/JVppNotificationCallback.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppNotificationCallback.java index 72a75c83942..8ab0cb2140f 100644 --- a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/callback/JVppNotificationCallback.java +++ b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppNotificationCallback.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvpp.jvpp.callback; +package io.fd.vpp.jvpp.callback; /** * Notification callback diff --git a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/dto/ControlPing.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPing.java index cc59836dfa9..984e1674e83 100644 --- a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/dto/ControlPing.java +++ b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPing.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.openvpp.jvpp.dto; +package io.fd.vpp.jvpp.dto; -import org.openvpp.jvpp.JVpp; -import org.openvpp.jvpp.VppInvocationException; +import io.fd.vpp.jvpp.JVpp; +import io.fd.vpp.jvpp.VppInvocationException; /** * Represents request DTO for control_ping message. diff --git a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/dto/ControlPingReply.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPingReply.java index 6377fcdfa1a..61e4d0e423b 100644 --- a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/dto/ControlPingReply.java +++ b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPingReply.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvpp.jvpp.dto; +package io.fd.vpp.jvpp.dto; import java.util.Objects; diff --git a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/dto/JVppDump.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppDump.java index 295bbba8525..60b98984d9e 100644 --- a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/dto/JVppDump.java +++ b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppDump.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvpp.jvpp.dto; +package io.fd.vpp.jvpp.dto; /** * Base interface for all dump requests diff --git a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/dto/JVppNotification.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppNotification.java index 7d0fecb7d78..5554f50165a 100644 --- a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/dto/JVppNotification.java +++ b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppNotification.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvpp.jvpp.dto; +package io.fd.vpp.jvpp.dto; /** * Base interface for all notification DTOs diff --git a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/dto/JVppReply.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReply.java index 2f4964c4de0..73f512d42d6 100644 --- a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/dto/JVppReply.java +++ b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReply.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvpp.jvpp.dto; +package io.fd.vpp.jvpp.dto; /** * Base interface for all reply DTOs diff --git a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/dto/JVppReplyDump.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReplyDump.java index 4aecedc19d4..15111395f9c 100644 --- a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/dto/JVppReplyDump.java +++ b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReplyDump.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvpp.jvpp.dto; +package io.fd.vpp.jvpp.dto; /** * Base interface for all dump replies diff --git a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/dto/JVppRequest.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppRequest.java index 1216edf8e31..9b301da20cf 100644 --- a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/dto/JVppRequest.java +++ b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppRequest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.openvpp.jvpp.dto; +package io.fd.vpp.jvpp.dto; -import org.openvpp.jvpp.JVpp; -import org.openvpp.jvpp.VppInvocationException; +import io.fd.vpp.jvpp.JVpp; +import io.fd.vpp.jvpp.VppInvocationException; /** * Base interface for all request DTOs diff --git a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/future/AbstractFutureJVppInvoker.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/future/AbstractFutureJVppInvoker.java index 53a445e6977..2067a91a1d1 100644 --- a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/future/AbstractFutureJVppInvoker.java +++ b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/future/AbstractFutureJVppInvoker.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.openvpp.jvpp.future; +package io.fd.vpp.jvpp.future; import java.util.Map; import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import org.openvpp.jvpp.JVpp; -import org.openvpp.jvpp.JVppRegistry; -import org.openvpp.jvpp.VppInvocationException; -import org.openvpp.jvpp.dto.JVppDump; -import org.openvpp.jvpp.dto.JVppReply; -import org.openvpp.jvpp.dto.JVppReplyDump; -import org.openvpp.jvpp.dto.JVppRequest; +import io.fd.vpp.jvpp.JVpp; +import io.fd.vpp.jvpp.JVppRegistry; +import io.fd.vpp.jvpp.VppInvocationException; +import io.fd.vpp.jvpp.dto.JVppDump; +import io.fd.vpp.jvpp.dto.JVppReply; +import io.fd.vpp.jvpp.dto.JVppReplyDump; +import io.fd.vpp.jvpp.dto.JVppRequest; /** * Future facade on top of JVpp diff --git a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/future/FutureJVppInvoker.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/future/FutureJVppInvoker.java index 721f95c9f4d..7a48e4181fa 100644 --- a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/future/FutureJVppInvoker.java +++ b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/future/FutureJVppInvoker.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.openvpp.jvpp.future; +package io.fd.vpp.jvpp.future; -import org.openvpp.jvpp.dto.JVppReply; -import org.openvpp.jvpp.dto.JVppReplyDump; -import org.openvpp.jvpp.dto.JVppRequest; +import io.fd.vpp.jvpp.dto.JVppReply; +import io.fd.vpp.jvpp.dto.JVppReplyDump; +import io.fd.vpp.jvpp.dto.JVppRequest; import java.util.concurrent.CompletionStage; -import org.openvpp.jvpp.notification.NotificationRegistryProvider; +import io.fd.vpp.jvpp.notification.NotificationRegistryProvider; /** * Future facade on top of JVpp @@ -33,7 +33,7 @@ public interface FutureJVppInvoker extends NotificationRegistryProvider, AutoClo * Invoke asynchronous operation on VPP * * @return CompletionStage with future result of an async VPP call - * @throws org.openvpp.jvpp.VppInvocationException when send request failed with details + * @throws io.fd.vpp.jvpp.VppInvocationException when send request failed with details */ <REQ extends JVppRequest, REPLY extends JVppReply<REQ>> CompletionStage<REPLY> send(REQ req); @@ -42,7 +42,7 @@ public interface FutureJVppInvoker extends NotificationRegistryProvider, AutoClo * Invoke asynchronous dump operation on VPP * * @return CompletionStage with aggregated future result of an async VPP dump call - * @throws org.openvpp.jvpp.VppInvocationException when send request failed with details + * @throws io.fd.vpp.jvpp.VppInvocationException when send request failed with details */ <REQ extends JVppRequest, REPLY extends JVppReply<REQ>, DUMP extends JVppReplyDump<REQ, REPLY>> CompletionStage<DUMP> send( REQ req, DUMP emptyReplyDump); diff --git a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/notification/NotificationRegistry.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/notification/NotificationRegistry.java index 27349f2850a..3c72ff793a4 100644 --- a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/notification/NotificationRegistry.java +++ b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/notification/NotificationRegistry.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvpp.jvpp.notification; +package io.fd.vpp.jvpp.notification; /** * Base registry for notification callbacks. diff --git a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/notification/NotificationRegistryProvider.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/notification/NotificationRegistryProvider.java index 46c534a0b31..4a6e06b705c 100644 --- a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/notification/NotificationRegistryProvider.java +++ b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/notification/NotificationRegistryProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvpp.jvpp.notification; +package io.fd.vpp.jvpp.notification; /** * Provides notification registry diff --git a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/test/ConnectionTest.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/test/ConnectionTest.java index d134a1c132a..ea1d8647e56 100644 --- a/vpp-api/java/jvpp-registry/org/openvpp/jvpp/test/ConnectionTest.java +++ b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/test/ConnectionTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.openvpp.jvpp.test; +package io.fd.vpp.jvpp.test; -import org.openvpp.jvpp.JVppRegistry; -import org.openvpp.jvpp.JVppRegistryImpl; +import io.fd.vpp.jvpp.JVppRegistry; +import io.fd.vpp.jvpp.JVppRegistryImpl; /** * Run using: - * sudo java -cp build-vpp-native/vpp-api/java/jvpp-registry-16.09.jar org.openvpp.jvpp.test.ConnectionTest + * sudo java -cp build-vpp-native/vpp-api/java/jvpp-registry-16.09.jar io.fd.vpp.jvpp.test.ConnectionTest */ public class ConnectionTest { diff --git a/vpp-api/java/jvpp-registry/jvpp_registry.c b/vpp-api/java/jvpp-registry/jvpp_registry.c index 1c9871bb8db..af20916e0d9 100644 --- a/vpp-api/java/jvpp-registry/jvpp_registry.c +++ b/vpp-api/java/jvpp-registry/jvpp_registry.c @@ -21,8 +21,8 @@ #include <jni.h> #include <jvpp-common/jvpp_common.h> -#include "org_openvpp_jvpp_VppJNIConnection.h" -#include "org_openvpp_jvpp_JVppRegistryImpl.h" +#include "io_fd_vpp_jvpp_VppJNIConnection.h" +#include "io_fd_vpp_jvpp_JVppRegistryImpl.h" #include <vpp-api/vpe_msg_enum.h> #define vl_typedefs /* define message structures */ @@ -135,7 +135,7 @@ static void vl_api_control_ping_reply_t_handler( rm->controlPingReplyClass, "<init>", "()V"); jmethodID callbackMethod = (*env)->GetMethodID(env, rm->registryClass, "onControlPingReply", - "(Lorg/openvpp/jvpp/dto/ControlPingReply;)V"); + "(Lio/fd/vpp/jvpp/dto/ControlPingReply;)V"); jobject dto = (*env)->NewObject(env, rm->controlPingReplyClass, constructor); @@ -220,7 +220,7 @@ static int connect_to_vpe(char *name) { return 0; } -JNIEXPORT jobject JNICALL Java_org_openvpp_jvpp_VppJNIConnection_clientConnect( +JNIEXPORT jobject JNICALL Java_io_fd_vpp_jvpp_VppJNIConnection_clientConnect( JNIEnv *env, jclass obj, jstring clientName) { int rv; const char *client_name; @@ -229,7 +229,7 @@ JNIEXPORT jobject JNICALL Java_org_openvpp_jvpp_VppJNIConnection_clientConnect( jvpp_registry_main_t * rm = &jvpp_registry_main; jclass connectionInfoClass = (*env)->FindClass(env, - "org/openvpp/jvpp/VppJNIConnection$ConnectionInfo"); + "io/fd/vpp/jvpp/VppJNIConnection$ConnectionInfo"); jmethodID connectionInfoConstructor = (*env)->GetMethodID(env, connectionInfoClass, "<init>", "(JII)V"); @@ -266,7 +266,7 @@ JNIEXPORT jobject JNICALL Java_org_openvpp_jvpp_VppJNIConnection_clientConnect( (jint) jm->my_client_index, (jint) rv); } -JNIEXPORT jint JNICALL Java_org_openvpp_jvpp_JVppRegistryImpl_controlPing0( +JNIEXPORT jint JNICALL Java_io_fd_vpp_jvpp_JVppRegistryImpl_controlPing0( JNIEnv *env, jobject regstryObject) { jvpp_main_t * jm = &jvpp_main; vl_api_control_ping_t * mp; @@ -292,7 +292,7 @@ JNIEXPORT jint JNICALL Java_org_openvpp_jvpp_JVppRegistryImpl_controlPing0( return my_context_id; } -JNIEXPORT void JNICALL Java_org_openvpp_jvpp_VppJNIConnection_clientDisconnect( +JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_VppJNIConnection_clientDisconnect( JNIEnv *env, jclass clazz) { jvpp_registry_main_t * rm = &jvpp_registry_main; rm->is_connected = 0; // TODO make thread safe @@ -319,7 +319,7 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) { } rm->controlPingReplyClass = (jclass) (*env)->NewGlobalRef(env, - (*env)->FindClass(env, "org/openvpp/jvpp/dto/ControlPingReply")); + (*env)->FindClass(env, "io/fd/vpp/jvpp/dto/ControlPingReply")); if ((*env)->ExceptionCheck(env)) { (*env)->ExceptionDescribe(env); clib_warning("Failed to cache class references\n"); @@ -327,7 +327,7 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) { } rm->callbackExceptionClass = (jclass) (*env)->NewGlobalRef(env, - (*env)->FindClass(env, "org/openvpp/jvpp/VppCallbackException")); + (*env)->FindClass(env, "io/fd/vpp/jvpp/VppCallbackException")); if ((*env)->ExceptionCheck(env)) { (*env)->ExceptionDescribe(env); return JNI_ERR; |