From: Minji Park Date: Wed, 30 Sep 2015 07:45:24 +0000 (+0900) Subject: change location of resource container directory X-Git-Tag: 1.2.0+RC1~979 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a3321ff49845c27675d005faa2cf2e98bed8f743;p=platform%2Fupstream%2Fiotivity.git change location of resource container directory - relocate the directory of resource container out of resource-encapsulation directory - change sconscript for changed directory location Change-Id: I912149cb7f3fe6b640b07108570c2fe9dd78fd1d Signed-off-by: Minji Park Reviewed-on: https://gerrit.iotivity.org/gerrit/3301 Tested-by: jenkins-iotivity Reviewed-by: Madan Lanka --- diff --git a/service/SConscript b/service/SConscript index 54c4acd..f5a4993 100644 --- a/service/SConscript +++ b/service/SConscript @@ -36,6 +36,10 @@ if target_os not in ['arduino','darwin']: # Build resource-encapsulation project SConscript('resource-encapsulation/SConscript') + # Build resource-container project + if target_os not in ['android', 'tizen']: + SConscript('resource-container/SConscript') + # Build simulator module if target_os in ['linux'] and env.get('SIMULATOR', False): SConscript('simulator/SConscript') diff --git a/service/resource-encapsulation/src/resourceContainer/SConscript b/service/resource-container/SConscript similarity index 50% rename from service/resource-encapsulation/src/resourceContainer/SConscript rename to service/resource-container/SConscript index a4ec4a3..aaded92 100644 --- a/service/resource-encapsulation/src/resourceContainer/SConscript +++ b/service/resource-container/SConscript @@ -46,128 +46,131 @@ target_os = env.get('TARGET_OS') ###################################################################### if int(containerJavaSupport): - try: - print 'Java Home: ', os.environ['JAVA_HOME'] - print 'Java Lib: ', os.environ['JAVA_LIB'] - resource_container_env.Append(CPPDEFINES={'JAVA_SUPPORT':1}) - except KeyError: - print ''' - *********************************** Error ************************************* - * Building resource container without Java support. JAVA_HOME or JAVA_LIB are not set properly - * Please configure JAVA_HOME to point to your Java 7 JDK and - * JAVA_LIB to your folder containing libjvm - * Example: export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-i386 - * export JAVA_LIB=/usr/lib/jvm/java-7-openjdk-i386/jre/lib/i386/server - ******************************************************************************* - ''' - resource_container_env.Append(CPPDEFINES={'JAVA_SUPPORT':0}) + try: + print 'Java Home: ', os.environ['JAVA_HOME'] + print 'Java Lib: ', os.environ['JAVA_LIB'] + resource_container_env.Append(CPPDEFINES={'JAVA_SUPPORT':1}) + except KeyError: + print ''' + *********************************** Error ************************************* + * Building resource container without Java support. JAVA_HOME or JAVA_LIB are not set properly + * Please configure JAVA_HOME to point to your Java 7 JDK and + * JAVA_LIB to your folder containing libjvm + * Example: export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-i386 + * export JAVA_LIB=/usr/lib/jvm/java-7-openjdk-i386/jre/lib/i386/server + ******************************************************************************* + ''' + resource_container_env.Append(CPPDEFINES={'JAVA_SUPPORT':0}) resource_container_env.AppendUnique( - CPPPATH = [ - env.get('SRC_DIR')+'/extlibs', - '../../include', - 'include', - 'bundle-api/include', - 'src' - ]) + CPPPATH = [ + env.get('SRC_DIR')+'/extlibs', + '../resource-encapsulation/include', + 'include', + 'bundle-api/include', + 'src' + ]) if int(containerJavaSupport): - try: - resource_container_env.AppendUnique( - CPPPATH = [ - os.environ['JAVA_HOME']+'/include', - os.environ['JAVA_HOME']+'/include/linux' - ]) - except KeyError: - print '' + try: + resource_container_env.AppendUnique( + CPPPATH = [ + os.environ['JAVA_HOME']+'/include', + os.environ['JAVA_HOME']+'/include/linux' + ]) + except KeyError: + print '' if target_os not in ['windows', 'winrt']: - resource_container_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall']) - if target_os != 'android': - resource_container_env.AppendUnique(CXXFLAGS = ['-pthread']) + resource_container_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall']) + if target_os != 'android': + resource_container_env.AppendUnique(CXXFLAGS = ['-pthread']) if target_os not in ['darwin', 'ios', 'windows', 'winrt']: - resource_container_env.AppendUnique(LINKFLAGS = ['-Wl,--no-undefined']) + resource_container_env.AppendUnique(LINKFLAGS = ['-Wl,--no-undefined']) if target_os == 'android': - resource_container_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions']) - resource_container_env.PrependUnique(LIBS = ['gnustl_shared', 'log']) + resource_container_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions']) + resource_container_env.PrependUnique(LIBS = ['gnustl_shared', 'log']) try: - resource_container_env.AppendUnique(LIBPATH = [os.environ['JAVA_LIB']]) + resource_container_env.AppendUnique(LIBPATH = [os.environ['JAVA_LIB']]) except KeyError: - print '' + print '' resource_container_env.PrependUnique(LIBS = ['rcs_client', 'rcs_server', 'rcs_common', 'oc','octbstack', 'oc_logger', 'connectivity_abstraction']) resource_container_env.AppendUnique(LIBS = ['dl', 'boost_system', 'boost_date_time', 'boost_thread']) if int(containerJavaSupport): - try: - print 'Java Lib: ', os.environ['JAVA_LIB'] - resource_container_env.AppendUnique(LIBS = ['jvm']) - except KeyError: - print '' + try: + print 'Java Lib: ', os.environ['JAVA_LIB'] + resource_container_env.AppendUnique(LIBS = ['jvm']) + except KeyError: + print '' ###################################################################### # Source files and Targets ###################################################################### res_container_src = ['src/BaseActivator.cpp','src/BundleActivator.cpp','src/RCSBundleInfo.cpp', - 'src/BundleInfoInternal.cpp', 'src/BundleResource.cpp', 'src/Configuration.cpp', 'src/JavaBundleResource.cpp', 'src/ProtocolBridgeResource.cpp', - 'src/ProtocolBridgeConnector.cpp', 'src/RCSResourceContainer.cpp', 'src/ResourceContainerBundleAPI.cpp', 'src/ResourceContainerImpl.cpp', - 'src/SoftSensorResource.cpp', 'src/DiscoverResourceUnit.cpp', 'src/RemoteResourceUnit.cpp', - ] + 'src/BundleInfoInternal.cpp', 'src/BundleResource.cpp', 'src/Configuration.cpp', 'src/JavaBundleResource.cpp', 'src/ProtocolBridgeResource.cpp', + 'src/ProtocolBridgeConnector.cpp', 'src/RCSResourceContainer.cpp', 'src/ResourceContainerBundleAPI.cpp', 'src/ResourceContainerImpl.cpp', + 'src/SoftSensorResource.cpp', 'src/DiscoverResourceUnit.cpp', 'src/RemoteResourceUnit.cpp', + ] res_container_static = resource_container_env.StaticLibrary('rcs_container', res_container_src) res_container_shared = resource_container_env.SharedLibrary('rcs_container', res_container_src) resource_container_env.InstallTarget([res_container_static,res_container_shared], 'libResContainer') +resource_container_env.UserInstallTargetHeader('include/RCSBundleInfo.h', 'service/resource-container', 'RCSBundleInfo.h') +resource_container_env.UserInstallTargetHeader('include/RCSResourceContainer.h', 'service/resource-container', 'RCSResourceContainer.h') + ###################################################################### # build discomfort index sensor sample bundle ###################################################################### if target_os in ['linux', 'tizen', 'android']: - DI_sensor_bundle_env = resource_container_env.Clone() - DI_sensor_bundle_env.AppendUnique(CCFLAGS = ['-fPIC']) + DI_sensor_bundle_env = resource_container_env.Clone() + DI_sensor_bundle_env.AppendUnique(CCFLAGS = ['-fPIC']) - DI_SENSOR_BUNDLE_DIR = 'examples/DiscomfortIndexSensorBundle/' - DI_sensor_bundle_env.AppendUnique(CPPPATH = [ DI_SENSOR_BUNDLE_DIR + 'include' ]) + DI_SENSOR_BUNDLE_DIR = 'examples/DiscomfortIndexSensorBundle/' + DI_sensor_bundle_env.AppendUnique(CPPPATH = [ DI_SENSOR_BUNDLE_DIR + 'include' ]) - DI_sensor_bundle_env.PrependUnique(LIBS = ['rcs_container']) + DI_sensor_bundle_env.PrependUnique(LIBS = ['rcs_container']) - DI_sensor_bundle_src = [ Glob(DI_SENSOR_BUNDLE_DIR + 'src/*.cpp')] + DI_sensor_bundle_src = [ Glob(DI_SENSOR_BUNDLE_DIR + 'src/*.cpp')] - DISensorBundle = DI_sensor_bundle_env.SharedLibrary('DISensorBundle', DI_sensor_bundle_src) - DI_sensor_bundle_env.InstallTarget(DISensorBundle, 'libDISensorBundle') + DISensorBundle = DI_sensor_bundle_env.SharedLibrary('DISensorBundle', DI_sensor_bundle_src) + DI_sensor_bundle_env.InstallTarget(DISensorBundle, 'libDISensorBundle') - if target_os == 'linux' : - SConscript(DI_SENSOR_BUNDLE_DIR + 'src/inputSensors/SConscript') - Command("THSensorApp", DI_SENSOR_BUNDLE_DIR + "src/inputSensors/THSensorApp/THSensorApp", Copy("$TARGET", "$SOURCE")) - Command("THSensorApp1", DI_SENSOR_BUNDLE_DIR + "src/inputSensors/THSensorApp1/THSensorApp1", Copy("$TARGET", "$SOURCE")) + if target_os == 'linux' : + SConscript(DI_SENSOR_BUNDLE_DIR + 'src/inputSensors/SConscript') + Command("THSensorApp", DI_SENSOR_BUNDLE_DIR + "src/inputSensors/THSensorApp/THSensorApp", Copy("$TARGET", "$SOURCE")) + Command("THSensorApp1", DI_SENSOR_BUNDLE_DIR + "src/inputSensors/THSensorApp1/THSensorApp1", Copy("$TARGET", "$SOURCE")) ###################################################################### # build BMI sensor sample bundle ###################################################################### if target_os in ['linux', 'tizen', 'android']: - BMI_sensor_bundle_env = resource_container_env.Clone() - BMI_sensor_bundle_env.AppendUnique(CCFLAGS = ['-fPIC']) + BMI_sensor_bundle_env = resource_container_env.Clone() + BMI_sensor_bundle_env.AppendUnique(CCFLAGS = ['-fPIC']) - BMI_SENSOR_BUNDLE_DIR = 'examples/BMISensorBundle/' - BMI_sensor_bundle_env.AppendUnique(CPPPATH = [ BMI_SENSOR_BUNDLE_DIR + 'include' ]) + BMI_SENSOR_BUNDLE_DIR = 'examples/BMISensorBundle/' + BMI_sensor_bundle_env.AppendUnique(CPPPATH = [ BMI_SENSOR_BUNDLE_DIR + 'include' ]) - BMI_sensor_bundle_env.PrependUnique(LIBS = ['rcs_container']) + BMI_sensor_bundle_env.PrependUnique(LIBS = ['rcs_container']) - BMI_sensor_bundle_src = [ Glob(BMI_SENSOR_BUNDLE_DIR + 'src/*.cpp')] + BMI_sensor_bundle_src = [ Glob(BMI_SENSOR_BUNDLE_DIR + 'src/*.cpp')] - BMISensorBundle = BMI_sensor_bundle_env.SharedLibrary('BMISensorBundle', BMI_sensor_bundle_src) - BMI_sensor_bundle_env.InstallTarget(BMISensorBundle, 'libBMISensorBundle') + BMISensorBundle = BMI_sensor_bundle_env.SharedLibrary('BMISensorBundle', BMI_sensor_bundle_src) + BMI_sensor_bundle_env.InstallTarget(BMISensorBundle, 'libBMISensorBundle') - if target_os == 'linux' : - SConscript(BMI_SENSOR_BUNDLE_DIR + 'src/inputSensors/SConscript') - Command("HeightSensorApp", BMI_SENSOR_BUNDLE_DIR + "src/inputSensors/HeightSensorApp/HeightSensorApp", Copy("$TARGET", "$SOURCE")) - Command("WeightSensorApp", BMI_SENSOR_BUNDLE_DIR + "src/inputSensors/WeightSensorApp/WeightSensorApp", Copy("$TARGET", "$SOURCE")) + if target_os == 'linux' : + SConscript(BMI_SENSOR_BUNDLE_DIR + 'src/inputSensors/SConscript') + Command("HeightSensorApp", BMI_SENSOR_BUNDLE_DIR + "src/inputSensors/HeightSensorApp/HeightSensorApp", Copy("$TARGET", "$SOURCE")) + Command("WeightSensorApp", BMI_SENSOR_BUNDLE_DIR + "src/inputSensors/WeightSensorApp/WeightSensorApp", Copy("$TARGET", "$SOURCE")) ###################################################################### # build hue sample bundle @@ -175,39 +178,39 @@ if target_os in ['linux', 'tizen', 'android']: conf2 = Configure(lib_env) if not conf2.CheckLib('curl'): - print '''X + print '''X *********************************** Error ************************************* * Cannot build hue sample. Please install libcurl. * Example (Ubuntu): -* sudo apt-get install libcurl4-openssl-dev -* sudo ldconfig +* sudo apt-get install libcurl4-openssl-dev +* sudo ldconfig * Hint: check with pkg-config --libs libcurl and clear scons cache. * Skipping hue sample build. ******************************************************************************* - ''' + ''' else: - hue_resource_bundle_env = resource_container_env.Clone() - hue_resource_bundle_env.AppendUnique(CCFLAGS = ['-fPIC']) + hue_resource_bundle_env = resource_container_env.Clone() + hue_resource_bundle_env.AppendUnique(CCFLAGS = ['-fPIC']) - HUE_RESOURCE_BUNDLE_DIR = 'examples/HueSampleBundle/' - hue_resource_bundle_env.AppendUnique(CPPPATH = [ - HUE_RESOURCE_BUNDLE_DIR + 'include', - 'include/' - ]) + HUE_RESOURCE_BUNDLE_DIR = 'examples/HueSampleBundle/' + hue_resource_bundle_env.AppendUnique(CPPPATH = [ + HUE_RESOURCE_BUNDLE_DIR + 'include', + 'include/' + ]) - hue_resource_bundle_env.PrependUnique(LIBS = ['curl', 'rcs_container']) + hue_resource_bundle_env.PrependUnique(LIBS = ['curl', 'rcs_container']) - hue_resource_bundle_src = [ Glob(HUE_RESOURCE_BUNDLE_DIR + 'src/*.cpp')] + hue_resource_bundle_src = [ Glob(HUE_RESOURCE_BUNDLE_DIR + 'src/*.cpp')] - HueBundle = hue_resource_bundle_env.SharedLibrary('HueBundle', hue_resource_bundle_src) - hue_resource_bundle_env.InstallTarget(HueBundle, 'libHueBundle') + HueBundle = hue_resource_bundle_env.SharedLibrary('HueBundle', hue_resource_bundle_src) + hue_resource_bundle_env.InstallTarget(HueBundle, 'libHueBundle') lib_env = conf2.Finish() ###################################################################### # build resource container unit tests ###################################################################### if target_os == 'linux': - SConscript('unittests/SConscript') + SConscript('unittests/SConscript') ###################################################################### # Build Container Sample @@ -235,6 +238,4 @@ containersample_env.AppendUnique(LIBS = ['rcs_container']) containersampleclient_src = ['examples/ContainerSampleClient.cpp'] containersampleclientapp = containersample_env.Program('ContainerSampleClient',containersampleclient_src) Alias("containersampleclient", containersampleclientapp) -env.AppendTarget('containersampleclient') - - +env.AppendTarget('containersampleclient') \ No newline at end of file diff --git a/service/resource-encapsulation/src/resourceContainer/bundle-api/include/BundleActivator.h b/service/resource-container/bundle-api/include/BundleActivator.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/bundle-api/include/BundleActivator.h rename to service/resource-container/bundle-api/include/BundleActivator.h diff --git a/service/resource-encapsulation/src/resourceContainer/bundle-api/include/BundleResource.h b/service/resource-container/bundle-api/include/BundleResource.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/bundle-api/include/BundleResource.h rename to service/resource-container/bundle-api/include/BundleResource.h diff --git a/service/resource-encapsulation/src/resourceContainer/bundle-api/include/NotificationReceiver.h b/service/resource-container/bundle-api/include/NotificationReceiver.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/bundle-api/include/NotificationReceiver.h rename to service/resource-container/bundle-api/include/NotificationReceiver.h diff --git a/service/resource-encapsulation/src/resourceContainer/bundle-api/include/ProtocolBridgeConnector.h b/service/resource-container/bundle-api/include/ProtocolBridgeConnector.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/bundle-api/include/ProtocolBridgeConnector.h rename to service/resource-container/bundle-api/include/ProtocolBridgeConnector.h diff --git a/service/resource-encapsulation/src/resourceContainer/bundle-api/include/ProtocolBridgeResource.h b/service/resource-container/bundle-api/include/ProtocolBridgeResource.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/bundle-api/include/ProtocolBridgeResource.h rename to service/resource-container/bundle-api/include/ProtocolBridgeResource.h diff --git a/service/resource-encapsulation/src/resourceContainer/bundle-api/include/ResourceContainerBundleAPI.h b/service/resource-container/bundle-api/include/ResourceContainerBundleAPI.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/bundle-api/include/ResourceContainerBundleAPI.h rename to service/resource-container/bundle-api/include/ResourceContainerBundleAPI.h diff --git a/service/resource-encapsulation/src/resourceContainer/bundle-api/include/SoftSensorResource.h b/service/resource-container/bundle-api/include/SoftSensorResource.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/bundle-api/include/SoftSensorResource.h rename to service/resource-container/bundle-api/include/SoftSensorResource.h diff --git a/service/resource-encapsulation/src/resourceContainer/bundle-java-api/pom.xml b/service/resource-container/bundle-java-api/pom.xml similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/bundle-java-api/pom.xml rename to service/resource-container/bundle-java-api/pom.xml diff --git a/service/resource-encapsulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BaseActivator.java b/service/resource-container/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BaseActivator.java similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BaseActivator.java rename to service/resource-container/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BaseActivator.java diff --git a/service/resource-encapsulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleActivator.java b/service/resource-container/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleActivator.java similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleActivator.java rename to service/resource-container/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleActivator.java diff --git a/service/resource-encapsulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleResource.java b/service/resource-container/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleResource.java similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleResource.java rename to service/resource-container/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleResource.java diff --git a/service/resource-encapsulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ProtocolBridgeConnector.java b/service/resource-container/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ProtocolBridgeConnector.java similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ProtocolBridgeConnector.java rename to service/resource-container/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ProtocolBridgeConnector.java diff --git a/service/resource-encapsulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ResourceConfig.java b/service/resource-container/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ResourceConfig.java similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ResourceConfig.java rename to service/resource-container/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ResourceConfig.java diff --git a/service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/include/BMISensor.h b/service/resource-container/examples/BMISensorBundle/include/BMISensor.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/include/BMISensor.h rename to service/resource-container/examples/BMISensorBundle/include/BMISensor.h diff --git a/service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/include/BMISensorBundleActivator.h b/service/resource-container/examples/BMISensorBundle/include/BMISensorBundleActivator.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/include/BMISensorBundleActivator.h rename to service/resource-container/examples/BMISensorBundle/include/BMISensorBundleActivator.h diff --git a/service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/include/BMISensorResource.h b/service/resource-container/examples/BMISensorBundle/include/BMISensorResource.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/include/BMISensorResource.h rename to service/resource-container/examples/BMISensorBundle/include/BMISensorResource.h diff --git a/service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/include/SysTimer.h b/service/resource-container/examples/BMISensorBundle/include/SysTimer.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/include/SysTimer.h rename to service/resource-container/examples/BMISensorBundle/include/SysTimer.h diff --git a/service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/BMISensor.cpp b/service/resource-container/examples/BMISensorBundle/src/BMISensor.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/BMISensor.cpp rename to service/resource-container/examples/BMISensorBundle/src/BMISensor.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/BMISensorBundleActivator.cpp b/service/resource-container/examples/BMISensorBundle/src/BMISensorBundleActivator.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/BMISensorBundleActivator.cpp rename to service/resource-container/examples/BMISensorBundle/src/BMISensorBundleActivator.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/BMISensorResource.cpp b/service/resource-container/examples/BMISensorBundle/src/BMISensorResource.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/BMISensorResource.cpp rename to service/resource-container/examples/BMISensorBundle/src/BMISensorResource.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/SysTimer.cpp b/service/resource-container/examples/BMISensorBundle/src/SysTimer.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/SysTimer.cpp rename to service/resource-container/examples/BMISensorBundle/src/SysTimer.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/SConscript b/service/resource-container/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/SConscript similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/SConscript rename to service/resource-container/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/SConscript diff --git a/service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/include/HeightSensorApp.h b/service/resource-container/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/include/HeightSensorApp.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/include/HeightSensorApp.h rename to service/resource-container/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/include/HeightSensorApp.h diff --git a/service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/src/HeightSensorApp.cpp b/service/resource-container/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/src/HeightSensorApp.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/src/HeightSensorApp.cpp rename to service/resource-container/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/src/HeightSensorApp.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/inputSensors/SConscript b/service/resource-container/examples/BMISensorBundle/src/inputSensors/SConscript similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/inputSensors/SConscript rename to service/resource-container/examples/BMISensorBundle/src/inputSensors/SConscript diff --git a/service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/SConscript b/service/resource-container/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/SConscript similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/SConscript rename to service/resource-container/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/SConscript diff --git a/service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/include/WeightSensorApp.h b/service/resource-container/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/include/WeightSensorApp.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/include/WeightSensorApp.h rename to service/resource-container/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/include/WeightSensorApp.h diff --git a/service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/src/WeightSensorApp.cpp b/service/resource-container/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/src/WeightSensorApp.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/src/WeightSensorApp.cpp rename to service/resource-container/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/src/WeightSensorApp.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/examples/ContainerSample.cpp b/service/resource-container/examples/ContainerSample.cpp similarity index 98% rename from service/resource-encapsulation/src/resourceContainer/examples/ContainerSample.cpp rename to service/resource-container/examples/ContainerSample.cpp index af2dae4..5706024 100644 --- a/service/resource-encapsulation/src/resourceContainer/examples/ContainerSample.cpp +++ b/service/resource-container/examples/ContainerSample.cpp @@ -150,7 +150,7 @@ int main() bundleParams["libraryPath"] = "."; std::string activator = "org.iotivity.bundle.hue.HueBundleActivator"; container->addBundle("oic.bundle.hueJavaSample2", "/hueJava", - "../../../../../../../../service/resource-encapsulation/src/resourceContainer/" \ + "../../../../../../service/resource-container/" \ "examples/HueJavaSampleBundle/hue/target/hue-0.1-jar-with-dependencies.jar", activator, bundleParams); diff --git a/service/resource-encapsulation/src/resourceContainer/examples/ContainerSampleClient.cpp b/service/resource-container/examples/ContainerSampleClient.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/ContainerSampleClient.cpp rename to service/resource-container/examples/ContainerSampleClient.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/include/DISensorBundleActivator.h b/service/resource-container/examples/DiscomfortIndexSensorBundle/include/DISensorBundleActivator.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/include/DISensorBundleActivator.h rename to service/resource-container/examples/DiscomfortIndexSensorBundle/include/DISensorBundleActivator.h diff --git a/service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/include/DiscomfortIndexSensor.h b/service/resource-container/examples/DiscomfortIndexSensorBundle/include/DiscomfortIndexSensor.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/include/DiscomfortIndexSensor.h rename to service/resource-container/examples/DiscomfortIndexSensorBundle/include/DiscomfortIndexSensor.h diff --git a/service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/include/DiscomfortIndexSensorResource.h b/service/resource-container/examples/DiscomfortIndexSensorBundle/include/DiscomfortIndexSensorResource.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/include/DiscomfortIndexSensorResource.h rename to service/resource-container/examples/DiscomfortIndexSensorBundle/include/DiscomfortIndexSensorResource.h diff --git a/service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/include/SysTimer.h b/service/resource-container/examples/DiscomfortIndexSensorBundle/include/SysTimer.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/include/SysTimer.h rename to service/resource-container/examples/DiscomfortIndexSensorBundle/include/SysTimer.h diff --git a/service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/DISensorBundleActivator.cpp b/service/resource-container/examples/DiscomfortIndexSensorBundle/src/DISensorBundleActivator.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/DISensorBundleActivator.cpp rename to service/resource-container/examples/DiscomfortIndexSensorBundle/src/DISensorBundleActivator.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/DiscomfortIndexSensor.cpp b/service/resource-container/examples/DiscomfortIndexSensorBundle/src/DiscomfortIndexSensor.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/DiscomfortIndexSensor.cpp rename to service/resource-container/examples/DiscomfortIndexSensorBundle/src/DiscomfortIndexSensor.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/DiscomfortIndexSensorResource.cpp b/service/resource-container/examples/DiscomfortIndexSensorBundle/src/DiscomfortIndexSensorResource.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/DiscomfortIndexSensorResource.cpp rename to service/resource-container/examples/DiscomfortIndexSensorBundle/src/DiscomfortIndexSensorResource.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/SysTimer.cpp b/service/resource-container/examples/DiscomfortIndexSensorBundle/src/SysTimer.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/SysTimer.cpp rename to service/resource-container/examples/DiscomfortIndexSensorBundle/src/SysTimer.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/inputSensors/SConscript b/service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/SConscript similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/inputSensors/SConscript rename to service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/SConscript diff --git a/service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/SConscript b/service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/SConscript similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/SConscript rename to service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/SConscript diff --git a/service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/include/ThingResourceServer.h b/service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/include/ThingResourceServer.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/include/ThingResourceServer.h rename to service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/include/ThingResourceServer.h diff --git a/service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/src/ThingResourceServer.cpp b/service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/src/ThingResourceServer.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/src/ThingResourceServer.cpp rename to service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/src/ThingResourceServer.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/SConscript b/service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/SConscript similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/SConscript rename to service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/SConscript diff --git a/service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/include/ThingResourceServer1.h b/service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/include/ThingResourceServer1.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/include/ThingResourceServer1.h rename to service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/include/ThingResourceServer1.h diff --git a/service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/src/ThingResourceServer1.cpp b/service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/src/ThingResourceServer1.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/src/ThingResourceServer1.cpp rename to service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/src/ThingResourceServer1.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/pom.xml b/service/resource-container/examples/HueJavaSampleBundle/hue/pom.xml similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/pom.xml rename to service/resource-container/examples/HueJavaSampleBundle/hue/pom.xml diff --git a/service/resource-encapsulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueBundleActivator.java b/service/resource-container/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueBundleActivator.java similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueBundleActivator.java rename to service/resource-container/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueBundleActivator.java diff --git a/service/resource-encapsulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueConnector.java b/service/resource-container/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueConnector.java similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueConnector.java rename to service/resource-container/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueConnector.java diff --git a/service/resource-encapsulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueLightResource.java b/service/resource-container/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueLightResource.java similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueLightResource.java rename to service/resource-container/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueLightResource.java diff --git a/service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/include/HueConnector.h b/service/resource-container/examples/HueSampleBundle/include/HueConnector.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/include/HueConnector.h rename to service/resource-container/examples/HueSampleBundle/include/HueConnector.h diff --git a/service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/include/HueLight.h b/service/resource-container/examples/HueSampleBundle/include/HueLight.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/include/HueLight.h rename to service/resource-container/examples/HueSampleBundle/include/HueLight.h diff --git a/service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/include/HueSampleBundleActivator.h b/service/resource-container/examples/HueSampleBundle/include/HueSampleBundleActivator.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/include/HueSampleBundleActivator.h rename to service/resource-container/examples/HueSampleBundle/include/HueSampleBundleActivator.h diff --git a/service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/src/HueConnector.cpp b/service/resource-container/examples/HueSampleBundle/src/HueConnector.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/src/HueConnector.cpp rename to service/resource-container/examples/HueSampleBundle/src/HueConnector.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/src/HueLight.cpp b/service/resource-container/examples/HueSampleBundle/src/HueLight.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/src/HueLight.cpp rename to service/resource-container/examples/HueSampleBundle/src/HueLight.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/src/HueSampleBundleActivator.cpp b/service/resource-container/examples/HueSampleBundle/src/HueSampleBundleActivator.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/src/HueSampleBundleActivator.cpp rename to service/resource-container/examples/HueSampleBundle/src/HueSampleBundleActivator.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/examples/ResourceContainerConfig.xml b/service/resource-container/examples/ResourceContainerConfig.xml similarity index 95% rename from service/resource-encapsulation/src/resourceContainer/examples/ResourceContainerConfig.xml rename to service/resource-container/examples/ResourceContainerConfig.xml index 347e737..c3a56a2 100644 --- a/service/resource-encapsulation/src/resourceContainer/examples/ResourceContainerConfig.xml +++ b/service/resource-container/examples/ResourceContainerConfig.xml @@ -85,10 +85,11 @@ - + + + \ No newline at end of file diff --git a/service/resource-encapsulation/include/RCSBundleInfo.h b/service/resource-container/include/RCSBundleInfo.h similarity index 100% rename from service/resource-encapsulation/include/RCSBundleInfo.h rename to service/resource-container/include/RCSBundleInfo.h diff --git a/service/resource-encapsulation/include/RCSResourceContainer.h b/service/resource-container/include/RCSResourceContainer.h similarity index 100% rename from service/resource-encapsulation/include/RCSResourceContainer.h rename to service/resource-container/include/RCSResourceContainer.h diff --git a/service/resource-encapsulation/src/resourceContainer/src/BaseActivator.cpp b/service/resource-container/src/BaseActivator.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/src/BaseActivator.cpp rename to service/resource-container/src/BaseActivator.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/src/BundleActivator.cpp b/service/resource-container/src/BundleActivator.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/src/BundleActivator.cpp rename to service/resource-container/src/BundleActivator.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/src/BundleInfoInternal.cpp b/service/resource-container/src/BundleInfoInternal.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/src/BundleInfoInternal.cpp rename to service/resource-container/src/BundleInfoInternal.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/include/BundleInfoInternal.h b/service/resource-container/src/BundleInfoInternal.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/include/BundleInfoInternal.h rename to service/resource-container/src/BundleInfoInternal.h diff --git a/service/resource-encapsulation/src/resourceContainer/src/BundleResource.cpp b/service/resource-container/src/BundleResource.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/src/BundleResource.cpp rename to service/resource-container/src/BundleResource.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/src/Configuration.cpp b/service/resource-container/src/Configuration.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/src/Configuration.cpp rename to service/resource-container/src/Configuration.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/include/Configuration.h b/service/resource-container/src/Configuration.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/include/Configuration.h rename to service/resource-container/src/Configuration.h diff --git a/service/resource-encapsulation/src/resourceContainer/src/DiscoverResourceUnit.cpp b/service/resource-container/src/DiscoverResourceUnit.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/src/DiscoverResourceUnit.cpp rename to service/resource-container/src/DiscoverResourceUnit.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/include/DiscoverResourceUnit.h b/service/resource-container/src/DiscoverResourceUnit.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/include/DiscoverResourceUnit.h rename to service/resource-container/src/DiscoverResourceUnit.h diff --git a/service/resource-encapsulation/src/resourceContainer/include/InternalTypes.h b/service/resource-container/src/InternalTypes.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/include/InternalTypes.h rename to service/resource-container/src/InternalTypes.h diff --git a/service/resource-encapsulation/src/resourceContainer/src/JavaBundleResource.cpp b/service/resource-container/src/JavaBundleResource.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/src/JavaBundleResource.cpp rename to service/resource-container/src/JavaBundleResource.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/include/JavaBundleResource.h b/service/resource-container/src/JavaBundleResource.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/include/JavaBundleResource.h rename to service/resource-container/src/JavaBundleResource.h diff --git a/service/resource-encapsulation/src/resourceContainer/src/ProtocolBridgeConnector.cpp b/service/resource-container/src/ProtocolBridgeConnector.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/src/ProtocolBridgeConnector.cpp rename to service/resource-container/src/ProtocolBridgeConnector.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/src/ProtocolBridgeResource.cpp b/service/resource-container/src/ProtocolBridgeResource.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/src/ProtocolBridgeResource.cpp rename to service/resource-container/src/ProtocolBridgeResource.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/src/RCSBundleInfo.cpp b/service/resource-container/src/RCSBundleInfo.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/src/RCSBundleInfo.cpp rename to service/resource-container/src/RCSBundleInfo.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/src/RCSResourceContainer.cpp b/service/resource-container/src/RCSResourceContainer.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/src/RCSResourceContainer.cpp rename to service/resource-container/src/RCSResourceContainer.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/src/RemoteResourceUnit.cpp b/service/resource-container/src/RemoteResourceUnit.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/src/RemoteResourceUnit.cpp rename to service/resource-container/src/RemoteResourceUnit.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/include/RemoteResourceUnit.h b/service/resource-container/src/RemoteResourceUnit.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/include/RemoteResourceUnit.h rename to service/resource-container/src/RemoteResourceUnit.h diff --git a/service/resource-encapsulation/src/resourceContainer/src/ResourceContainerBundleAPI.cpp b/service/resource-container/src/ResourceContainerBundleAPI.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/src/ResourceContainerBundleAPI.cpp rename to service/resource-container/src/ResourceContainerBundleAPI.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/src/ResourceContainerImpl.cpp b/service/resource-container/src/ResourceContainerImpl.cpp similarity index 99% rename from service/resource-encapsulation/src/resourceContainer/src/ResourceContainerImpl.cpp rename to service/resource-container/src/ResourceContainerImpl.cpp index 364d27d..665cd2a 100644 --- a/service/resource-encapsulation/src/resourceContainer/src/ResourceContainerImpl.cpp +++ b/service/resource-container/src/ResourceContainerImpl.cpp @@ -486,7 +486,7 @@ namespace OIC bundleInfo->setActivatorName(activator); if (params.find("libraryPath") != params.end()) { - string activatorName = params["activator"]; // modify activator for Java bundle + string activatorName = activator; // modify activator for Java bundle std::replace(activatorName.begin(), activatorName.end(), '.', '/'); ((BundleInfoInternal *) bundleInfo)->setActivatorName(activatorName); ((BundleInfoInternal *)bundleInfo)->setLibraryPath(params[BUNDLE_LIBRARY_PATH]); diff --git a/service/resource-encapsulation/src/resourceContainer/include/ResourceContainerImpl.h b/service/resource-container/src/ResourceContainerImpl.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/include/ResourceContainerImpl.h rename to service/resource-container/src/ResourceContainerImpl.h diff --git a/service/resource-encapsulation/src/resourceContainer/src/SoftSensorResource.cpp b/service/resource-container/src/SoftSensorResource.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/src/SoftSensorResource.cpp rename to service/resource-container/src/SoftSensorResource.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/include/org_iotivity_resourcecontainer_bundle_api_BaseActivator.h b/service/resource-container/src/org_iotivity_resourcecontainer_bundle_api_BaseActivator.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/include/org_iotivity_resourcecontainer_bundle_api_BaseActivator.h rename to service/resource-container/src/org_iotivity_resourcecontainer_bundle_api_BaseActivator.h diff --git a/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerInvalidConfig.xml b/service/resource-container/unittests/ResourceContainerInvalidConfig.xml similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerInvalidConfig.xml rename to service/resource-container/unittests/ResourceContainerInvalidConfig.xml diff --git a/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTest.cpp b/service/resource-container/unittests/ResourceContainerTest.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTest.cpp rename to service/resource-container/unittests/ResourceContainerTest.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTestConfig.xml b/service/resource-container/unittests/ResourceContainerTestConfig.xml similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTestConfig.xml rename to service/resource-container/unittests/ResourceContainerTestConfig.xml diff --git a/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTestSimulator.h b/service/resource-container/unittests/ResourceContainerTestSimulator.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTestSimulator.h rename to service/resource-container/unittests/ResourceContainerTestSimulator.h diff --git a/service/resource-encapsulation/src/resourceContainer/unittests/SConscript b/service/resource-container/unittests/SConscript similarity index 66% rename from service/resource-encapsulation/src/resourceContainer/unittests/SConscript rename to service/resource-container/unittests/SConscript index 3f516e4..ecc5306 100644 --- a/service/resource-encapsulation/src/resourceContainer/unittests/SConscript +++ b/service/resource-container/unittests/SConscript @@ -37,13 +37,13 @@ def filtered_glob(env, pattern, omit=[], env.AddMethod(filtered_glob, "FilteredGlob"); if env.get('RELEASE'): - env.AppendUnique(CCFLAGS = ['-Os']) - env.AppendUnique(CPPDEFINES = ['NDEBUG']) + env.AppendUnique(CCFLAGS = ['-Os']) + env.AppendUnique(CPPDEFINES = ['NDEBUG']) else: - env.AppendUnique(CCFLAGS = ['-g']) + env.AppendUnique(CCFLAGS = ['-g']) if env.get('LOGGING'): - env.AppendUnique(CPPDEFINES = ['TB_LOG']) + env.AppendUnique(CPPDEFINES = ['TB_LOG']) @@ -55,21 +55,21 @@ SConscript(env.get('SRC_DIR') + '/service/third_party_libs.scons', 'lib_env') container_gtest_env = lib_env.Clone() if int(containerJavaSupport): - try: - print 'Java Home: ', os.environ['JAVA_HOME'] - print 'Java Lib: ', os.environ['JAVA_LIB'] - container_gtest_env.Append(CPPDEFINES={'JAVA_SUPPORT_TEST':1}) - except KeyError: - print ''' - *********************************** Error ************************************* - * Building resource container without Java support. JAVA_HOME or JAVA_LIB are not set properly - * Please configure JAVA_HOME to point to your Java 7 JDK and - * JAVA_LIB to your folder containing libjvm - * Example: export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-i386 - * export JAVA_LIB=/usr/lib/jvm/java-7-openjdk-i386/jre/lib/i386/server/ - ******************************************************************************* - ''' - container_gtest_env.Append(CPPDEFINES={'JAVA_SUPPORT_TEST':0}) + try: + print 'Java Home: ', os.environ['JAVA_HOME'] + print 'Java Lib: ', os.environ['JAVA_LIB'] + container_gtest_env.Append(CPPDEFINES={'JAVA_SUPPORT_TEST':1}) + except KeyError: + print ''' + *********************************** Error ************************************* + * Building resource container without Java support. JAVA_HOME or JAVA_LIB are not set properly + * Please configure JAVA_HOME to point to your Java 7 JDK and + * JAVA_LIB to your folder containing libjvm + * Example: export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-i386 + * export JAVA_LIB=/usr/lib/jvm/java-7-openjdk-i386/jre/lib/i386/server/ + ******************************************************************************* + ''' + container_gtest_env.Append(CPPDEFINES={'JAVA_SUPPORT_TEST':0}) target_os = env.get('TARGET_OS') @@ -87,30 +87,30 @@ gtest = File(gtest_dir + '/lib/.libs/libgtest.a') gtest_main = File(gtest_dir + '/lib/.libs/libgtest_main.a') container_gtest_env.AppendUnique( - CPPPATH = [ - env.get('SRC_DIR')+'/extlibs', - '../include', - '../../../include', - '../include/internal', - '../../common/utils/include', - '../bundle-api/include' - ]) + CPPPATH = [ + env.get('SRC_DIR')+'/extlibs', + '../include', + '../../resource-encapsulation/include', + '../../resource-encapsulation/src/common/utils/include', + '../bundle-api/include', + '../src' + ]) if int(containerJavaSupport): - try: - container_gtest_env.AppendUnique( - CPPPATH = [ - os.environ['JAVA_HOME']+'/include', - os.environ['JAVA_HOME']+'/include/linux' - ]) - except KeyError: - print '' + try: + container_gtest_env.AppendUnique( + CPPPATH = [ + os.environ['JAVA_HOME']+'/include', + os.environ['JAVA_HOME']+'/include/linux' + ]) + except KeyError: + print '' if target_os not in ['windows', 'winrt']: - container_gtest_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall']) - if target_os != 'android': - container_gtest_env.AppendUnique(CXXFLAGS = ['-pthread']) - container_gtest_env.AppendUnique(LIBS = ['pthread']) + container_gtest_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall']) + if target_os != 'android': + container_gtest_env.AppendUnique(CXXFLAGS = ['-pthread']) + container_gtest_env.AppendUnique(LIBS = ['pthread']) if target_os == 'android': container_gtest_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions']) @@ -120,10 +120,10 @@ container_gtest_env.PrependUnique(CPPPATH = [env.get('SRC_DIR')+'/extlibs/hippom gtest_dir + '/include']) if int(containerJavaSupport): - try: - container_gtest_env.AppendUnique(LIBPATH = [os.environ['JAVA_LIB']]) - except KeyError: - print '' + try: + container_gtest_env.AppendUnique(LIBPATH = [os.environ['JAVA_LIB']]) + except KeyError: + print '' container_gtest_env.AppendUnique(CCFLAGS = ['-Wnoexcept']) @@ -132,11 +132,11 @@ container_gtest_env.PrependUnique(LIBS = ['rcs_container', 'rcs_client', 'rcs_se container_gtest_env.AppendUnique(LIBS = ['dl']) if int(containerJavaSupport): - try: - print 'Java Lib: ', os.environ['JAVA_LIB'] - container_gtest_env.AppendUnique(LIBS = ['jvm']) - except KeyError: - print '' + try: + print 'Java Lib: ', os.environ['JAVA_LIB'] + container_gtest_env.AppendUnique(LIBS = ['jvm']) + except KeyError: + print '' ###################################################################### # build test bundle @@ -149,9 +149,8 @@ if target_os not in ['darwin', 'ios', 'windows', 'winrt']: TEST_BUNDLE_DIR = 'TestBundle/' test_bundle_env.AppendUnique(CPPPATH = [ - TEST_BUNDLE_DIR + 'include', - '../include/' - ]) + TEST_BUNDLE_DIR + 'include' + ]) test_bundle_src = [ Glob(TEST_BUNDLE_DIR + 'src/*.cpp'), Glob('src/*.cpp')] @@ -177,9 +176,9 @@ Command("./TestBundleJava/hue-0.1-jar-with-dependencies.jar","./TestBundleJava/h Ignore("./TestBundleJava/hue-0.1-jar-with-dependencies.jar", "./TestBundleJava/hue-0.1-jar-with-dependencies.jar") if env.get('TEST') == '1': - target_os = env.get('TARGET_OS') - if target_os == 'linux': - from tools.scons.RunTest import * - run_test(container_gtest_env, - '', - 'service/resource-encapsulation/src/resourceContainer/unittests/container_test') \ No newline at end of file + target_os = env.get('TARGET_OS') + if target_os == 'linux': + from tools.scons.RunTest import * + run_test(container_gtest_env, + '', + 'service/resource-container/unittests/container_test') \ No newline at end of file diff --git a/service/resource-encapsulation/src/resourceContainer/unittests/TestBundle/include/TestBundleActivator.h b/service/resource-container/unittests/TestBundle/include/TestBundleActivator.h similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/unittests/TestBundle/include/TestBundleActivator.h rename to service/resource-container/unittests/TestBundle/include/TestBundleActivator.h diff --git a/service/resource-encapsulation/src/resourceContainer/unittests/TestBundle/src/TestBundleActivator.cpp b/service/resource-container/unittests/TestBundle/src/TestBundleActivator.cpp similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/unittests/TestBundle/src/TestBundleActivator.cpp rename to service/resource-container/unittests/TestBundle/src/TestBundleActivator.cpp diff --git a/service/resource-encapsulation/src/resourceContainer/unittests/TestBundleJava/hue-0.1-jar-with-dependencies.jar b/service/resource-container/unittests/TestBundleJava/hue-0.1-jar-with-dependencies.jar similarity index 100% rename from service/resource-encapsulation/src/resourceContainer/unittests/TestBundleJava/hue-0.1-jar-with-dependencies.jar rename to service/resource-container/unittests/TestBundleJava/hue-0.1-jar-with-dependencies.jar diff --git a/service/resource-encapsulation/SConscript b/service/resource-encapsulation/SConscript index 4a21ac5..b600739 100644 --- a/service/resource-encapsulation/SConscript +++ b/service/resource-encapsulation/SConscript @@ -26,7 +26,6 @@ Import('env') SConscript('src/common/SConscript') SConscript('src/serverBuilder/SConscript') -SConscript('src/resourceContainer/SConscript') ###################################################################### #building Resource client, resourceBroker and resourceCache @@ -90,7 +89,7 @@ client_src = [ RESOURCECLIENT_DIR + 'RCSDiscoveryManager.cpp', RESOURCECLIENT_DIR + 'RCSDiscoveryManagerImpl.cpp', RESOURCECLIENT_DIR + 'RCSRemoteResourceObject.cpp' - ] + ] ResourceClientsdk_static = resourceClient_env.StaticLibrary('rcs_client', client_src) ResourceClientsdk_shared = resourceClient_env.SharedLibrary('rcs_client', client_src) @@ -101,10 +100,8 @@ resourceClient_env.UserInstallTargetHeader('include/RCSDiscoveryManager.h', 'ser resourceClient_env.UserInstallTargetHeader('include/RCSRemoteResourceObject.h', 'service/resource-encapsulation', 'RCSRemoteResourceObject.h') resourceClient_env.UserInstallTargetHeader('include/RCSResourceAttributes.h', 'service/resource-encapsulation', 'RCSResourceAttributes.h') resourceClient_env.UserInstallTargetHeader('include/RCSResourceObject.h', 'service/resource-encapsulation', 'RCSResourceObject.h') -resourceClient_env.UserInstallTargetHeader('include/RCSBundleInfo.h', 'service/resource-encapsulation', 'RCSBundleInfo.h') resourceClient_env.UserInstallTargetHeader('include/RCSException.h', 'service/resource-encapsulation', 'RCSException.h') resourceClient_env.UserInstallTargetHeader('include/RCSRequest.h', 'service/resource-encapsulation', 'RCSRequest.h') -resourceClient_env.UserInstallTargetHeader('include/RCSResourceContainer.h', 'service/resource-encapsulation', 'RCSResourceContainer.h') resourceClient_env.UserInstallTargetHeader('include/RCSResponse.h', 'service/resource-encapsulation', 'RCSResponse.h') ###################################################################### @@ -122,4 +119,4 @@ if target_os == 'linux': SConscript('src/resourceBroker/unittest/SConscript') if target_os == 'android': - SConscript('android/SConscript') + SConscript('android/SConscript') \ No newline at end of file diff --git a/tools/tizen/iotivity.spec b/tools/tizen/iotivity.spec index c8df3ec..9b12b56 100755 --- a/tools/tizen/iotivity.spec +++ b/tools/tizen/iotivity.spec @@ -149,14 +149,14 @@ cp service/things-manager/sdk/inc/*.h %{buildroot}%{_includedir} %files service %manifest %{name}.manifest %defattr(-,root,root,-) -%{_libdir}/libBMISensorBundle.so -%{_libdir}/libDISensorBundle.so +#%{_libdir}/libBMISensorBundle.so +#%{_libdir}/libDISensorBundle.so %{_libdir}/libresource_hosting.so %{_libdir}/libTGMSDKLibrary.so -%{_libdir}/libHueBundle.so +#%{_libdir}/libHueBundle.so %{_libdir}/librcs_client.so %{_libdir}/librcs_common.so -%{_libdir}/librcs_container.so +#%{_libdir}/librcs_container.so %{_libdir}/librcs_server.so %files test