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>

6 files changed, 28 insertions, 28 deletions

diff --git a/java/jvpp-nat/io/fd/vpp/jvpp/nat/examples/CallbackApiExample.java b/java/jvpp-nat/io/fd/jvpp/nat/examples/CallbackApiExample.java
index e0d93ff..93fd308 100644
--- a/java/jvpp-nat/io/fd/vpp/jvpp/nat/examples/CallbackApiExample.java
+++ b/java/jvpp-nat/io/fd/jvpp/nat/examples/CallbackApiExample.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.nat.examples;
+package io.fd.jvpp.nat.examples;
 
-import io.fd.vpp.jvpp.JVpp;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.VppCallbackException;
-import io.fd.vpp.jvpp.nat.JVppNatImpl;
-import io.fd.vpp.jvpp.nat.callback.Nat44InterfaceAddDelFeatureReplyCallback;
-import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceAddDelFeature;
-import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceAddDelFeatureReply;
+import io.fd.jvpp.JVpp;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.VppCallbackException;
+import io.fd.jvpp.nat.JVppNatImpl;
+import io.fd.jvpp.nat.callback.Nat44InterfaceAddDelFeatureReplyCallback;
+import io.fd.jvpp.nat.dto.Nat44InterfaceAddDelFeature;
+import io.fd.jvpp.nat.dto.Nat44InterfaceAddDelFeatureReply;
 
 public class CallbackApiExample {
 
diff --git a/java/jvpp-nat/io/fd/vpp/jvpp/nat/examples/Readme.txt b/java/jvpp-nat/io/fd/jvpp/nat/examples/Readme.txt
index ac75e04..3ae52d8 100644
--- a/java/jvpp-nat/io/fd/vpp/jvpp/nat/examples/Readme.txt
+++ b/java/jvpp-nat/io/fd/jvpp/nat/examples/Readme.txt
@@ -1 +1 @@
-sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp-native/vpp/vpp-api/java/jvpp-nat-17.10.jar io.fd.vpp.jvpp.nat.examples.CallbackApiExample
+sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp-native/vpp/vpp-api/java/jvpp-nat-17.10.jar io.fd.jvpp.nat.examples.CallbackApiExample
diff --git a/java/jvpp-nat/io/fd/vpp/jvpp/nat/test/CallbackApiTest.java b/java/jvpp-nat/io/fd/jvpp/nat/test/CallbackApiTest.java
index a6f8214..dfa3816 100644
--- a/java/jvpp-nat/io/fd/vpp/jvpp/nat/test/CallbackApiTest.java
+++ b/java/jvpp-nat/io/fd/jvpp/nat/test/CallbackApiTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.nat.test;
+package io.fd.jvpp.nat.test;
 
-import io.fd.vpp.jvpp.AbstractCallbackApiTest;
-import io.fd.vpp.jvpp.nat.JVppNatImpl;
+import io.fd.jvpp.AbstractCallbackApiTest;
+import io.fd.jvpp.nat.JVppNatImpl;
 
 import java.util.logging.Logger;
 
diff --git a/java/jvpp-nat/io/fd/vpp/jvpp/nat/test/FutureApiTest.java b/java/jvpp-nat/io/fd/jvpp/nat/test/FutureApiTest.java
index 26d6b98..529dedf 100644
--- a/java/jvpp-nat/io/fd/vpp/jvpp/nat/test/FutureApiTest.java
+++ b/java/jvpp-nat/io/fd/jvpp/nat/test/FutureApiTest.java
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.nat.test;
+package io.fd.jvpp.nat.test;
 
 
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.nat.JVppNatImpl;
-import io.fd.vpp.jvpp.nat.dto.Nat44AddressDetailsReplyDump;
-import io.fd.vpp.jvpp.nat.dto.Nat44AddressDump;
-import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.nat.JVppNatImpl;
+import io.fd.jvpp.nat.dto.Nat44AddressDetailsReplyDump;
+import io.fd.jvpp.nat.dto.Nat44AddressDump;
+import io.fd.jvpp.nat.future.FutureJVppNatFacade;
 
 import java.util.concurrent.Future;
 import java.util.logging.Logger;
 
 public class FutureApiTest {
 
-    private static final Logger LOG = Logger.getLogger(io.fd.vpp.jvpp.nat.test.FutureApiTest.class.getName());
+    private static final Logger LOG = Logger.getLogger(io.fd.jvpp.nat.test.FutureApiTest.class.getName());
 
     public static void main(String[] args) throws Exception {
         testCallbackApi(args);
diff --git a/java/jvpp-nat/io/fd/vpp/jvpp/nat/test/Readme.txt b/java/jvpp-nat/io/fd/jvpp/nat/test/Readme.txt
index 6f75808..7885638 100644
--- a/java/jvpp-nat/io/fd/vpp/jvpp/nat/test/Readme.txt
+++ b/java/jvpp-nat/io/fd/jvpp/nat/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_debug-native/vpp/vpp-api/java/jvpp-nat-17.10.jar io.fd.vpp.jvpp.nat.test.[test-name]
+sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-nat-17.10.jar io.fd.jvpp.nat.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-nat-17.10.jar io.fd.vpp.jvpp.nat.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-nat-17.10.jar io.fd.jvpp.nat.test.[test-name]
diff --git a/java/jvpp-nat/jvpp_nat.c b/java/jvpp-nat/jvpp_nat.c
index bdae1e6..20e4244 100644
--- a/java/jvpp-nat/jvpp_nat.c
+++ b/java/jvpp-nat/jvpp_nat.c
@@ -32,19 +32,19 @@
 
 #include <jvpp-common/jvpp_common.h>
 
-#include "jvpp-nat/io_fd_vpp_jvpp_nat_JVppNatImpl.h"
+#include "jvpp-nat/io_fd_jvpp_nat_JVppNatImpl.h"
 #include "jvpp_nat.h"
 #include "jvpp-nat/jvpp_nat_gen.h"
 
 /*
- * Class:     io_fd_vpp_jvpp_nat_JVppNatImpl
+ * Class:     io_fd_jvpp_nat_JVppNatImpl
  * Method:    init0
  * Signature: (JI)V
  */
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_nat_JVppNatImpl_init0
+JNIEXPORT void JNICALL Java_io_fd_jvpp_nat_JVppNatImpl_init0
   (JNIEnv *env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
   nat_main_t * plugin_main = &nat_main;
-  clib_warning ("Java_io_fd_vpp_jvpp_nat_JVppNatImpl_init0");
+  clib_warning ("Java_io_fd_jvpp_nat_JVppNatImpl_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_nat_JVppNatImpl_init0
   #undef _
 }
 
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_nat_JVppNatImpl_close0
+JNIEXPORT void JNICALL Java_io_fd_jvpp_nat_JVppNatImpl_close0
 (JNIEnv *env, jclass clazz) {
   nat_main_t * plugin_main = &nat_main;