VPP-378: update jvpp package names

Depends on vpp change:
https://gerrit.fd.io/r/#/c/3178

Related Honeycomb change:
https://gerrit.fd.io/r/#/c/3182

Change-Id: If8aa43a646ee64fb98b7d8b4398fbdf221c7dc25
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>

6 files changed, 32 insertions, 33 deletions

diff --git a/nsh-plugin/java/Makefile.am b/nsh-plugin/java/Makefile.am
index a16c846..5e1401a 100644
--- a/nsh-plugin/java/Makefile.am
+++ b/nsh-plugin/java/Makefile.am
@@ -21,10 +21,9 @@ BUILT_SOURCES =
 bin_PROGRAMS = 
 CLEANFILES = 
 
-nobase_include_HEADERS = jvpp/org_openvpp_jvpp_nsh_JVppNshImpl.h
+nobase_include_HEADERS = jvpp/io_fd_vpp_jvpp_nsh_JVppNshImpl.h
 
 jarfile_jnsh_sfc = jnsh_sfc-$(PACKAGE_VERSION).jar
-# fixme update dirs after package in jvpp is changed from org.openvpp.jvpp to io.fd.vpp
 java_packagedir = io/fd/nsh_sfc/jvpp
 java_gendir = jvpp/src/main/java
 resourcesdir = jvpp/src/main/resources
@@ -33,15 +32,15 @@ jvpp_gen = jvpp_gen.py
 
 
 lib_LTLIBRARIES = libjvpp_nsh.la
-libjvpp_nsh_la_SOURCES = $(srcdir)/../java/nsh.api.h jvpp/jvpp_nsh.c jvpp/org_openvpp_jvpp_nsh_JVppNshImpl.h
+libjvpp_nsh_la_SOURCES = $(srcdir)/../java/nsh.api.h jvpp/jvpp_nsh.c jvpp/io_fd_vpp_jvpp_nsh_JVppNshImpl.h
 libjvpp_nsh_la_LIBADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra \
 	              -lpthread -lm -lrt -ljvpp_common
 libjvpp_nsh_la_LDFLAGS = -module
 libjvpp_nsh_la_CPPFLAGS = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I../ -I$(srcdir)/../
 
-BUILT_SOURCES = jvpp/org_openvpp_jvpp_nsh_JVppNshImpl.h
+BUILT_SOURCES = jvpp/io_fd_vpp_jvpp_nsh_JVppNshImpl.h
 
-jvpp/org_openvpp_jvpp_nsh_JVppNshImpl.h: defs_nsh_sfc_papi.py
+jvpp/io_fd_vpp_jvpp_nsh_JVppNshImpl.h: defs_nsh_sfc_papi.py
 	dir=`pwd`;						\
 	mkdir -p $(java_gendir)/$(java_packagedir); 		\
 	cd $(java_gendir)/$(java_packagedir);			\
diff --git a/nsh-plugin/java/jvpp/jvpp_nsh.c b/nsh-plugin/java/jvpp/jvpp_nsh.c
index a84e02e..2f92d3b 100644
--- a/nsh-plugin/java/jvpp/jvpp_nsh.c
+++ b/nsh-plugin/java/jvpp/jvpp_nsh.c
@@ -41,20 +41,20 @@
 #include <jvpp-common/jvpp_common.h>
 
 // FIXME use less fragile path
-#include "../build/java/jvpp/org_openvpp_jvpp_nsh_JVppNshImpl.h"
+#include "../build/java/jvpp/io_fd_vpp_jvpp_nsh_JVppNshImpl.h"
 #include "jvpp_nsh.h"
 #include "./build/java/jvpp/jvpp_nsh_gen.h"
 
 /*
- * Class:     org_openvpp_jvpp_nsh_JVppNshImpl
+ * Class:     io_fd_vpp_jvpp_nsh_JVppNshImpl
  * Method:    init0
  * Signature: (JI)V
  */
-JNIEXPORT void JNICALL Java_org_openvpp_jvpp_nsh_JVppNshImpl_init0
+JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_nsh_JVppNshImpl_init0
   (JNIEnv *env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
 	nsh_main_t * plugin_main = &nsh_main;
 	u8 * name;
-	clib_warning ("Java_org_openvpp_jvpp_nsh_JVppNshImpl_init0");
+	clib_warning ("Java_io_fd_vpp_jvpp_nsh_JVppNshImpl_init0");
 
 	plugin_main->my_client_index = my_client_index;
 	plugin_main->vl_input_queue = (unix_shared_memory_queue_t *)queue_address;
@@ -76,7 +76,7 @@ JNIEXPORT void JNICALL Java_org_openvpp_jvpp_nsh_JVppNshImpl_init0
     #undef _
 }
 
-JNIEXPORT void JNICALL Java_org_openvpp_jvpp_nsh_JVppNshImpl_close0
+JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_nsh_JVppNshImpl_close0
 (JNIEnv *env, jclass clazz) {
 	nsh_main_t * plugin_main = &nsh_main;
 
diff --git a/nsh-plugin/java/jvpp/pom.xml b/nsh-plugin/java/jvpp/pom.xml
index 7c59045..650e4eb 100644
--- a/nsh-plugin/java/jvpp/pom.xml
+++ b/nsh-plugin/java/jvpp/pom.xml
@@ -49,7 +49,7 @@
                        <arg value="${runtime_classpath}"/>
                        <arg value="-d"/>
                        <arg value="${basedir}"/>
-                       <arg value="org.openvpp.jvpp.nsh.JVppNshImpl"/>
+                       <arg value="io.fd.vpp.jvpp.nsh.JVppNshImpl"/>
                    </exec>
                 </target>
             </configuration>
diff --git a/nsh-plugin/java/jvpp/test/JVppNshTest.java b/nsh-plugin/java/jvpp/test/JVppNshTest.java
index 2a12c56..9cda316 100644
--- a/nsh-plugin/java/jvpp/test/JVppNshTest.java
+++ b/nsh-plugin/java/jvpp/test/JVppNshTest.java
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package org.openvpp.jvpp.nsh.test;
+package io.fd.vpp.jvpp.nsh.test;
 
-import org.openvpp.jvpp.JVpp;
-import org.openvpp.jvpp.JVppRegistry;
-import org.openvpp.jvpp.JVppRegistryImpl;
-import org.openvpp.jvpp.VppCallbackException;
-import org.openvpp.jvpp.VppJNIConnection;
+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.VppJNIConnection;
 
-import org.openvpp.jvpp.nsh.dto.*;
-import org.openvpp.jvpp.nsh.callback.*;
-import org.openvpp.jvpp.nsh.*;
+import io.fd.vpp.jvpp.nsh.dto.*;
+import io.fd.vpp.jvpp.nsh.callback.*;
+import io.fd.vpp.jvpp.nsh.*;
 
 /**
  * Tests the Nsh Jvpp wrapper (callback API). Run using:
  * 
- * sudo java -cp path/to/jvpp-registry-16.09-SNAPSHOT.jar:path/to/nsh-sfc-16.09-SNAPSHOT.jar org.openvpp.jvpp.nsh.test.JVppNshTest
+ * sudo java -cp path/to/jvpp-registry-16.09-SNAPSHOT.jar:path/to/nsh-sfc-16.09-SNAPSHOT.jar io.fd.vpp.jvpp.nsh.test.JVppNshTest
  */
 public class JVppNshTest {
 
diff --git a/nsh-plugin/java/jvpp/test/NshFutureApiTest.java b/nsh-plugin/java/jvpp/test/NshFutureApiTest.java
index 26f4276..2e3b098 100644
--- a/nsh-plugin/java/jvpp/test/NshFutureApiTest.java
+++ b/nsh-plugin/java/jvpp/test/NshFutureApiTest.java
@@ -14,26 +14,26 @@
  * limitations under the License.
  */
 
-package org.openvpp.jvpp.nsh.test;
+package io.fd.vpp.jvpp.nsh.test;
 
 import java.util.concurrent.Future;
 import java.util.Objects;
 
-import org.openvpp.jvpp.JVpp;
-import org.openvpp.jvpp.JVppRegistry;
-import org.openvpp.jvpp.JVppRegistryImpl;
-import org.openvpp.jvpp.VppCallbackException;
-import org.openvpp.jvpp.VppJNIConnection;
+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.VppJNIConnection;
 
-import org.openvpp.jvpp.nsh.dto.*;
-import org.openvpp.jvpp.nsh.callback.*;
-import org.openvpp.jvpp.nsh.*;
-import org.openvpp.jvpp.nsh.future.FutureJVppNshFacade;
+import io.fd.vpp.jvpp.nsh.dto.*;
+import io.fd.vpp.jvpp.nsh.callback.*;
+import io.fd.vpp.jvpp.nsh.*;
+import io.fd.vpp.jvpp.nsh.future.FutureJVppNshFacade;
 
 /**
  * Tests the Nsh Jvpp wrapper (future API). Run using:
  * 
- * sudo java -cp path/to/jvpp-registry-16.09-SNAPSHOT.jar:path/to/nsh-sfc-16.09-SNAPSHOT.jar org.openvpp.jvpp.nsh.test.NshFutureApiTest
+ * sudo java -cp path/to/jvpp-registry-16.09-SNAPSHOT.jar:path/to/nsh-sfc-16.09-SNAPSHOT.jar io.fd.vpp.jvpp.nsh.test.NshFutureApiTest
  */
 public class NshFutureApiTest {
 
diff --git a/nsh-plugin/java/pom.xml b/nsh-plugin/java/pom.xml
index a27a242..89758c2 100644
--- a/nsh-plugin/java/pom.xml
+++ b/nsh-plugin/java/pom.xml
@@ -53,7 +53,7 @@
                        <arg value="${runtime_classpath}"/>
                        <arg value="-d"/>
                        <arg value="${basedir}"/>
-                       <arg value="org.openvpp.jvpp.nsh.JVppNshImpl"/>
+                       <arg value="io.fd.vpp.jvpp.nsh.JVppNshImpl"/>
                    </exec>
                 </target>
             </configuration>