Update package names

updating package names from io.fd.vpp.jvpp* to io.fd.jvpp*

Change-Id: Ia1634db8f0875ff6ecfeddc281041cd49c4aacc2
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>

9 files changed, 97 insertions, 97 deletions

diff --git a/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/AclExpectedDumpData.java b/java/jvpp-acl/io/fd/jvpp/acl/examples/AclExpectedDumpData.java
index 4806052..f145ae2 100644
--- a/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/AclExpectedDumpData.java
+++ b/java/jvpp-acl/io/fd/jvpp/acl/examples/AclExpectedDumpData.java
@@ -14,37 +14,37 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.acl.examples;
-
-
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.FIRST_RULE_ADDRESS_2_AS_ARRAY;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.FIRST_RULE_ADDRESS_AS_ARRAY;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.FIRST_RULE_DST_ICMP_TYPE_END;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.FIRST_RULE_DST_ICMP_TYPE_START;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.FIRST_RULE_MAC;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.FIRST_RULE_MAC_MASK;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.FIRST_RULE_PREFIX;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.FIRST_RULE_PREFIX_2;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.FIRST_RULE_SRC_ICMP_TYPE_END;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.FIRST_RULE_SRC_ICMP_TYPE_START;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.ICMP_PROTOCOL;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.SECOND_RULE_ADDRESS_2_AS_ARRAY;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.SECOND_RULE_ADDRESS_AS_ARRAY;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.SECOND_RULE_DST_PORT_RANGE_END;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.SECOND_RULE_DST_PORT_RANGE_START;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.SECOND_RULE_MAC;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.SECOND_RULE_MAC_MASK;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.SECOND_RULE_PREFIX;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.SECOND_RULE_PREFIX_2;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.SECOND_RULE_SRC_PORT_RANGE_END;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.SECOND_RULE_SRC_PORT_RANGE_START;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.UDP_PROTOCOL;
-
-import io.fd.vpp.jvpp.acl.dto.AclDetails;
-import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDetails;
-import io.fd.vpp.jvpp.acl.dto.MacipAclDetails;
-import io.fd.vpp.jvpp.acl.types.AclRule;
-import io.fd.vpp.jvpp.acl.types.MacipAclRule;
+package io.fd.jvpp.acl.examples;
+
+
+import static io.fd.jvpp.acl.examples.AclTestData.FIRST_RULE_ADDRESS_2_AS_ARRAY;
+import static io.fd.jvpp.acl.examples.AclTestData.FIRST_RULE_ADDRESS_AS_ARRAY;
+import static io.fd.jvpp.acl.examples.AclTestData.FIRST_RULE_DST_ICMP_TYPE_END;
+import static io.fd.jvpp.acl.examples.AclTestData.FIRST_RULE_DST_ICMP_TYPE_START;
+import static io.fd.jvpp.acl.examples.AclTestData.FIRST_RULE_MAC;
+import static io.fd.jvpp.acl.examples.AclTestData.FIRST_RULE_MAC_MASK;
+import static io.fd.jvpp.acl.examples.AclTestData.FIRST_RULE_PREFIX;
+import static io.fd.jvpp.acl.examples.AclTestData.FIRST_RULE_PREFIX_2;
+import static io.fd.jvpp.acl.examples.AclTestData.FIRST_RULE_SRC_ICMP_TYPE_END;
+import static io.fd.jvpp.acl.examples.AclTestData.FIRST_RULE_SRC_ICMP_TYPE_START;
+import static io.fd.jvpp.acl.examples.AclTestData.ICMP_PROTOCOL;
+import static io.fd.jvpp.acl.examples.AclTestData.SECOND_RULE_ADDRESS_2_AS_ARRAY;
+import static io.fd.jvpp.acl.examples.AclTestData.SECOND_RULE_ADDRESS_AS_ARRAY;
+import static io.fd.jvpp.acl.examples.AclTestData.SECOND_RULE_DST_PORT_RANGE_END;
+import static io.fd.jvpp.acl.examples.AclTestData.SECOND_RULE_DST_PORT_RANGE_START;
+import static io.fd.jvpp.acl.examples.AclTestData.SECOND_RULE_MAC;
+import static io.fd.jvpp.acl.examples.AclTestData.SECOND_RULE_MAC_MASK;
+import static io.fd.jvpp.acl.examples.AclTestData.SECOND_RULE_PREFIX;
+import static io.fd.jvpp.acl.examples.AclTestData.SECOND_RULE_PREFIX_2;
+import static io.fd.jvpp.acl.examples.AclTestData.SECOND_RULE_SRC_PORT_RANGE_END;
+import static io.fd.jvpp.acl.examples.AclTestData.SECOND_RULE_SRC_PORT_RANGE_START;
+import static io.fd.jvpp.acl.examples.AclTestData.UDP_PROTOCOL;
+
+import io.fd.jvpp.acl.dto.AclDetails;
+import io.fd.jvpp.acl.dto.AclInterfaceListDetails;
+import io.fd.jvpp.acl.dto.MacipAclDetails;
+import io.fd.jvpp.acl.types.AclRule;
+import io.fd.jvpp.acl.types.MacipAclRule;
 import java.util.Arrays;
 
 class AclExpectedDumpData {
diff --git a/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/AclTestData.java b/java/jvpp-acl/io/fd/jvpp/acl/examples/AclTestData.java
index 199b1b6..599d0ac 100644
--- a/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/AclTestData.java
+++ b/java/jvpp-acl/io/fd/jvpp/acl/examples/AclTestData.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.acl.examples;
+package io.fd.jvpp.acl.examples;
 
 
-import io.fd.vpp.jvpp.acl.types.AclRule;
-import io.fd.vpp.jvpp.acl.types.MacipAclRule;
+import io.fd.jvpp.acl.types.AclRule;
+import io.fd.jvpp.acl.types.MacipAclRule;
 
 class AclTestData {
 
diff --git a/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/AclTestRequests.java b/java/jvpp-acl/io/fd/jvpp/acl/examples/AclTestRequests.java
index 149ea46..13c73c2 100644
--- a/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/AclTestRequests.java
+++ b/java/jvpp-acl/io/fd/jvpp/acl/examples/AclTestRequests.java
@@ -14,31 +14,31 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.acl.examples;
-
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.createAclRules;
-import static io.fd.vpp.jvpp.acl.examples.AclTestData.createMacipRules;
-
-import io.fd.vpp.jvpp.VppInvocationException;
-import io.fd.vpp.jvpp.acl.dto.AclAddReplace;
-import io.fd.vpp.jvpp.acl.dto.AclAddReplaceReply;
-import io.fd.vpp.jvpp.acl.dto.AclDel;
-import io.fd.vpp.jvpp.acl.dto.AclDelReply;
-import io.fd.vpp.jvpp.acl.dto.AclDetailsReplyDump;
-import io.fd.vpp.jvpp.acl.dto.AclDump;
-import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDetailsReplyDump;
-import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDump;
-import io.fd.vpp.jvpp.acl.dto.AclInterfaceSetAclList;
-import io.fd.vpp.jvpp.acl.dto.AclInterfaceSetAclListReply;
-import io.fd.vpp.jvpp.acl.dto.MacipAclAdd;
-import io.fd.vpp.jvpp.acl.dto.MacipAclAddReply;
-import io.fd.vpp.jvpp.acl.dto.MacipAclAddReplace;
-import io.fd.vpp.jvpp.acl.dto.MacipAclAddReplaceReply;
-import io.fd.vpp.jvpp.acl.dto.MacipAclDel;
-import io.fd.vpp.jvpp.acl.dto.MacipAclDelReply;
-import io.fd.vpp.jvpp.acl.dto.MacipAclDetailsReplyDump;
-import io.fd.vpp.jvpp.acl.dto.MacipAclDump;
-import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade;
+package io.fd.jvpp.acl.examples;
+
+import static io.fd.jvpp.acl.examples.AclTestData.createAclRules;
+import static io.fd.jvpp.acl.examples.AclTestData.createMacipRules;
+
+import io.fd.jvpp.VppInvocationException;
+import io.fd.jvpp.acl.dto.AclAddReplace;
+import io.fd.jvpp.acl.dto.AclAddReplaceReply;
+import io.fd.jvpp.acl.dto.AclDel;
+import io.fd.jvpp.acl.dto.AclDelReply;
+import io.fd.jvpp.acl.dto.AclDetailsReplyDump;
+import io.fd.jvpp.acl.dto.AclDump;
+import io.fd.jvpp.acl.dto.AclInterfaceListDetailsReplyDump;
+import io.fd.jvpp.acl.dto.AclInterfaceListDump;
+import io.fd.jvpp.acl.dto.AclInterfaceSetAclList;
+import io.fd.jvpp.acl.dto.AclInterfaceSetAclListReply;
+import io.fd.jvpp.acl.dto.MacipAclAdd;
+import io.fd.jvpp.acl.dto.MacipAclAddReply;
+import io.fd.jvpp.acl.dto.MacipAclAddReplace;
+import io.fd.jvpp.acl.dto.MacipAclAddReplaceReply;
+import io.fd.jvpp.acl.dto.MacipAclDel;
+import io.fd.jvpp.acl.dto.MacipAclDelReply;
+import io.fd.jvpp.acl.dto.MacipAclDetailsReplyDump;
+import io.fd.jvpp.acl.dto.MacipAclDump;
+import io.fd.jvpp.acl.future.FutureJVppAclFacade;
 import java.util.concurrent.ExecutionException;
 
 class AclTestRequests {
diff --git a/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/FutureApiExample.java b/java/jvpp-acl/io/fd/jvpp/acl/examples/FutureApiExample.java
index 862df8d..144d839 100644
--- a/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/FutureApiExample.java
+++ b/java/jvpp-acl/io/fd/jvpp/acl/examples/FutureApiExample.java
@@ -14,25 +14,25 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.acl.examples;
+package io.fd.jvpp.acl.examples;
 
-import static io.fd.vpp.jvpp.acl.examples.AclExpectedDumpData.verifyAclDump;
-import static io.fd.vpp.jvpp.acl.examples.AclExpectedDumpData.verifyAclInterfaceList;
-import static io.fd.vpp.jvpp.acl.examples.AclExpectedDumpData.verifyMacIpDump;
-import static io.fd.vpp.jvpp.acl.examples.AclTestRequests.sendAclAddRequest;
-import static io.fd.vpp.jvpp.acl.examples.AclTestRequests.sendAclDelRequest;
-import static io.fd.vpp.jvpp.acl.examples.AclTestRequests.sendAclDumpRequest;
-import static io.fd.vpp.jvpp.acl.examples.AclTestRequests.sendAclInterfaceDeleteList;
-import static io.fd.vpp.jvpp.acl.examples.AclTestRequests.sendAclInterfaceListDumpRequest;
-import static io.fd.vpp.jvpp.acl.examples.AclTestRequests.sendAclInterfaceSetAclList;
-import static io.fd.vpp.jvpp.acl.examples.AclTestRequests.sendMacIpAddRequest;
-import static io.fd.vpp.jvpp.acl.examples.AclTestRequests.sendMacIpDelRequest;
-import static io.fd.vpp.jvpp.acl.examples.AclTestRequests.sendMacIpDumpRequest;
+import static io.fd.jvpp.acl.examples.AclExpectedDumpData.verifyAclDump;
+import static io.fd.jvpp.acl.examples.AclExpectedDumpData.verifyAclInterfaceList;
+import static io.fd.jvpp.acl.examples.AclExpectedDumpData.verifyMacIpDump;
+import static io.fd.jvpp.acl.examples.AclTestRequests.sendAclAddRequest;
+import static io.fd.jvpp.acl.examples.AclTestRequests.sendAclDelRequest;
+import static io.fd.jvpp.acl.examples.AclTestRequests.sendAclDumpRequest;
+import static io.fd.jvpp.acl.examples.AclTestRequests.sendAclInterfaceDeleteList;
+import static io.fd.jvpp.acl.examples.AclTestRequests.sendAclInterfaceListDumpRequest;
+import static io.fd.jvpp.acl.examples.AclTestRequests.sendAclInterfaceSetAclList;
+import static io.fd.jvpp.acl.examples.AclTestRequests.sendMacIpAddRequest;
+import static io.fd.jvpp.acl.examples.AclTestRequests.sendMacIpDelRequest;
+import static io.fd.jvpp.acl.examples.AclTestRequests.sendMacIpDumpRequest;
 
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.acl.JVppAclImpl;
-import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.acl.JVppAclImpl;
+import io.fd.jvpp.acl.future.FutureJVppAclFacade;
 
 public class FutureApiExample {
 
diff --git a/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/Readme.txt b/java/jvpp-acl/io/fd/jvpp/acl/examples/Readme.txt
index d17fbfc..e47b027 100644
--- a/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/Readme.txt
+++ b/java/jvpp-acl/io/fd/jvpp/acl/examples/Readme.txt
@@ -1,4 +1,4 @@
 release version:
-sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp-native/vpp/vpp-api/java/jvpp-acl-17.10.jar io.fd.vpp.jvpp.acl.examples.FutureApiExample
+sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp-native/vpp/vpp-api/java/jvpp-acl-17.10.jar io.fd.jvpp.acl.examples.FutureApiExample
 debug version:
-sudo java -cp build-vpp_debug-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp-debug-native/vpp/vpp-api/java/jvpp-acl-17.10.jar io.fd.vpp.jvpp.acl.examples.FutureApiExample
+sudo java -cp build-vpp_debug-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp-debug-native/vpp/vpp-api/java/jvpp-acl-17.10.jar io.fd.jvpp.acl.examples.FutureApiExample
diff --git a/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/CallbackApiTest.java b/java/jvpp-acl/io/fd/jvpp/acl/test/CallbackApiTest.java
index a7bbb7f..5e451e2 100644
--- a/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/CallbackApiTest.java
+++ b/java/jvpp-acl/io/fd/jvpp/acl/test/CallbackApiTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.acl.test;
+package io.fd.jvpp.acl.test;
 
-import io.fd.vpp.jvpp.AbstractCallbackApiTest;
-import io.fd.vpp.jvpp.acl.JVppAclImpl;
+import io.fd.jvpp.AbstractCallbackApiTest;
+import io.fd.jvpp.acl.JVppAclImpl;
 
 import java.util.logging.Logger;
 
diff --git a/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/FutureApiTest.java b/java/jvpp-acl/io/fd/jvpp/acl/test/FutureApiTest.java
index ff1c73c..7bba3fc 100644
--- a/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/FutureApiTest.java
+++ b/java/jvpp-acl/io/fd/jvpp/acl/test/FutureApiTest.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.acl.test;
-
-import io.fd.vpp.jvpp.Assertions;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.acl.JVppAclImpl;
-import io.fd.vpp.jvpp.acl.dto.AclDetailsReplyDump;
-import io.fd.vpp.jvpp.acl.dto.AclDump;
-import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade;
+package io.fd.jvpp.acl.test;
+
+import io.fd.jvpp.Assertions;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.acl.JVppAclImpl;
+import io.fd.jvpp.acl.dto.AclDetailsReplyDump;
+import io.fd.jvpp.acl.dto.AclDump;
+import io.fd.jvpp.acl.future.FutureJVppAclFacade;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.logging.Logger;
diff --git a/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/Readme.txt b/java/jvpp-acl/io/fd/jvpp/acl/test/Readme.txt
index 1b46585..ad8757f 100644
--- a/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/Readme.txt
+++ b/java/jvpp-acl/io/fd/jvpp/acl/test/Readme.txt
@@ -1,4 +1,4 @@
 release version:
-sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp-native/vpp/vpp-api/java/jvpp-acl-17.10.jar io.fd.vpp.jvpp.acl.test.[test-name]
+sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp-native/vpp/vpp-api/java/jvpp-acl-17.10.jar io.fd.jvpp.acl.test.[test-name]
 debug version:
-sudo java -cp build-vpp_debug-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-acl-17.10.jar io.fd.vpp.jvpp.acl.test.[test-name]
+sudo java -cp build-vpp_debug-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-acl-17.10.jar io.fd.jvpp.acl.test.[test-name]
diff --git a/java/jvpp-acl/jvpp_acl.c b/java/jvpp-acl/jvpp_acl.c
index 22e44f1..1e48566 100644
--- a/java/jvpp-acl/jvpp_acl.c
+++ b/java/jvpp-acl/jvpp_acl.c
@@ -32,19 +32,19 @@
 
 #include <jvpp-common/jvpp_common.h>
 
-#include "jvpp-acl/io_fd_vpp_jvpp_acl_JVppAclImpl.h"
+#include "jvpp-acl/io_fd_jvpp_acl_JVppAclImpl.h"
 #include "jvpp_acl.h"
 #include "jvpp-acl/jvpp_acl_gen.h"
 
 /*
- * Class:     io_fd_vpp_jvpp_acl_JVppaclImpl
+ * Class:     io_fd_jvpp_acl_JVppaclImpl
  * Method:    init0
  * Signature: (JI)V
  */
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_acl_JVppAclImpl_init0
+JNIEXPORT void JNICALL Java_io_fd_jvpp_acl_JVppAclImpl_init0
   (JNIEnv *env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
   acl_main_t * plugin_main = &acl_main;
-  clib_warning ("Java_io_fd_vpp_jvpp_acl_JVppAclImpl_init0");
+  clib_warning ("Java_io_fd_jvpp_acl_JVppAclImpl_init0");
 
   plugin_main->my_client_index = my_client_index;
   plugin_main->vl_input_queue = uword_to_pointer (queue_address, svm_queue_t *);
@@ -69,7 +69,7 @@ JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_acl_JVppAclImpl_init0
   #undef _
 }
 
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_acl_JVppAclImpl_close0
+JNIEXPORT void JNICALL Java_io_fd_jvpp_acl_JVppAclImpl_close0
 (JNIEnv *env, jclass clazz) {
   acl_main_t * plugin_main = &acl_main;