[Android]Fix wrong class path on CA BLE adapter

Fix wrong class path on CA BLE adapter jni header

Change-Id: I71b3641505625de7596ea58f4685283d7c9b9e1a
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15679
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

diff --git a/resource/csdk/connectivity/src/bt_le_adapter/android/org_iotivity_ca_CaLeClientInterface.h b/resource/csdk/connectivity/src/bt_le_adapter/android/org_iotivity_ca_CaLeClientInterface.h
index d776c4f..acfe990 100644 (file)
--- a/resource/csdk/connectivity/src/bt_le_adapter/android/org_iotivity_ca_CaLeClientInterface.h
+++ b/resource/csdk/connectivity/src/bt_le_adapter/android/org_iotivity_ca_CaLeClientInterface.h
@@ -19,71 +19,71 @@
  ******************************************************************/
 
 #include <jni.h>
-/* Header for class org_iotivity_ca_caLeClientInterface */
+/* Header for class org_iotivity_ca_CaLeClientInterface */
 
-#ifndef CA_Included_org_iotivity_ca_caLeClientInterface_H_
-#define CA_Included_org_iotivity_ca_caLeClientInterface_H_
+#ifndef CA_Included_org_iotivity_ca_CaLeClientInterface_H_
+#define CA_Included_org_iotivity_ca_CaLeClientInterface_H_
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
 /*
- * Class:     org_iotivity_ca_caLeClientInterface
+ * Class:     org_iotivity_ca_CaLeClientInterface
  * Method:    caLeRegisterLeScanCallback
  * Signature: (Landroid/bluetooth/BluetoothAdapter/LeScanCallback;)V
  */
 JNIEXPORT void JNICALL
-Java_org_iotivity_ca_caLeClientInterface_caLeRegisterLeScanCallback
+Java_org_iotivity_ca_CaLeClientInterface_caLeRegisterLeScanCallback
 (JNIEnv *, jobject, jobject);
 
 /*
- * Class:     org_iotivity_ca_caLeClientInterface
+ * Class:     org_iotivity_ca_CaLeClientInterface
  * Method:    caLeRegisterGattCallback
  * Signature: (Landroid/bluetooth/BluetoothGattCallback;)V
  */
 JNIEXPORT void JNICALL
-Java_org_iotivity_ca_caLeClientInterface_caLeRegisterGattCallback
+Java_org_iotivity_ca_CaLeClientInterface_caLeRegisterGattCallback
 (JNIEnv *, jobject, jobject);
 
 /*
- * Class:     org_iotivity_ca_caLeClientInterface
+ * Class:     org_iotivity_ca_CaLeClientInterface
  * Method:    caLeScanCallback
  * Signature: (Landroid/bluetooth/BluetoothDevice;)V
  */
 JNIEXPORT void JNICALL
-Java_org_iotivity_ca_caLeClientInterface_caLeScanCallback
+Java_org_iotivity_ca_CaLeClientInterface_caLeScanCallback
 (JNIEnv *, jobject, jobject);
 
 /*
- * Class:     org_iotivity_ca_caLeClientInterface
+ * Class:     org_iotivity_ca_CaLeClientInterface
  * Method:    caLeGattConnectionStateChangeCallback
  * Signature: (Landroid/bluetooth/BluetoothGatt;II)V
  */
 JNIEXPORT void JNICALL
-Java_org_iotivity_ca_caLeClientInterface_caLeGattConnectionStateChangeCallback
+Java_org_iotivity_ca_CaLeClientInterface_caLeGattConnectionStateChangeCallback
 (JNIEnv *, jobject, jobject, jint, jint);
 
 /*
- * Class:     org_iotivity_ca_caLeClientInterface
+ * Class:     org_iotivity_ca_CaLeClientInterface
  * Method:    caLeGattNWConnectionStateChangeCallback
  * Signature: (Landroid/bluetooth/BluetoothGatt;II)V
  */
 JNIEXPORT void JNICALL
-Java_org_iotivity_ca_caLeClientInterface_caLeGattNWConnectionStateChangeCallback
+Java_org_iotivity_ca_CaLeClientInterface_caLeGattNWConnectionStateChangeCallback
 (JNIEnv *, jobject, jobject, jint, jint);
 
 /*
- * Class:     org_iotivity_ca_caLeClientInterface
+ * Class:     org_iotivity_ca_CaLeClientInterface
  * Method:    caLeGattServicesDiscoveredCallback
  * Signature: (Landroid/bluetooth/BluetoothGatt;I)V
  */
 JNIEXPORT void JNICALL
-Java_org_iotivity_ca_caLeClientInterface_caLeGattServicesDiscoveredCallback
+Java_org_iotivity_ca_CaLeClientInterface_caLeGattServicesDiscoveredCallback
 (JNIEnv *, jobject, jobject, jint);
 
 /*
- * Class:     org_iotivity_ca_caLeClientInterface
+ * Class:     org_iotivity_ca_CaLeClientInterface
  * Method:    caLeGattNWServicesDiscoveredCallback
  * Signature: (Landroid/bluetooth/BluetoothGatt;I)V
  */
@@ -91,52 +91,52 @@ JNIEXPORT void JNICALL
 Java_org_iotivity_ca_CaLeClientInterface_caLeGattNWServicesDiscoveredCallback
 (JNIEnv *, jobject, jobject, jint);
 /*
- * Class:     org_iotivity_ca_caLeClientInterface
+ * Class:     org_iotivity_ca_CaLeClientInterface
  * Method:    caLeGattCharacteristicWritjclasseCallback
  * Signature: (Landroid/bluetooth/BluetoothGatt;[BI)V
  */
 JNIEXPORT void JNICALL
-Java_org_iotivity_ca_caLeClientInterface_caLeGattCharacteristicWriteCallback
+Java_org_iotivity_ca_CaLeClientInterface_caLeGattCharacteristicWriteCallback
 (JNIEnv *, jobject, jobject, jbyteArray, jint);
 
 /*
- * Class:     org_iotivity_ca_caLeClientInterface
+ * Class:     org_iotivity_ca_CaLeClientInterface
  * Method:    caLeGattCharacteristicChangedCallback
  * Signature: (Landroid/bluetooth/BluetoothGatt;Landroid/bluetooth/BluetoothGattCharacteristic;)V
  */
 JNIEXPORT void JNICALL
-Java_org_iotivity_ca_caLeClientInterface_caLeGattCharacteristicChangedCallback
+Java_org_iotivity_ca_CaLeClientInterface_caLeGattCharacteristicChangedCallback
 (JNIEnv *, jobject, jobject, jbyteArray);
 
 /*
- * Class:     org_iotivity_ca_caLeClientInterface
+ * Class:     org_iotivity_ca_CaLeClientInterface
  * Method:    caLeGattDescriptorWriteCallback
  * Signature: (Landroid/bluetooth/BluetoothGatt;I)V
  */
 JNIEXPORT void JNICALL
-Java_org_iotivity_ca_caLeClientInterface_caLeGattDescriptorWriteCallback
+Java_org_iotivity_ca_CaLeClientInterface_caLeGattDescriptorWriteCallback
 (JNIEnv *, jobject, jobject, jint);
 
 /*
- * Class:     org_iotivity_ca_caLeClientInterface
+ * Class:     org_iotivity_ca_CaLeClientInterface
  * Method:    caLeStateChangedCallback
  * Signature: (I)V
  */
 JNIEXPORT void JNICALL
-Java_org_iotivity_ca_caLeClientInterface_caLeStateChangedCallback
+Java_org_iotivity_ca_CaLeClientInterface_caLeStateChangedCallback
 (JNIEnv *, jobject, jint);
 
 /*
- * Class:     org_iotivity_ca_caLeClientInterface
+ * Class:     org_iotivity_ca_CaLeClientInterface
  * Method:    caLeBondStateChangedCallback
  * Signature: (Ljava/lang/String;)V
  */
 JNIEXPORT void JNICALL
-Java_org_iotivity_ca_caLeClientInterface_caLeBondStateChangedCallback
+Java_org_iotivity_ca_CaLeClientInterface_caLeBondStateChangedCallback
 (JNIEnv *, jobject, jstring);
 
 /*
- * Class:     org_iotivity_ca_caLeClientInterface
+ * Class:     org_iotivity_ca_CaLeClientInterface
  * Method:    caManagerLeGattConnectionStateChangeCB
  * Signature: (Landroid/bluetooth/BluetoothGatt;II)V
  */
@@ -145,7 +145,7 @@ Java_org_iotivity_ca_CaLeClientInterface_caManagerLeGattConnectionStateChangeCB
 (JNIEnv *, jobject, jobject, jint, jint);
 
 /*
- * Class:     org_iotivity_ca_caLeClientInterface
+ * Class:     org_iotivity_ca_CaLeClientInterface
  * Method:    caManagerAdapterStateChangedCallback
  * Signature: (I)V
  */
@@ -154,7 +154,7 @@ Java_org_iotivity_ca_CaLeClientInterface_caManagerAdapterStateChangedCallback
 (JNIEnv *, jobject, jint);
 
 /*
- * Class:     org_iotivity_ca_caLeClientInterface
+ * Class:     org_iotivity_ca_CaLeClientInterface
  * Method:    caManagerBondStateChangedCallback
  * Signature: (Landroid/bluetooth/BluetoothDevice;)V
  */
@@ -163,7 +163,7 @@ Java_org_iotivity_ca_CaLeClientInterface_caManagerBondStateChangedCallback
 (JNIEnv *, jobject, jobject);
 
 /*
- * Class:     org_iotivity_ca_jar_caleinterface
+ * Class:     org_iotivity_ca_CaLeClientInterface
  * Method:    caManagerLeServicesDiscoveredCallback
  * Signature: (Landroid/bluetooth/BluetoothGatt;I)V
  */
@@ -172,7 +172,7 @@ Java_org_iotivity_ca_CaLeClientInterface_caManagerLeServicesDiscoveredCallback
 (JNIEnv *, jobject, jobject, jint);
 
 /*
- * Class:     org_iotivity_ca_jar_caleinterface
+ * Class:     org_iotivity_ca_CaLeClientInterface
  * Method:    caManagerLeRemoteRssiCallback
  * Signature: (Landroid/bluetooth/BluetoothGatt;II)V
  */

diff --git a/resource/csdk/connectivity/src/bt_le_adapter/android/org_iotivity_ca_CaLeServerInterface.h b/resource/csdk/connectivity/src/bt_le_adapter/android/org_iotivity_ca_CaLeServerInterface.h
index e00b788..ae066bb 100644 (file)
--- a/resource/csdk/connectivity/src/bt_le_adapter/android/org_iotivity_ca_CaLeServerInterface.h
+++ b/resource/csdk/connectivity/src/bt_le_adapter/android/org_iotivity_ca_CaLeServerInterface.h
@@ -19,103 +19,103 @@
  ******************************************************************/
 
 #include <jni.h>
-/* Header for class org_iotivity_ca_caLeServerInterface */
+/* Header for class org_iotivity_ca_CaLeServerInterface */
 
-#ifndef CA_Included_org_iotivity_ca_caLeServerInterface_H_
-#define CA_Included_org_iotivity_ca_caLeServerInterface_H_
+#ifndef CA_Included_org_iotivity_ca_CaLeServerInterface_H_
+#define CA_Included_org_iotivity_ca_CaLeServerInterface_H_
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
 /*
- * Class:     org_iotivity_ca_caLeServerInterface
+ * Class:     org_iotivity_ca_CaLeServerInterface
  * Method:    caLeRegisterGattServerCallback
  * Signature: (Landroid/bluetooth/BluetoothGattServerCallback;)V
  */
 JNIEXPORT void JNICALL
-Java_org_iotivity_ca_caLeServerInterface_caLeRegisterGattServerCallback
+Java_org_iotivity_ca_CaLeServerInterface_caLeRegisterGattServerCallback
 (JNIEnv *, jobject, jobject);
 
 /*
- * Class:     org_iotivity_ca_caLeServerInterface
+ * Class:     org_iotivity_ca_CaLeServerInterface
  * Method:    caLeRegisterBluetoothLeAdvertiseCallback
  * Signature: (Landroid/bluetooth/le/AdvertiseCallback;)V
  */
 JNIEXPORT void JNICALL
-Java_org_iotivity_ca_caLeServerInterface_caLeRegisterBluetoothLeAdvertiseCallback
+Java_org_iotivity_ca_CaLeServerInterface_caLeRegisterBluetoothLeAdvertiseCallback
 (JNIEnv *, jobject, jobject);
 
 /*
- * Class:     org_iotivity_ca_caLeServerInterface
+ * Class:     org_iotivity_ca_CaLeServerInterface
  * Method:    caLeGattServerConnectionStateChangeCallback
  * Signature: (Landroid/bluetooth/BluetoothDevice;II)V
  */
 JNIEXPORT void JNICALL
-Java_org_iotivity_ca_caLeServerInterface_caLeGattServerConnectionStateChangeCallback
+Java_org_iotivity_ca_CaLeServerInterface_caLeGattServerConnectionStateChangeCallback
 (JNIEnv *, jobject, jobject, jint, jint);
 
 /*
- * Class:     org_iotivity_ca_caLeServerInterface
+ * Class:     org_iotivity_ca_CaLeServerInterface
  * Method:    caLeGattServerNWConnectionStateChangeCallback
  * Signature: (Landroid/bluetooth/BluetoothDevice;II)V
  */
 JNIEXPORT void JNICALL
-Java_org_iotivity_ca_caLeServerInterface_caLeGattServerNWConnectionStateChangeCallback
+Java_org_iotivity_ca_CaLeServerInterface_caLeGattServerNWConnectionStateChangeCallback
 (JNIEnv *, jobject, jobject, jint, jint);
 
 /*
- * Class:     org_iotivity_ca_caLeServerInterface
+ * Class:     org_iotivity_ca_CaLeServerInterface
  * Method:    caLeGattServerServiceAddedCallback
  * Signature: (ILandroid/bluetooth/BluetoothGattService;)V
  */
 JNIEXPORT void JNICALL
-Java_org_iotivity_ca_caLeServerInterface_caLeGattServerServiceAddedCallback
+Java_org_iotivity_ca_CaLeServerInterface_caLeGattServerServiceAddedCallback
 (JNIEnv *, jobject, jint, jobject);
 
 /*
- * Class:     org_iotivity_ca_caLeServerInterface
+ * Class:     org_iotivity_ca_CaLeServerInterface
  * Method:    caLeGattServerCharacteristicReadRequestCallback
  * Signature: (Landroid/bluetooth/BluetoothDevice;[B)V
  */
 JNIEXPORT void JNICALL
-Java_org_iotivity_ca_caLeServerInterface_caLeGattServerCharacteristicReadRequestCallback
+Java_org_iotivity_ca_CaLeServerInterface_caLeGattServerCharacteristicReadRequestCallback
 (JNIEnv *, jobject, jobject, jbyteArray);
 
 /*
- * Class:     org_iotivity_ca_caLeServerInterface
+ * Class:     org_iotivity_ca_CaLeServerInterface
  * Method:    caLeGattServerCharacteristicWriteRequestCallback
  * Signature: (Landroid/bluetooth/BluetoothDevice;[B)V
  */
 JNIEXPORT void JNICALL
-Java_org_iotivity_ca_caLeServerInterface_caLeGattServerCharacteristicWriteRequestCallback
+Java_org_iotivity_ca_CaLeServerInterface_caLeGattServerCharacteristicWriteRequestCallback
 (JNIEnv *, jobject, jobject, jbyteArray);
 
 /*
- * Class:     org_iotivity_ca_caLeServerInterface
+ * Class:     org_iotivity_ca_CaLeServerInterface
  * Method:    caLeGattServerNotificationSentCallback
  * Signature: (Landroid/bluetooth/BluetoothDevice;I)V
  */
 JNIEXPORT void JNICALL
-Java_org_iotivity_ca_caLeServerInterface_caLeGattServerNotificationSentCallback
+Java_org_iotivity_ca_CaLeServerInterface_caLeGattServerNotificationSentCallback
 (JNIEnv *, jobject, jobject, jint);
 
 /*
- * Class:     org_iotivity_ca_caLeServerInterface
+ * Class:     org_iotivity_ca_CaLeServerInterface
  * Method:    caLeAdvertiseStartSuccessCallback
  * Signature: (Landroid/bluetooth/le/AdvertiseSettings;)V
  */
 JNIEXPORT void JNICALL
-Java_org_iotivity_ca_caLeServerInterface_caLeAdvertiseStartSuccessCallback
+Java_org_iotivity_ca_CaLeServerInterface_caLeAdvertiseStartSuccessCallback
 (JNIEnv *, jobject, jobject);
 
 /*
- * Class:     org_iotivity_ca_caLeServerInterface
+ * Class:     org_iotivity_ca_CaLeServerInterface
  * Method:    caLeAdvertiseStartFailureCallback
  * Signature: (I)V
  */
 JNIEXPORT void JNICALL
-Java_org_iotivity_ca_caLeServerInterface_caLeAdvertiseStartFailureCallback
+Java_org_iotivity_ca_CaLeServerInterface_caLeAdvertiseStartFailureCallback
 (JNIEnv *, jobject, jint);