[Resource-container] Updated the Java SDK

- Renamed sdk's service folder to resource-container
- restructured the .so's dependencies between RE and RC.

Change-Id: I96f6cd592e002d39655067b772d433e3eb12cc26
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3723
Reviewed-by: Markus Jung <markus.jung@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

diff --git a/service/resource-container/android/SConscript b/service/resource-container/android/SConscript
index 41af943..ce0d922 100644 (file)
--- a/service/resource-container/android/SConscript
+++ b/service/resource-container/android/SConscript
@@ -44,15 +44,15 @@ if not os.path.exists(android_home + '/platforms/android-21') or not os.path.exi
 
 
 def ensure_libs(target, source, env):
-    return target, [source, env.get('BUILD_DIR') + 'librcs_server.so', 
+    return target, [source, env.get('BUILD_DIR') + 'librcs_server.so',
                     env.get('BUILD_DIR') + 'librcs_client.so',
                     env.get('BUILD_DIR') + 'librcs_container.so']
 
 jdk_env = Environment(ENV=os.environ)
-jdk_env['BUILDERS']['Gradle'] = Builder(action = env.get('ANDROID_GRADLE') + 
+jdk_env['BUILDERS']['Gradle'] = Builder(action = env.get('ANDROID_GRADLE') +
     ' build -bservice/resource-container/android/build.gradle -PTARGET_ARCH=%s -PRELEASE=%s --stacktrace' %(ANDROID_TARGET_ARCH, ANDROID_RELEASE),
     emitter = ensure_libs)
 jdk_env['BUILD_DIR'] = env.get('BUILD_DIR')
 
-jdk_env.Gradle(target="service/objs", 
-    source="service/src/main/java/org/iotivity/service/resourcecontainer/RcsBundleInfo.java")
+jdk_env.Gradle(target="service/objs",
+    source="resource-container/src/main/java/org/iotivity/service/resourcecontainer/RcsBundleInfo.java")

diff --git a/service/resource-container/android/service/base.iml b/service/resource-container/android/resource-container/base.iml
similarity index 100%
rename from service/resource-container/android/service/base.iml
rename to service/resource-container/android/resource-container/base.iml

diff --git a/service/resource-container/android/service/build.gradle b/service/resource-container/android/resource-container/build.gradle
similarity index 100%
rename from service/resource-container/android/service/build.gradle
rename to service/resource-container/android/resource-container/build.gradle

diff --git a/service/resource-container/android/service/proguard-rules.pro b/service/resource-container/android/resource-container/proguard-rules.pro
similarity index 100%
rename from service/resource-container/android/service/proguard-rules.pro
rename to service/resource-container/android/resource-container/proguard-rules.pro

diff --git a/service/resource-container/android/service/src/main/AndroidManifest.xml b/service/resource-container/android/resource-container/src/main/AndroidManifest.xml
similarity index 100%
rename from service/resource-container/android/service/src/main/AndroidManifest.xml
rename to service/resource-container/android/resource-container/src/main/AndroidManifest.xml

diff --git a/service/resource-container/android/service/src/main/java/org/iotivity/service/resourcecontainer/RcsBundleInfo.java b/service/resource-container/android/resource-container/src/main/java/org/iotivity/service/resourcecontainer/RcsBundleInfo.java
similarity index 100%
rename from service/resource-container/android/service/src/main/java/org/iotivity/service/resourcecontainer/RcsBundleInfo.java
rename to service/resource-container/android/resource-container/src/main/java/org/iotivity/service/resourcecontainer/RcsBundleInfo.java

diff --git a/service/resource-container/android/service/src/main/java/org/iotivity/service/resourcecontainer/RcsResourceContainer.java b/service/resource-container/android/resource-container/src/main/java/org/iotivity/service/resourcecontainer/RcsResourceContainer.java
similarity index 100%
rename from service/resource-container/android/service/src/main/java/org/iotivity/service/resourcecontainer/RcsResourceContainer.java
rename to service/resource-container/android/resource-container/src/main/java/org/iotivity/service/resourcecontainer/RcsResourceContainer.java

diff --git a/service/resource-container/android/service/src/main/java/org/iotivity/service/utils/RcsException.java b/service/resource-container/android/resource-container/src/main/java/org/iotivity/service/utils/RcsException.java
similarity index 100%
rename from service/resource-container/android/service/src/main/java/org/iotivity/service/utils/RcsException.java
rename to service/resource-container/android/resource-container/src/main/java/org/iotivity/service/utils/RcsException.java

diff --git a/service/resource-container/android/service/src/main/java/org/iotivity/service/utils/RcsIllegalStateException.java b/service/resource-container/android/resource-container/src/main/java/org/iotivity/service/utils/RcsIllegalStateException.java
similarity index 100%
rename from service/resource-container/android/service/src/main/java/org/iotivity/service/utils/RcsIllegalStateException.java
rename to service/resource-container/android/resource-container/src/main/java/org/iotivity/service/utils/RcsIllegalStateException.java

diff --git a/service/resource-container/android/service/src/main/java/org/iotivity/service/utils/RcsObject.java b/service/resource-container/android/resource-container/src/main/java/org/iotivity/service/utils/RcsObject.java
similarity index 100%
rename from service/resource-container/android/service/src/main/java/org/iotivity/service/utils/RcsObject.java
rename to service/resource-container/android/resource-container/src/main/java/org/iotivity/service/utils/RcsObject.java

diff --git a/service/resource-container/android/service/src/main/java/org/iotivity/service/utils/RcsPlatformException.java b/service/resource-container/android/resource-container/src/main/java/org/iotivity/service/utils/RcsPlatformException.java
similarity index 100%
rename from service/resource-container/android/service/src/main/java/org/iotivity/service/utils/RcsPlatformException.java
rename to service/resource-container/android/resource-container/src/main/java/org/iotivity/service/utils/RcsPlatformException.java

diff --git a/service/resource-container/android/service/src/main/jni/Android.mk b/service/resource-container/android/resource-container/src/main/jni/Android.mk
similarity index 67%
rename from service/resource-container/android/service/src/main/jni/Android.mk
rename to service/resource-container/android/resource-container/src/main/jni/Android.mk
index 6a5bb1b..7a01fc1 100644 (file)
--- a/service/resource-container/android/service/src/main/jni/Android.mk
+++ b/service/resource-container/android/resource-container/src/main/jni/Android.mk
@@ -4,26 +4,14 @@ ROOT_PATH := ../../../../../../..
 IOTIVITY_LIB_PATH := $(ROOT_PATH)/out/android/$(TARGET_ARCH_ABI)/$(APP_OPTIM)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := rcs_common
-LOCAL_SRC_FILES := $(IOTIVITY_LIB_PATH)/librcs_common.so
-include $(PREBUILT_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := rcs_client
-LOCAL_SRC_FILES := $(IOTIVITY_LIB_PATH)/librcs_client.so
-include $(PREBUILT_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := rcs_server
-LOCAL_SRC_FILES := $(IOTIVITY_LIB_PATH)/librcs_server.so
-include $(PREBUILT_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
 LOCAL_MODULE := rcs_container
 LOCAL_SRC_FILES := $(IOTIVITY_LIB_PATH)/librcs_container.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
+LOCAL_LDLIBS := -L$(LOCAL_PATH)/$(IOTIVITY_LIB_PATH)/
+LOCAL_LDLIBS += -lrcs_common
+
 OIC_SRC_DIR := ../../../../../..
 LOCAL_MODULE := resource_container_jni
 
@@ -40,11 +28,8 @@ LOCAL_SRC_FILES += $(patsubst $(LOCAL_PATH)/%, %, $(wildcard $(LOCAL_PATH)/*.cpp
 
 LOCAL_CPPFLAGS := -std=c++0x -frtti -fexceptions
 
-LOCAL_LDLIBS := -llog
+LOCAL_LDLIBS += -llog
 
-LOCAL_SHARED_LIBRARIES += rcs_common
-LOCAL_SHARED_LIBRARIES += rcs_client
-LOCAL_SHARED_LIBRARIES += rcs_server
 LOCAL_SHARED_LIBRARIES += rcs_container
 
 include $(BUILD_SHARED_LIBRARY)

diff --git a/service/resource-container/android/service/src/main/jni/Application.mk b/service/resource-container/android/resource-container/src/main/jni/Application.mk
similarity index 100%
rename from service/resource-container/android/service/src/main/jni/Application.mk
rename to service/resource-container/android/resource-container/src/main/jni/Application.mk

diff --git a/service/resource-container/android/service/src/main/jni/JniMain.cpp b/service/resource-container/android/resource-container/src/main/jni/JniMain.cpp
similarity index 100%
rename from service/resource-container/android/service/src/main/jni/JniMain.cpp
rename to service/resource-container/android/resource-container/src/main/jni/JniMain.cpp

diff --git a/service/resource-container/android/service/src/main/jni/JniRcsBundleInfo.cpp b/service/resource-container/android/resource-container/src/main/jni/JniRcsBundleInfo.cpp
similarity index 100%
rename from service/resource-container/android/service/src/main/jni/JniRcsBundleInfo.cpp
rename to service/resource-container/android/resource-container/src/main/jni/JniRcsBundleInfo.cpp

diff --git a/service/resource-container/android/service/src/main/jni/JniRcsBundleInfo.h b/service/resource-container/android/resource-container/src/main/jni/JniRcsBundleInfo.h
similarity index 100%
rename from service/resource-container/android/service/src/main/jni/JniRcsBundleInfo.h
rename to service/resource-container/android/resource-container/src/main/jni/JniRcsBundleInfo.h

diff --git a/service/resource-container/android/service/src/main/jni/JniRcsObject.cpp b/service/resource-container/android/resource-container/src/main/jni/JniRcsObject.cpp
similarity index 100%
rename from service/resource-container/android/service/src/main/jni/JniRcsObject.cpp
rename to service/resource-container/android/resource-container/src/main/jni/JniRcsObject.cpp

diff --git a/service/resource-container/android/service/src/main/jni/JniRcsObject.h b/service/resource-container/android/resource-container/src/main/jni/JniRcsObject.h
similarity index 100%
rename from service/resource-container/android/service/src/main/jni/JniRcsObject.h
rename to service/resource-container/android/resource-container/src/main/jni/JniRcsObject.h

diff --git a/service/resource-container/android/service/src/main/jni/JniRcsResourceContainer.cpp b/service/resource-container/android/resource-container/src/main/jni/JniRcsResourceContainer.cpp
similarity index 100%
rename from service/resource-container/android/service/src/main/jni/JniRcsResourceContainer.cpp
rename to service/resource-container/android/resource-container/src/main/jni/JniRcsResourceContainer.cpp

diff --git a/service/resource-container/android/service/src/main/jni/JniRcsResourceContainer.h b/service/resource-container/android/resource-container/src/main/jni/JniRcsResourceContainer.h
similarity index 100%
rename from service/resource-container/android/service/src/main/jni/JniRcsResourceContainer.h
rename to service/resource-container/android/resource-container/src/main/jni/JniRcsResourceContainer.h

diff --git a/service/resource-container/android/service/src/main/jni/util/JNIEnvWrapper.h b/service/resource-container/android/resource-container/src/main/jni/util/JNIEnvWrapper.h
similarity index 100%
rename from service/resource-container/android/service/src/main/jni/util/JNIEnvWrapper.h
rename to service/resource-container/android/resource-container/src/main/jni/util/JNIEnvWrapper.h

diff --git a/service/resource-container/android/service/src/main/jni/util/JavaClasses.cpp b/service/resource-container/android/resource-container/src/main/jni/util/JavaClasses.cpp
similarity index 100%
rename from service/resource-container/android/service/src/main/jni/util/JavaClasses.cpp
rename to service/resource-container/android/resource-container/src/main/jni/util/JavaClasses.cpp

diff --git a/service/resource-container/android/service/src/main/jni/util/JavaClasses.h b/service/resource-container/android/resource-container/src/main/jni/util/JavaClasses.h
similarity index 100%
rename from service/resource-container/android/service/src/main/jni/util/JavaClasses.h
rename to service/resource-container/android/resource-container/src/main/jni/util/JavaClasses.h

diff --git a/service/resource-container/android/service/src/main/jni/util/JavaExceptions.cpp b/service/resource-container/android/resource-container/src/main/jni/util/JavaExceptions.cpp
similarity index 100%
rename from service/resource-container/android/service/src/main/jni/util/JavaExceptions.cpp
rename to service/resource-container/android/resource-container/src/main/jni/util/JavaExceptions.cpp

diff --git a/service/resource-container/android/service/src/main/jni/util/JavaExceptions.h b/service/resource-container/android/resource-container/src/main/jni/util/JavaExceptions.h
similarity index 100%
rename from service/resource-container/android/service/src/main/jni/util/JavaExceptions.h
rename to service/resource-container/android/resource-container/src/main/jni/util/JavaExceptions.h

diff --git a/service/resource-container/android/service/src/main/jni/util/JavaGlobalRef.h b/service/resource-container/android/resource-container/src/main/jni/util/JavaGlobalRef.h
similarity index 100%
rename from service/resource-container/android/service/src/main/jni/util/JavaGlobalRef.h
rename to service/resource-container/android/resource-container/src/main/jni/util/JavaGlobalRef.h

diff --git a/service/resource-container/android/service/src/main/jni/util/JavaLocalRef.h b/service/resource-container/android/resource-container/src/main/jni/util/JavaLocalRef.h
similarity index 100%
rename from service/resource-container/android/service/src/main/jni/util/JavaLocalRef.h
rename to service/resource-container/android/resource-container/src/main/jni/util/JavaLocalRef.h

diff --git a/service/resource-container/android/service/src/main/jni/util/Log.h b/service/resource-container/android/resource-container/src/main/jni/util/Log.h
similarity index 100%
rename from service/resource-container/android/service/src/main/jni/util/Log.h
rename to service/resource-container/android/resource-container/src/main/jni/util/Log.h

diff --git a/service/resource-container/android/service/src/main/jni/util/ScopedEnv.h b/service/resource-container/android/resource-container/src/main/jni/util/ScopedEnv.h
similarity index 100%
rename from service/resource-container/android/service/src/main/jni/util/ScopedEnv.h
rename to service/resource-container/android/resource-container/src/main/jni/util/ScopedEnv.h

diff --git a/service/resource-container/android/service/src/main/jni/util/Verify.h b/service/resource-container/android/resource-container/src/main/jni/util/Verify.h
similarity index 100%
rename from service/resource-container/android/service/src/main/jni/util/Verify.h
rename to service/resource-container/android/resource-container/src/main/jni/util/Verify.h

diff --git a/service/resource-container/android/settings.gradle b/service/resource-container/android/settings.gradle
index 5b8f4d4..a7c0cda 100644 (file)
--- a/service/resource-container/android/settings.gradle
+++ b/service/resource-container/android/settings.gradle
@@ -20,4 +20,4 @@
  * //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
  */
 
-include ':service'
+include ':resource-container'

diff --git a/service/resource-container/examples/android/RCSampleServerApp/README b/service/resource-container/examples/android/RCSampleServerApp/README
index 4a87b04..b0dd604 100644 (file)
--- a/service/resource-container/examples/android/RCSampleServerApp/README
+++ b/service/resource-container/examples/android/RCSampleServerApp/README
@@ -4,7 +4,8 @@ To build the app
 
 2. Copy aar files into app/libs folder
    - {Iotivity_root}/android/android_api/base/build/outputs/aar/iotivity-{TARGET_ARCH}-base-{MODE}.aar
-   - {Iotivity_root}/service/resource-container/android/service/build/outputs/aar/iotivity-{TARGET_ARCH}-service-{MODE}.aar
+   - {Iotivity_root}/service/resource-encapsulation/android/service/build/outputs/aar/iotivity-{TARGET_ARCH}-service-{MODE}.aar
+   - {Iotivity_root}/service/resource-container/android/resource-container/build/outputs/aar/iotivity-{TARGET_ARCH}-resource-container-{MODE}.aar
 
 3. Configure dependencies for libs in app/build.gradle
    - default TARGET_ARCH is armeabi
@@ -17,7 +18,8 @@ To build the app
    then, dependencies should be modified like below
 
    dependencies {
-      compile(name:'iotivity-x86-service-debug', ext:'aar')
       compile(name:'iotivity-x86-base-debug', ext:'aar')
+      compile(name:'iotivity-x86-service-debug', ext:'aar')
+      compile(name:'iotivity-x86-resource-container-debug', ext:'aar')
    }
    

diff --git a/service/resource-container/examples/android/RCSampleServerApp/app/app.iml b/service/resource-container/examples/android/RCSampleServerApp/app/app.iml
index 8501ed3..2d5414e 100644 (file)
--- a/service/resource-container/examples/android/RCSampleServerApp/app/app.iml
+++ b/service/resource-container/examples/android/RCSampleServerApp/app/app.iml
@@ -84,6 +84,7 @@
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="iotivity-service-release-" level="project" />
+    <orderEntry type="library" exported="" name="iotivity-resource-container-release-" level="project" />
     <orderEntry type="library" exported="" name="iotivity-base-release-" level="project" />
   </component>
 </module>

diff --git a/service/resource-container/examples/android/RCSampleServerApp/app/build.gradle b/service/resource-container/examples/android/RCSampleServerApp/app/build.gradle
index 2ba29fc..bcb90e5 100644 (file)
--- a/service/resource-container/examples/android/RCSampleServerApp/app/build.gradle
+++ b/service/resource-container/examples/android/RCSampleServerApp/app/build.gradle
@@ -21,6 +21,7 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile(name:'iotivity-service-release', ext:'aar')
     compile(name:'iotivity-base-release', ext:'aar')
+    compile(name:'iotivity-service-release', ext:'aar')
+    compile(name:'iotivity-resource-container-release', ext:'aar')
 }

diff --git a/service/resource-container/examples/android/RCSampleServerApp/app/src/main/java/org/iotivity/service/sample/container/ResourceContainer.java b/service/resource-container/examples/android/RCSampleServerApp/app/src/main/java/org/iotivity/service/sample/container/ResourceContainer.java
index e8ab3fa..5c051de 100644 (file)
--- a/service/resource-container/examples/android/RCSampleServerApp/app/src/main/java/org/iotivity/service/sample/container/ResourceContainer.java
+++ b/service/resource-container/examples/android/RCSampleServerApp/app/src/main/java/org/iotivity/service/sample/container/ResourceContainer.java
@@ -189,8 +189,8 @@ public class ResourceContainer {
     public void removeBMIBundle() {
 
         List<RcsBundleInfo> bundleList = containerInstance.listBundles();
-        if (0 == bundleList.size()) {
-            logMessage = "No bundle to remove" + "\n";
+        if (1 == bundleList.size()) {
+            logMessage = "BMI Bundle not added" + "\n";
 
         } else {