Modify about Provider Configuration.

1. NSStartProvider API modify arguments in proivder side.
2. comments out about jni, unittest in SConscript.

Change-Id: I5d890690f472c4ff9e1ffa22772ddf658d2dca4c
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10097
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

diff --git a/service/notification/SConscript b/service/notification/SConscript
index e2ac640..957d4e3 100644 (file)
--- a/service/notification/SConscript
+++ b/service/notification/SConscript
@@ -111,15 +111,15 @@ notification_env.UserInstallTargetHeader('include/NSConsumerInterface.h',\
        'service/notification', 'NSConsumerInterface.h')
 
 # Go to build Unit test
-if target_os == 'linux':
- SConscript('unittest/SConscript')
+#if target_os == 'linux':
+ #SConscript('unittest/SConscript')
 
 # Go to build sample apps
 SConscript('examples/SConscript')
 
 # Go to build jni
-if target_os == 'android':
-    SConscript('android/SConscript')
+#if target_os == 'android':
+#    SConscript('android/SConscript')
 
  # Go to build c++ wrapper
-SConscript('cpp-wrapper/SConscript')
\ No newline at end of file
+#SConscript('cpp-wrapper/SConscript')
\ No newline at end of file

diff --git a/service/notification/examples/linux/notificationprovider.c b/service/notification/examples/linux/notificationprovider.c
index 105ef7c..ab2427c 100644 (file)
--- a/service/notification/examples/linux/notificationprovider.c
+++ b/service/notification/examples/linux/notificationprovider.c
@@ -156,12 +156,27 @@ int main()
         switch (num)\r
         {\r
             case 1:\r
+            {\r
                 printf("NSStartProvider(Accepter: Provider)");\r
-                NSStartProvider(true, subscribeRequestCallback, syncCallback);\r
+                NSProviderConfig config;\r
+                config.policy = false;\r
+                config.subRequestCallback = subscribeRequestCallback;\r
+                config.syncInfoCallback = syncCallback;\r
+                config.userInfo = OICStrdup("OCF_NOTIFICATION");\r
+                NSStartProvider(config);\r
+            }\r
                 break;\r
+\r
             case 2:\r
+            {\r
                 printf("NSStartProvider(Accepter: Consumer)");\r
-                NSStartProvider(false, subscribeRequestCallback, syncCallback);\r
+                NSProviderConfig config;\r
+                config.policy = false;\r
+                config.subRequestCallback = subscribeRequestCallback;\r
+                config.syncInfoCallback = syncCallback;\r
+                config.userInfo = OICStrdup("OCF_NOTIFICATION");\r
+                NSStartProvider(config);\r
+            }\r
                 break;\r
             case 3:\r
                 printf("NSSendNotification()");\r

diff --git a/service/notification/include/NSProviderInterface.h b/service/notification/include/NSProviderInterface.h
index 6163d34..f7e4704 100644 (file)
--- a/service/notification/include/NSProviderInterface.h
+++ b/service/notification/include/NSProviderInterface.h
@@ -73,9 +73,7 @@ typedef struct
  * @param[in]  config   Refer to NSProviderConfig\r
  * @return ::NS_OK or result code of NSResult\r
  */\r
-//TODO next commit, change to NSProviderConfig ..\r
-NSResult NSStartProvider(bool policy, NSSubscribeRequestCallback subscribeRequestCb,\r
-        NSProviderSyncInfoCallback syncCb);\r
+NSResult NSStartProvider(NSProviderConfig config);\r
 \r
 /**\r
  * Terminate notification service for provider\r

diff --git a/service/notification/src/provider/NSProviderInterface.c b/service/notification/src/provider/NSProviderInterface.c
index 95c4662..c91f03d 100644 (file)
--- a/service/notification/src/provider/NSProviderInterface.c
+++ b/service/notification/src/provider/NSProviderInterface.c
@@ -42,8 +42,7 @@ void initializeMutex()
     nsInitMutex = initMutex;\r
 }\r
 \r
-NSResult NSStartProvider(bool policy, NSSubscribeRequestCallback subscribeRequestCb,\r
-        NSProviderSyncInfoCallback syncCb)\r
+NSResult NSStartProvider(NSProviderConfig config)\r
 {\r
     NS_LOG(DEBUG, "NSStartProvider - IN");\r
 \r
@@ -55,10 +54,10 @@ NSResult NSStartProvider(bool policy, NSSubscribeRequestCallback subscribeReques
     {\r
         NS_LOG(DEBUG, "Init Provider");\r
         initProvider = true;\r
-        NSInitProviderInfo();\r
-        NSSetSubscriptionAccessPolicy(policy);\r
-        NSRegisterSubscribeRequestCb(subscribeRequestCb);\r
-        NSRegisterSyncCb(syncCb);\r
+        NSInitProviderInfo(config.userInfo);\r
+        NSSetSubscriptionAccessPolicy(config.policy);\r
+        NSRegisterSubscribeRequestCb(config.subRequestCallback);\r
+        NSRegisterSyncCb(config.syncInfoCallback);\r
         CARegisterNetworkMonitorHandler((CAAdapterStateChangedCB)NSProviderAdapterStateListener,\r
                 (CAConnectionStateChangedCB)NSProviderConnectionStateListener);\r
 \r