6 files changed, 29 insertions, 29 deletions
diff --git a/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/examples/IoamExportApiExample.java b/java/jvpp-ioamexport/io/fd/jvpp/ioamexport/examples/IoamExportApiExample.java
index 2f5b7db..eb052dd 100644
--- a/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/examples/IoamExportApiExample.java
+++ b/java/jvpp-ioamexport/io/fd/jvpp/ioamexport/examples/IoamExportApiExample.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.ioamexport.examples;
+package io.fd.jvpp.ioamexport.examples;
 
 import java.net.InetAddress;
 
-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.ioamexport.JVppIoamexportImpl;
-import io.fd.vpp.jvpp.ioamexport.future.FutureJVppIoamexportFacade;
-import io.fd.vpp.jvpp.ioamexport.dto.IoamExportIp6EnableDisable;
-import io.fd.vpp.jvpp.ioamexport.dto.IoamExportIp6EnableDisableReply;
+import io.fd.jvpp.JVpp;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.VppCallbackException;
+import io.fd.jvpp.ioamexport.JVppIoamexportImpl;
+import io.fd.jvpp.ioamexport.future.FutureJVppIoamexportFacade;
+import io.fd.jvpp.ioamexport.dto.IoamExportIp6EnableDisable;
+import io.fd.jvpp.ioamexport.dto.IoamExportIp6EnableDisableReply;
 
 public class IoamExportApiExample {
 
diff --git a/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/examples/Readme.txt b/java/jvpp-ioamexport/io/fd/jvpp/ioamexport/examples/Readme.txt
index f2dfe91..d28e71f 100644
--- a/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/examples/Readme.txt
+++ b/java/jvpp-ioamexport/io/fd/jvpp/ioamexport/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-ioamexport-17.10.jar io.fd.vpp.jvpp.ioamexport.examples.IoamExportApiExample
+sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp-native/vpp/vpp-api/java/jvpp-ioamexport-17.10.jar io.fd.jvpp.ioamexport.examples.IoamExportApiExample
 debug vresion:
-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-ioamexport-17.10.jar io.fd.vpp.jvpp.ioamexport.examples.IoamExportApiExample
+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-ioamexport-17.10.jar io.fd.jvpp.ioamexport.examples.IoamExportApiExample
diff --git a/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/CallbackApiTest.java b/java/jvpp-ioamexport/io/fd/jvpp/ioamexport/test/CallbackApiTest.java
index ba49d77..14efa42 100644
--- a/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/CallbackApiTest.java
+++ b/java/jvpp-ioamexport/io/fd/jvpp/ioamexport/test/CallbackApiTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.ioamexport.test;
+package io.fd.jvpp.ioamexport.test;
 
-import io.fd.vpp.jvpp.AbstractCallbackApiTest;
-import io.fd.vpp.jvpp.ioamexport.JVppIoamexportImpl;
+import io.fd.jvpp.AbstractCallbackApiTest;
+import io.fd.jvpp.ioamexport.JVppIoamexportImpl;
 
 import java.util.logging.Logger;
 
diff --git a/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/FutureApiTest.java b/java/jvpp-ioamexport/io/fd/jvpp/ioamexport/test/FutureApiTest.java
index 048d244..b4208e7 100644
--- a/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/FutureApiTest.java
+++ b/java/jvpp-ioamexport/io/fd/jvpp/ioamexport/test/FutureApiTest.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.ioamexport.test;
+package io.fd.jvpp.ioamexport.test;
 
 
-import io.fd.vpp.jvpp.Assertions;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.ioamexport.JVppIoamexportImpl;
-import io.fd.vpp.jvpp.ioamexport.dto.IoamExportIp6EnableDisable;
-import io.fd.vpp.jvpp.ioamexport.dto.IoamExportIp6EnableDisableReply;
-import io.fd.vpp.jvpp.ioamexport.future.FutureJVppIoamexportFacade;
+import io.fd.jvpp.Assertions;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.ioamexport.JVppIoamexportImpl;
+import io.fd.jvpp.ioamexport.dto.IoamExportIp6EnableDisable;
+import io.fd.jvpp.ioamexport.dto.IoamExportIp6EnableDisableReply;
+import io.fd.jvpp.ioamexport.future.FutureJVppIoamexportFacade;
 
 import java.util.concurrent.Future;
 import java.util.logging.Logger;
diff --git a/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/Readme.txt b/java/jvpp-ioamexport/io/fd/jvpp/ioamexport/test/Readme.txt
index 820071a..78a10c1 100644
--- a/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/Readme.txt
+++ b/java/jvpp-ioamexport/io/fd/jvpp/ioamexport/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-ioamexport-17.10.jar io.fd.vpp.jvpp.ioamexport.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-ioamexport-17.10.jar io.fd.jvpp.ioamexport.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-ioamexport-17.10.jar io.fd.vpp.jvpp.ioamexport.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-ioamexport-17.10.jar io.fd.jvpp.ioamexport.test.[test-name]
diff --git a/java/jvpp-ioamexport/jvpp_ioam_export.c b/java/jvpp-ioamexport/jvpp_ioam_export.c
index 74ae438..6aa58e4 100644
--- a/java/jvpp-ioamexport/jvpp_ioam_export.c
+++ b/java/jvpp-ioamexport/jvpp_ioam_export.c
@@ -32,19 +32,19 @@
 
 #include <jvpp-common/jvpp_common.h>
 
-#include "jvpp-ioamexport/io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl.h"
+#include "jvpp-ioamexport/io_fd_jvpp_ioamexport_JVppIoamexportImpl.h"
 #include "jvpp_ioam_export.h"
 #include "jvpp-ioamexport/jvpp_ioamexport_gen.h"
 
 /*
- * Class:     io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl
+ * Class:     io_fd_jvpp_ioamexport_JVppIoamexportImpl
  * Method:    init0
  * Signature: (JI)V
  */
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl_init0
+JNIEXPORT void JNICALL Java_io_fd_jvpp_ioamexport_JVppIoamexportImpl_init0
   (JNIEnv *env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
   ioamexport_main_t * plugin_main = &ioamexport_main;
-  clib_warning ("Java_io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl_init0");
+  clib_warning ("Java_io_fd_jvpp_ioamexport_JVppIoamexportImpl_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_ioamexport_JVppIoamexportImpl_init0
   #undef _
 }
 
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl_close0
+JNIEXPORT void JNICALL Java_io_fd_jvpp_ioamexport_JVppIoamexportImpl_close0
 (JNIEnv *env, jclass clazz) {
   ioamexport_main_t * plugin_main = &ioamexport_main;