replaced 'com' keyword with 'org' keyword
authorjihwan.seo <jihwan.seo@samsung.com>
Fri, 17 Apr 2015 06:31:42 +0000 (15:31 +0900)
committerErich Keane <erich.keane@intel.com>
Wed, 29 Apr 2015 16:40:52 +0000 (16:40 +0000)
'com' keyword has been changed in Android Sample App

Change-Id: I9c9e424cf767d8b01462c647345cadfb053840a0
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/763
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
resource/csdk/connectivity/samples/android/sample_service/AndroidManifest.xml
resource/csdk/connectivity/samples/android/sample_service/jni/ResourceModel.c
resource/csdk/connectivity/samples/android/sample_service/jni/com_iotivity_service_RMInterface.h [deleted file]
resource/csdk/connectivity/samples/android/sample_service/jni/org_iotivity_service_RMInterface.h [new file with mode: 0644]
resource/csdk/connectivity/samples/android/sample_service/res/layout/activity_main.xml
resource/csdk/connectivity/samples/android/sample_service/res/menu/main.xml
resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/jar/CALeInterface.java [moved from resource/csdk/connectivity/samples/android/sample_service/src/com/iotivity/jar/CALeInterface.java with 99% similarity]
resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/jar/CAWiFiInterface.java [moved from resource/csdk/connectivity/samples/android/sample_service/src/com/iotivity/jar/CAWiFiInterface.java with 98% similarity]
resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/service/DLog.java [moved from resource/csdk/connectivity/samples/android/sample_service/src/com/iotivity/service/DLog.java with 98% similarity]
resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/service/MainActivity.java [moved from resource/csdk/connectivity/samples/android/sample_service/src/com/iotivity/service/MainActivity.java with 99% similarity]
resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/service/RMInterface.java [moved from resource/csdk/connectivity/samples/android/sample_service/src/com/iotivity/service/RMInterface.java with 90% similarity]

index a65a9fe..91fcef9 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.iotivity.sample_service"
+    package="org.iotivity.sample_service"
     android:versionCode="1"
     android:versionName="1.0" >
 
@@ -13,7 +13,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name="com.iotivity.service.MainActivity"
+            android:name="org.iotivity.service.MainActivity"
             android:label="@string/app_name"
             android:windowSoftInputMode="stateHidden" >
             <intent-filter>
index 2bbb091..d7c5853 100644 (file)
@@ -7,7 +7,7 @@
 
 #include "cainterface.h"
 #include "cacommon.h"
-#include "com_iotivity_service_RMInterface.h"
+#include "org_iotivity_service_RMInterface.h"
 
 #define  LOG_TAG   "JNI_INTERFACE_SAMPLE"
 #define  LOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)
@@ -53,7 +53,7 @@ extern JavaVM *g_jvm;
 static CAToken_t g_clientToken;
 static uint8_t g_clientTokenLength = NULL;
 // init
-JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_setNativeResponseListener
+JNIEXPORT void JNICALL Java_org_iotivity_service_RMInterface_setNativeResponseListener
     (JNIEnv *env, jobject obj, jobject listener){
     LOGI("setNativeResponseListener");
     g_responseListenerObject = (*env)->NewGlobalRef(env, obj);
@@ -143,7 +143,7 @@ bool SetCredentials()
 }
 #endif
 
-JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMInitialize
+JNIEXPORT void JNICALL Java_org_iotivity_service_RMInterface_RMInitialize
   (JNIEnv *env, jobject obj, jobject context)
 {
     LOGI("RMInitialize");
@@ -176,14 +176,14 @@ JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMInitialize
     }
 }
 
-JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMTerminate(JNIEnv *env, jobject obj)
+JNIEXPORT void JNICALL Java_org_iotivity_service_RMInterface_RMTerminate(JNIEnv *env, jobject obj)
 {
     LOGI("RMTerminate");
 
     CATerminate();
 }
 
-JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMStartListeningServer(JNIEnv *env,
+JNIEXPORT void JNICALL Java_org_iotivity_service_RMInterface_RMStartListeningServer(JNIEnv *env,
     jobject obj)
 {
     LOGI("RMStartListeningServer");
@@ -194,7 +194,7 @@ JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMStartListeningSer
     }
 }
 
-JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMStartDiscoveryServer(JNIEnv *env,
+JNIEXPORT void JNICALL Java_org_iotivity_service_RMInterface_RMStartDiscoveryServer(JNIEnv *env,
     jobject obj)
 {
     LOGI("RMStartDiscoveryServer");
@@ -205,7 +205,7 @@ JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMStartDiscoverySer
     }
 }
 
-JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMRegisterHandler(JNIEnv *env,
+JNIEXPORT void JNICALL Java_org_iotivity_service_RMInterface_RMRegisterHandler(JNIEnv *env,
     jobject obj)
 {
     LOGI("RMRegisterHandler");
@@ -213,7 +213,7 @@ JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMRegisterHandler(J
     CARegisterHandler(request_handler, response_handler);
 }
 
-JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMFindResource(JNIEnv *env,
+JNIEXPORT void JNICALL Java_org_iotivity_service_RMInterface_RMFindResource(JNIEnv *env,
         jobject obj, jstring uri)
 {
     const char* strUri = (*env)->GetStringUTFChars(env, uri, NULL);
@@ -249,7 +249,7 @@ JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMFindResource(JNIE
     }
 }
 
-JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMSendRequest(JNIEnv *env,
+JNIEXPORT void JNICALL Java_org_iotivity_service_RMInterface_RMSendRequest(JNIEnv *env,
         jobject obj, jstring uri, jstring payload, jint selectedNetwork, jint isSecured,
         jint msgType)
 {
@@ -349,7 +349,7 @@ JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMSendRequest(JNIEn
     CADestroyRemoteEndpoint(endpoint);
 }
 
-JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMSendResponse(JNIEnv *env,
+JNIEXPORT void JNICALL Java_org_iotivity_service_RMInterface_RMSendResponse(JNIEnv *env,
     jobject obj, jstring uri, jstring payload, jint selectedNetwork, jint isSecured)
 {
     LOGI("RMSendResponse");
@@ -450,7 +450,7 @@ JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMSendResponse(JNIE
     CADestroyRemoteEndpoint(endpoint);
 }
 
-JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMAdvertiseResource(JNIEnv *env,
+JNIEXPORT void JNICALL Java_org_iotivity_service_RMInterface_RMAdvertiseResource(JNIEnv *env,
     jobject obj, jstring uri, jint selectedNetwork)
 {
     LOGI("RMAdvertiseResource");
@@ -492,7 +492,7 @@ JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMAdvertiseResource
     free(headerOpt);
 }
 
-JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMSendNotification(JNIEnv *env,
+JNIEXPORT void JNICALL Java_org_iotivity_service_RMInterface_RMSendNotification(JNIEnv *env,
     jobject obj, jstring uri, jstring payload, jint selectedNetwork, jint isSecured)
 {
     const char* strUri = (*env)->GetStringUTFChars(env, uri, NULL);
@@ -590,7 +590,7 @@ JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMSendNotification(
     CADestroyRemoteEndpoint(endpoint);
 }
 
-JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMSelectNetwork(JNIEnv *env, jobject obj,
+JNIEXPORT void JNICALL Java_org_iotivity_service_RMInterface_RMSelectNetwork(JNIEnv *env, jobject obj,
     jint networkType)
 {
     LOGI("RMSelectNetwork Type : %d", networkType);
@@ -601,7 +601,7 @@ JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMSelectNetwork(JNI
     }
 }
 
-JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMHandleRequestResponse(JNIEnv *env,
+JNIEXPORT void JNICALL Java_org_iotivity_service_RMInterface_RMHandleRequestResponse(JNIEnv *env,
     jobject obj)
 {
     LOGI("RMHandleRequestResponse");
diff --git a/resource/csdk/connectivity/samples/android/sample_service/jni/com_iotivity_service_RMInterface.h b/resource/csdk/connectivity/samples/android/sample_service/jni/com_iotivity_service_RMInterface.h
deleted file mode 100644 (file)
index ad39dcf..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-#include <jni.h>
-/* Header for class com_iotivity_service_RMInterface */
-
-#ifndef _Included_com_iotivity_service_RMInterface
-#define _Included_com_iotivity_service_RMInterface
-#ifdef __cplusplus
-extern "C" {
-#endif
-JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_setNativeResponseListener
-  (JNIEnv *, jobject, jobject);
-/*
- * Class:     com_iotivity_service_RMInterface
- * Method:    RMInitialize
- * Signature: (Landroid/content/Context;)V
- */
-JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMInitialize
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     com_iotivity_service_RMInterface
- * Method:    RMTerminate
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMTerminate
-  (JNIEnv *, jobject);
-
-/*
- * Class:     com_iotivity_service_RMInterface
- * Method:    RMStartListeningServer
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMStartListeningServer
-  (JNIEnv *, jobject);
-
-/*
- * Class:     com_iotivity_service_RMInterface
- * Method:    RMStartDiscoveryServer
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMStartDiscoveryServer
-  (JNIEnv *, jobject);
-
-/*
- * Class:     com_iotivity_service_RMInterface
- * Method:    RMRegisterHandler
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMRegisterHandler
-  (JNIEnv *, jobject);
-
-/*
- * Class:     com_iotivity_service_RMInterface
- * Method:    RMFindResource
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMFindResource
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     com_iotivity_service_RMInterface
- * Method:    RMSendRequest
- * Signature: (Ljava/lang/String;III)V
- */
-JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMSendRequest
-  (JNIEnv *, jobject, jstring, jstring, jint, jint, jint);
-
-/*
- * Class:     com_iotivity_service_RMInterface
- * Method:    RMSendResponse
- * Signature: (Ljava/lang/String;III)V
- */
-JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMSendResponse
-  (JNIEnv *, jobject, jstring, jstring, jint, jint);
-
-/*
- * Class:     com_iotivity_service_RMInterface
- * Method:    RMAdvertiseResource
- * Signature: (Ljava/lang/String;I)V
- */
-JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMAdvertiseResource
-  (JNIEnv *, jobject, jstring, jint);
-
-/*
- * Class:     com_iotivity_service_RMInterface
- * Method:    RMSendNotification
- * Signature: (Ljava/lang/String;I)V
- */
-JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMSendNotification
-  (JNIEnv *, jobject, jstring, jstring, jint, jint);
-
-/*
- * Class:     com_iotivity_service_RMInterface
- * Method:    RMSelectNetwork
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMSelectNetwork
-  (JNIEnv *, jobject, jint);
-
-/*
- * Class:     com_iotivity_service_RMInterface
- * Method:    RMHandleRequestResponse
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_com_iotivity_service_RMInterface_RMHandleRequestResponse
-  (JNIEnv *, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-
diff --git a/resource/csdk/connectivity/samples/android/sample_service/jni/org_iotivity_service_RMInterface.h b/resource/csdk/connectivity/samples/android/sample_service/jni/org_iotivity_service_RMInterface.h
new file mode 100644 (file)
index 0000000..38dd195
--- /dev/null
@@ -0,0 +1,111 @@
+#include <jni.h>
+/* Header for class org_iotivity_service_RMInterface */
+
+#ifndef _Included_org_iotivity_service_RMInterface
+#define _Included_org_iotivity_service_RMInterface
+#ifdef __cplusplus
+extern "C" {
+#endif
+JNIEXPORT void JNICALL Java_org_iotivity_service_RMInterface_setNativeResponseListener
+  (JNIEnv *, jobject, jobject);
+/*
+ * Class:     org_iotivity_service_RMInterface
+ * Method:    RMInitialize
+ * Signature: (Landroid/content/Context;)V
+ */
+JNIEXPORT void JNICALL Java_org_iotivity_service_RMInterface_RMInitialize
+  (JNIEnv *, jobject, jobject);
+
+/*
+ * Class:     org_iotivity_service_RMInterface
+ * Method:    RMTerminate
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_iotivity_service_RMInterface_RMTerminate
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_iotivity_service_RMInterface
+ * Method:    RMStartListeningServer
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_iotivity_service_RMInterface_RMStartListeningServer
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_iotivity_service_RMInterface
+ * Method:    RMStartDiscoveryServer
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_iotivity_service_RMInterface_RMStartDiscoveryServer
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_iotivity_service_RMInterface
+ * Method:    RMRegisterHandler
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_iotivity_service_RMInterface_RMRegisterHandler
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_iotivity_service_RMInterface
+ * Method:    RMFindResource
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_org_iotivity_service_RMInterface_RMFindResource
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     org_iotivity_service_RMInterface
+ * Method:    RMSendRequest
+ * Signature: (Ljava/lang/String;III)V
+ */
+JNIEXPORT void JNICALL Java_org_iotivity_service_RMInterface_RMSendRequest
+  (JNIEnv *, jobject, jstring, jstring, jint, jint, jint);
+
+/*
+ * Class:     org_iotivity_service_RMInterface
+ * Method:    RMSendResponse
+ * Signature: (Ljava/lang/String;III)V
+ */
+JNIEXPORT void JNICALL Java_org_iotivity_service_RMInterface_RMSendResponse
+  (JNIEnv *, jobject, jstring, jstring, jint, jint);
+
+/*
+ * Class:     org_iotivity_service_RMInterface
+ * Method:    RMAdvertiseResource
+ * Signature: (Ljava/lang/String;I)V
+ */
+JNIEXPORT void JNICALL Java_org_iotivity_service_RMInterface_RMAdvertiseResource
+  (JNIEnv *, jobject, jstring, jint);
+
+/*
+ * Class:     org_iotivity_service_RMInterface
+ * Method:    RMSendNotification
+ * Signature: (Ljava/lang/String;I)V
+ */
+JNIEXPORT void JNICALL Java_org_iotivity_service_RMInterface_RMSendNotification
+  (JNIEnv *, jobject, jstring, jstring, jint, jint);
+
+/*
+ * Class:     org_iotivity_service_RMInterface
+ * Method:    RMSelectNetwork
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL Java_org_iotivity_service_RMInterface_RMSelectNetwork
+  (JNIEnv *, jobject, jint);
+
+/*
+ * Class:     org_iotivity_service_RMInterface
+ * Method:    RMHandleRequestResponse
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_iotivity_service_RMInterface_RMHandleRequestResponse
+  (JNIEnv *, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
+
index 3b7182d..2bbabd1 100644 (file)
@@ -6,7 +6,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="com.iotivity.service.MainActivity" >
+    tools:context="org.iotivity.service.MainActivity" >
 
     <RelativeLayout
         android:id="@+id/sample_service_layout"
index 5cf50b6..ae3d56a 100644 (file)
@@ -1,6 +1,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.iotivity.sample_service.MainActivity" >
+    tools:context="org.iotivity.sample_service.MainActivity" >
 
     <item
         android:id="@+id/action_settings"
@@ -1,4 +1,4 @@
-package com.iotivity.service;
+package org.iotivity.service;
 
 import java.util.ArrayList;
 
@@ -16,7 +16,7 @@ import android.widget.EditText;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.iotivity.sample_service.R;
+import org.iotivity.sample_service.R;
 
 public class MainActivity extends Activity {
 
@@ -1,4 +1,4 @@
-package com.iotivity.service;
+package org.iotivity.service;
 
 import android.content.Context;
 
@@ -12,7 +12,7 @@ public class RMInterface {
         System.loadLibrary("CAInterface");
     }
 
-    private com.iotivity.service.MainActivity mResponseListener = null;
+    private org.iotivity.service.MainActivity mResponseListener = null;
 
     public native void setNativeResponseListener(Object listener);
 
@@ -44,7 +44,7 @@ public class RMInterface {
 
     public native void RMHandleRequestResponse();
 
-    public void setResponseListener(com.iotivity.service.MainActivity listener) {
+    public void setResponseListener(org.iotivity.service.MainActivity listener) {
         mResponseListener = listener;
         setNativeResponseListener(this);
     }