VPP-1504: Remove JVPP

As part of JVPP migration this removes JVPP completely from VPP.

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

2 files changed, 0 insertions, 149 deletions

diff --git a/extras/japi/java/jvpp-gtpu/jvpp_gtpu.c b/extras/japi/java/jvpp-gtpu/jvpp_gtpu.c
deleted file mode 100644
index 8e523caa9f8..00000000000
--- a/extras/japi/java/jvpp-gtpu/jvpp_gtpu.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-
-#include <gtpu/gtpu_msg_enum.h>
-#define vl_typedefs             /* define message structures */
-#include <gtpu/gtpu_all_api_h.h>
-#undef vl_typedefs
-
-#include <vnet/api_errno.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-
-#if VPPJNI_DEBUG == 1
-  #define DEBUG_LOG(...) clib_warning(__VA_ARGS__)
-#else
-  #define DEBUG_LOG(...)
-#endif
-
-#include <jvpp-common/jvpp_common.h>
-
-#include "jvpp-gtpu/io_fd_vpp_jvpp_gtpu_JVppGtpuImpl.h"
-#include "jvpp_gtpu.h"
-#include "jvpp-gtpu/jvpp_gtpu_gen.h"
-
-/*
- * Class:     io_fd_vpp_jvpp_gtpu_JVppgtpuImpl
- * Method:    init0
- * Signature: (JI)V
- */
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_gtpu_JVppGtpuImpl_init0
-  (JNIEnv *env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
-  gtpu_main_t * plugin_main = &gtpu_main;
-  clib_warning ("Java_io_fd_vpp_jvpp_gtpu_JVppGtpuImpl_init0");
-
-  plugin_main->my_client_index = my_client_index;
-  plugin_main->vl_input_queue = (svm_queue_t *)queue_address;
-
-  plugin_main->callbackObject = (*env)->NewGlobalRef(env, callback);
-  plugin_main->callbackClass = (jclass)(*env)->NewGlobalRef(env, (*env)->GetObjectClass(env, callback));
-
-  // verify API has not changed since jar generation
-  #define _(N)             \
-      if (get_message_id(env, #N) == 0) return;
-      foreach_supported_api_message;
-  #undef _
-
-  #define _(N,n)                                  \
-      vl_msg_api_set_handlers(get_message_id(env, #N), #n,     \
-              vl_api_##n##_t_handler,             \
-              vl_noop_handler,                    \
-              vl_noop_handler,                    \
-              vl_noop_handler,                    \
-              sizeof(vl_api_##n##_t), 1);
-      foreach_api_reply_handler;
-  #undef _
-}
-
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_gtpu_JVppGtpuImpl_close0
-(JNIEnv *env, jclass clazz) {
-  gtpu_main_t * plugin_main = &gtpu_main;
-
-    // cleanup:
-    (*env)->DeleteGlobalRef(env, plugin_main->callbackClass);
-    (*env)->DeleteGlobalRef(env, plugin_main->callbackObject);
-
-    plugin_main->callbackClass = NULL;
-    plugin_main->callbackObject = NULL;
-}
-
-/* Attach thread to JVM and cache class references when initiating JVPP ACL */
-jint JNI_OnLoad(JavaVM *vm, void *reserved) {
-    JNIEnv* env;
-
-    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
-        return JNI_EVERSION;
-    }
-
-    if (cache_class_references(env) != 0) {
-        clib_warning ("Failed to cache class references\n");
-        return JNI_ERR;
-    }
-
-    return JNI_VERSION_1_8;
-}
-
-/* Clean up cached references when disposing JVPP ACL */
-void JNI_OnUnload(JavaVM *vm, void *reserved) {
-    JNIEnv* env;
-    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
-        return;
-    }
-    delete_class_references(env);
-}
diff --git a/extras/japi/java/jvpp-gtpu/jvpp_gtpu.h b/extras/japi/java/jvpp-gtpu/jvpp_gtpu.h
deleted file mode 100644
index fa7c8b7c53b..00000000000
--- a/extras/japi/java/jvpp-gtpu/jvpp_gtpu.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_jvpp_gtpu_h__
-#define __included_jvpp_gtpu_h__
-
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/api_errno.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <jni.h>
-
-/* Global state for JVPP-gtpu */
-typedef struct {
-    /* Pointer to shared memory queue */
-    svm_queue_t * vl_input_queue;
-
-    /* VPP api client index */
-    u32 my_client_index;
-
-    /* Callback object and class references enabling asynchronous Java calls */
-    jobject callbackObject;
-    jclass callbackClass;
-
-} gtpu_main_t;
-
-gtpu_main_t gtpu_main __attribute__((aligned (64)));
-
-
-#endif /* __included_jvpp_gtpu_h__ */