From: Jihun Ha Date: Tue, 6 Dec 2016 12:13:18 +0000 (+0900) Subject: Remove Thing-manager service which is deprecated. X-Git-Tag: 1.3.0~1049^2~24 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f843f267474877a6c7ff61a9af9177b763b70fac;p=platform%2Fupstream%2Fiotivity.git Remove Thing-manager service which is deprecated. Functionalities of the current things manager are deprecated because OCF specification describes oic/con and oic/mnt resources with ambiguousness. When it comes to be more specific, then a new service for managing those resource will be developed. Conflicts: service/things-manager/sampleapp/android/con-server/src/com/example/con_server/ConfigurationServer.java service/things-manager/sampleapp/linux/configuration/SConscript service/things-manager/sampleapp/linux/configuration/bootstrapserver.cpp service/things-manager/sampleapp/linux/configuration/con-server.cpp service/things-manager/sampleapp/tizen/ConServerApp/src/conserverapp.cpp service/things-manager/sampleapp/tizen/TMSampleApp/src/group.cpp service/things-manager/unittests/SConscript service/things-manager/unittests/ThingsManagerTest.cpp Change-Id: I00671da74f467461ae6c5ba76d697641dfacdf06 Signed-off-by: Jihun Ha Reviewed-on: https://gerrit.iotivity.org/gerrit/15191 Tested-by: jenkins-iotivity Reviewed-by: JungYong KIM Reviewed-by: Uze Choi --- diff --git a/service/SConscript b/service/SConscript index af0ac4d..e34fd0f 100755 --- a/service/SConscript +++ b/service/SConscript @@ -27,9 +27,6 @@ Import('env') target_os = env.get('TARGET_OS') if target_os not in ['arduino','darwin', 'ios', 'windows']: - # Build things manager project - SConscript('things-manager/SConscript') - # Build resource-hosting project SConscript('resource-hosting/SConscript') diff --git a/service/things-manager/.gitignore b/service/things-manager/.gitignore deleted file mode 100644 index 788dbdd..0000000 --- a/service/things-manager/.gitignore +++ /dev/null @@ -1,36 +0,0 @@ -IDE/VS2010_TEST/Simulator/Debug/ -IDE/VS2010_TEST/GroupManager/Debug/ -IDE/VS2010_TEST/Debug/ -IDE/VS2010_TEST/GroupManager/GroupManager.sdf -IDE/VS2010_TEST/GroupManager/GroupManager.sln.docstates.suo -IDE/VS2010_TEST/Simulation.opensdf -IDE/VS2010_TEST/Simulation.sln.docstates.suo -IDE/VS2010_TEST/Simulation.suo -IDE/VS2010_TEST/Simulationv11.sln -IDE/VS2010_TEST/Simulator/Simulator.vcxproj.user -IDE/VS2010_TEST/ipch/groupmanager-b37860cb/2.ipch -IDE/VS2010_TEST/ipch/simulator-d2ec10fb/1.ipch -IDE/VS2010_TEST/Simulation.sdf -IDE/VS2010_TEST/ipch/ -*.ipch -IDE/VS2010_TEST/GroupManager/GroupManager.vcxproj.user - - - -IDE/VS2010/GroupManager/GroupManager.vcxproj.user -TestApp/InProcClientWrapper.o -TestApp/InProcServerWrapper.o -TestApp/OCLib.a -TestApp/OCPlatform.o -TestApp/OCReflect.o -TestApp/OCResource.o -TestApp/tgmclient -TestApp/tgmclient.o -TestApp/tgmserver -TestApp/tgmserver.o -SourceCode/tgmtest -IDE/LINUX_TEST/tgmtest -inc4.7/ -.settings/ -TestApp/introspection/tgmclient -TestApp/introspection/introspectionServer \ No newline at end of file diff --git a/service/things-manager/Readme.txt b/service/things-manager/Readme.txt deleted file mode 100644 index 15cb473..0000000 --- a/service/things-manager/Readme.txt +++ /dev/null @@ -1,83 +0,0 @@ -/****************************************************************** -* -* Copyright 2014 Samsung Electronics All Rights Reserved. -* -* -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -******************************************************************/ - - -=============================================================================== -== How to Build Things Manager == -=============================================================================== - -Once the source code is downloaded in your local specific folder, you may follow -the steps to build and execute Things Manager and its applications. -In this context, we assume that the code was downloaded into 'oic' folder. - -======================================= -1. Download source code -======================================= - -From the url, you can download Things Manager source code; -https://www.iotivity.org/downloads - -Once you download the codes, and Make sure that the downloaded code structure is as follows; -Four directories for oic; extlib, resource, service, and tools. - -oic/extlib -oic/resource -oic/service -oic/tools - -The path for Things Manager is as following; - -oic/service/things-manager - -The things-manager directory includes following sub directories; - -Directories Description -oic/service/things-manager/sdk : The SDK APIs for applications is located. - The main functionality of this SDK is to provide - developer-friendly APIs of Things manager component - to application developers. -oic/service/things-manager/sampleapp : It is the sample application on Ubuntu. - Basically, the input and output of application - on Ubuntu are displayed in the console. -oic/service/things-manager/build : Whole library files and binary files would be made - in this folder - - - -======================================= -2. Build -======================================= -Simply, type "make" to build things manager as follows; - -/oic/service/things-manager/build/linux$ make - -======================================= -3. Build the API reference documentation -======================================= -To build the API reference documentation: -a. Navigate to oic-resource/docs folder using the terminal window. -b. Run the following command: - - $ doxygen - -This command builds the API reference documentation in the output directory. - -The output directory for this command is oic-resource/docs/html/index.html. - diff --git a/service/things-manager/SConscript b/service/things-manager/SConscript deleted file mode 100644 index 0f617ba..0000000 --- a/service/things-manager/SConscript +++ /dev/null @@ -1,80 +0,0 @@ -#****************************************************************** -# -# Copyright 2014 Samsung Electronics All Rights Reserved. -# -#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= - -## -# things_manager project build script -## -import os -Import('env') - -# Add third party libraries -lib_env = env.Clone() -SConscript('#service/third_party_libs.scons', exports = 'lib_env') - -things_manager_env = lib_env.Clone() -target_os = env.get('TARGET_OS') -###################################################################### -# Build flags -###################################################################### -things_manager_env.AppendUnique(CPPPATH = ['../../extlibs/timer', 'sdk/inc', 'sdk/src']) - -things_manager_env.PrependUnique(LIBS = ['oc', 'octbstack']) - -if target_os not in ['windows']: - things_manager_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall']) - if target_os != 'android': - things_manager_env.AppendUnique(CXXFLAGS = ['-pthread']) - things_manager_env.AppendUnique(LIBS = ['pthread']) - -if target_os not in ['darwin', 'ios', 'windows']: - things_manager_env.AppendUnique(LINKFLAGS = ['-Wl,--no-undefined']) - -if target_os == 'android': - things_manager_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions']) - things_manager_env.PrependUnique(LIBS = ['gnustl_shared']) - -###################################################################### -# Source files and Targets -###################################################################### - -tgm_src = env.Glob('sdk/src/*.cpp', '../../extlibs/timer/timer.c') -tgmsdk_static = things_manager_env.StaticLibrary('TGMSDKLibrary', tgm_src) -tgmsdk_shared = things_manager_env.SharedLibrary('TGMSDKLibrary', tgm_src) - -things_manager_env.InstallTarget([tgmsdk_static,tgmsdk_shared], 'libTGMSDK') -things_manager_env.UserInstallTargetLib([tgmsdk_static,tgmsdk_shared], 'libTGMSDK') -things_manager_env.UserInstallTargetHeader('sdk/inc/ActionSet.h', 'service/things-manager', 'ActionSet.h') -things_manager_env.UserInstallTargetHeader('sdk/inc/GroupManager.h', 'service/things-manager', 'GroupManager.h') -things_manager_env.UserInstallTargetHeader('sdk/inc/ThingsConfiguration.h', 'service/things-manager', 'ThingsConfiguration.h') -things_manager_env.UserInstallTargetHeader('sdk/inc/ThingsMaintenance.h', 'service/things-manager', 'ThingsMaintenance.h') - -# Build JNI layer -#if target_os == 'android': -# SConscript(os.path.join('sdk', 'java', 'jni', 'SConscript')) - -#Go to build sample apps -SConscript('sampleapp/SConscript') - -###################################################################### -# Build UnitTests Things Manager -################################################ ###################### -if target_os in ['linux']: - SConscript('unittests/SConscript') - diff --git a/service/things-manager/sampleapp/SConscript b/service/things-manager/sampleapp/SConscript deleted file mode 100644 index acd9723..0000000 --- a/service/things-manager/sampleapp/SConscript +++ /dev/null @@ -1,42 +0,0 @@ -#****************************************************************** -# -# Copyright 2014 Samsung Electronics All Rights Reserved. -# -#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= - -## -# sampleapp build script -## - -Import('env') - -# Add third party libraries -lib_env = env.Clone() -SConscript('#service/third_party_libs.scons', 'lib_env') -sample_env = lib_env.Clone() -target_os = env.get('TARGET_OS') - -###################################################################### -# Build flags -###################################################################### - -###################################################################### -# Source files and Targets -###################################################################### -if target_os in ['linux']: - # Build linux sample app - SConscript('linux/configuration/SConscript') diff --git a/service/things-manager/sampleapp/android/Sample/.classpath b/service/things-manager/sampleapp/android/Sample/.classpath deleted file mode 100644 index 7bc01d9..0000000 --- a/service/things-manager/sampleapp/android/Sample/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/service/things-manager/sampleapp/android/Sample/.project b/service/things-manager/sampleapp/android/Sample/.project deleted file mode 100644 index 3261c83..0000000 --- a/service/things-manager/sampleapp/android/Sample/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - Sample - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/service/things-manager/sampleapp/android/Sample/AndroidManifest.xml b/service/things-manager/sampleapp/android/Sample/AndroidManifest.xml deleted file mode 100644 index 561e289..0000000 --- a/service/things-manager/sampleapp/android/Sample/AndroidManifest.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/service/things-manager/sampleapp/android/Sample/ic_launcher-web.png b/service/things-manager/sampleapp/android/Sample/ic_launcher-web.png deleted file mode 100644 index a18cbb4..0000000 Binary files a/service/things-manager/sampleapp/android/Sample/ic_launcher-web.png and /dev/null differ diff --git a/service/things-manager/sampleapp/android/Sample/project.properties b/service/things-manager/sampleapp/android/Sample/project.properties deleted file mode 100644 index 68e5d52..0000000 --- a/service/things-manager/sampleapp/android/Sample/project.properties +++ /dev/null @@ -1,15 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-20 -android.library.reference.1=../../../sdk/java diff --git a/service/things-manager/sampleapp/android/Sample/res/drawable-hdpi/ic_launcher.png b/service/things-manager/sampleapp/android/Sample/res/drawable-hdpi/ic_launcher.png deleted file mode 100644 index 288b665..0000000 Binary files a/service/things-manager/sampleapp/android/Sample/res/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/service/things-manager/sampleapp/android/Sample/res/drawable-hdpi/iot.jpg b/service/things-manager/sampleapp/android/Sample/res/drawable-hdpi/iot.jpg deleted file mode 100644 index 17c5a93..0000000 Binary files a/service/things-manager/sampleapp/android/Sample/res/drawable-hdpi/iot.jpg and /dev/null differ diff --git a/service/things-manager/sampleapp/android/Sample/res/drawable-mdpi/ic_launcher.png b/service/things-manager/sampleapp/android/Sample/res/drawable-mdpi/ic_launcher.png deleted file mode 100644 index 6ae570b..0000000 Binary files a/service/things-manager/sampleapp/android/Sample/res/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/service/things-manager/sampleapp/android/Sample/res/drawable-xhdpi/ic_launcher.png b/service/things-manager/sampleapp/android/Sample/res/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index d4fb7cd..0000000 Binary files a/service/things-manager/sampleapp/android/Sample/res/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/service/things-manager/sampleapp/android/Sample/res/drawable-xxhdpi/ic_launcher.png b/service/things-manager/sampleapp/android/Sample/res/drawable-xxhdpi/ic_launcher.png deleted file mode 100644 index 85a6081..0000000 Binary files a/service/things-manager/sampleapp/android/Sample/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/service/things-manager/sampleapp/android/Sample/res/layout/activity_main.xml b/service/things-manager/sampleapp/android/Sample/res/layout/activity_main.xml deleted file mode 100644 index ec14de4..0000000 --- a/service/things-manager/sampleapp/android/Sample/res/layout/activity_main.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - diff --git a/service/things-manager/sampleapp/android/Sample/res/layout/configapis.xml b/service/things-manager/sampleapp/android/Sample/res/layout/configapis.xml deleted file mode 100644 index d27b96d..0000000 --- a/service/things-manager/sampleapp/android/Sample/res/layout/configapis.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/service/things-manager/sampleapp/android/Sample/res/layout/custom_dialog.xml b/service/things-manager/sampleapp/android/Sample/res/layout/custom_dialog.xml deleted file mode 100644 index 5230c5b..0000000 --- a/service/things-manager/sampleapp/android/Sample/res/layout/custom_dialog.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - -