Merge "Clean makefile and fix provider" into devel_3.0_main

diff --git a/inc/FSecCertICertificatePath.h b/inc/FSecCertICertificatePath.h
index 2905db7..7cfed08 100644 (file)
--- a/inc/FSecCertICertificatePath.h
+++ b/inc/FSecCertICertificatePath.h
@@ -213,6 +213,10 @@ public:
 
        /**
         *  Adds a certificate to the certificate chain.
+        *  The order of certificaett addition should be
+        *  1. Add user certificate.
+        *  2. Add intermediate certificate.
+        *  3. Add root CA certificate.
         *
         *      @since          2.0
         *

diff --git a/inc/FSecCertX509CertificatePath.h b/inc/FSecCertX509CertificatePath.h
index 92b881a..4f6bc60 100644 (file)
--- a/inc/FSecCertX509CertificatePath.h
+++ b/inc/FSecCertX509CertificatePath.h
@@ -74,6 +74,10 @@ public:
 
        /**
         *      Adds a certificate to the certificate chain.
+        *  The order of certificaett addition should be
+        *  1. Add user certificate.
+        *  2. Add intermediate certificate.
+        *  3. Add root CA certificate.
         *
         *      @since          2.0
         *

diff --git a/src/app/FApp_AppArg.cpp b/src/app/FApp_AppArg.cpp
index 2d33f5a..3d5c714 100644 (file)
--- a/src/app/FApp_AppArg.cpp
+++ b/src/app/FApp_AppArg.cpp
@@ -1242,49 +1242,6 @@ _AppArg::Print(bundle* b)
                return;
        }
 
-       const char* p = null;
-       p = appsvc_get_data(b, AUL_K_CALLER_PID);
-       if (p)
-       {
-               SysLog(NID_APP, "CallerPId[%s]", p);
-       }
-
-       p = appsvc_get_data(b, AUL_K_WAIT_RESULT);
-       if (p)
-       {
-               SysLog(NID_APP, "WaitResult[%s]", p);
-       }
-
-       p = appsvc_get_data(b, OSP_K_COND);
-       if (p)
-       {
-               SysLog(NID_APP, "Condition[%s]", p);
-       }
-
-       p = appsvc_get_operation(b);
-       if (p)
-       {
-               SysLog(NID_APP, "operation[%s]", p);
-       }
-
-       p = appsvc_get_uri(b);
-       if (p)
-       {
-               SysLog(NID_APP, "uri[%s]", p);
-       }
-
-       p = appsvc_get_mime(b);
-       if (p)
-       {
-               SysLog(NID_APP, "mime[%s]", p);
-       }
-
-       p = appsvc_get_category(b);
-       if (p)
-       {
-               SysLog(NID_APP, "Category[%s]", p);
-       }
-
        bundle_foreach(b, BundlePrintIterFnCb, NULL);
 
        int len = 0;

diff --git a/src/app/FApp_AppControlRegistry.cpp b/src/app/FApp_AppControlRegistry.cpp
index 1cd9620..8bcb653 100644 (file)
--- a/src/app/FApp_AppControlRegistry.cpp
+++ b/src/app/FApp_AppControlRegistry.cpp
@@ -59,7 +59,6 @@ const wchar_t ACTL_ALIAS_FILE[] = L"/usr/etc/app-control-appid.ini";
 
 const wchar_t TIZEN_ALIAS_APPID_PREFIX[] = L"tizen.";
 
-const String ACTL_REGISTRY_PUBLIC = L"Public";
 const String ACTL_REGISTRY_PATH = L"Path";
 const String ACTL_REGISTRY_ALIAS_PROVIDER = L"PROVIDER_ALIAS";
 
@@ -149,26 +148,6 @@ _AppControlRegistry::LoadTizenAppControlRegistry(void)
                        continue;
                }
 
-#if 0
-               int public_open = 0;
-
-               ///////////////////////////////////////////////////////////////////////
-               // Plubic
-               index = reg.GetEntryIndex(i, ACTL_REGISTRY_PUBLIC);
-               if (index >= 0)
-               {
-                       size = sizeof(size);
-                       num = 0;
-
-                       reg.GetEntryValue(i, index, REG_VALUE_TYPE_INT, &num, &size);
-                       if (num == 1)
-                       {
-                               // public
-                               public_open = 1;
-                       }
-               }
-#endif
-
                ///////////////////////////////////////////////////////////////////////
                // Path
                index = reg.GetEntryIndex(i, ACTL_REGISTRY_PATH);

diff --git a/src/app/inc/FApp_AppLifecycleEvent.cpp b/src/app/inc/FApp_AppLifecycleEvent.cpp
deleted file mode 100755 (executable)
index 175adbc..0000000
--- a/src/app/inc/FApp_AppLifecycleEvent.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-//\r
-// Copyright (c) 2012 Samsung Electronics Co., Ltd.\r
-//\r
-// Licensed under the Apache License, Version 2.0 (the License);\r
-// you may not use this file except in compliance with the License.\r
-// You may obtain a copy of the License at\r
-//\r
-//     http://www.apache.org/licenses/LICENSE-2.0\r
-//\r
-// Unless required by applicable law or agreed to in writing, software\r
-// distributed under the License is distributed on an "AS IS" BASIS,\r
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-// See the License for the specific language governing permissions and\r
-// limitations under the License.\r
-//\r
-\r
-/**\r
- * @file        FApp_AppLifecycleEvent.cpp\r
- * @brief      This is the implementation for the _AppLifecycleEvent.cpp class.\r
- */\r
-\r
-#include <FBaseSysLog.h>\r
-\r
-#include "FApp_Types.h"\r
-#include "FApp_AppLifecycleEvent.h"\r
-#include "FApp_AppLifecycleEventArg.h"\r
-#include "FApp_IAppLifecycleEventListener.h"\r
-\r
-using namespace Tizen::Base;\r
-using namespace Tizen::Base::Runtime;\r
-\r
-\r
-namespace Tizen { namespace App\r
-{\r
-\r
-_AppLifecycleEventArg::_AppLifecycleEventArg(void)\r
-{\r
-}\r
-\r
-_AppLifecycleEventArg::_AppLifecycleEventArg(const AppId& appId, _AppLifecycleEventType appLifecycleEventType)\r
-       : __appId(appId)\r
-       , __appLifecycleEventType(appLifecycleEventType)\r
-{\r
-}\r
-\r
-_AppLifecycleEventArg::~_AppLifecycleEventArg(void)\r
-{\r
-}\r
-\r
-const AppId\r
-_AppLifecycleEventArg::GetAppId(void) const\r
-{\r
-       return __appId;\r
-}\r
-\r
-_AppLifecycleEventType\r
-_AppLifecycleEventArg::GetAppLifecycleEventType(void) const\r
-{\r
-       return __appLifecycleEventType;\r
-}\r
-\r
-///////////////////////////////////////////////////////\r
-//_AppLifecycleEvent\r
-///////////////////////////////////////////////////////\r
-result\r
-_AppLifecycleEvent::Construct(void)\r
-{\r
-       return _Event::Initialize();\r
-}\r
-\r
-void\r
-_AppLifecycleEvent::FireImpl(IEventListener& listener, const IEventArg& arg)\r
-{\r
-       _IAppLifecycleEventListener* pListener = dynamic_cast<_IAppLifecycleEventListener*>(&listener);\r
-       SysTryReturnVoidResult(NID_APP, pListener != null, E_INVALID_STATE, "Invalid listener : listener(0x%x), arg(0x%x)", &listener, &arg);\r
-\r
-       const _AppLifecycleEventArg* pEventArg = dynamic_cast<const _AppLifecycleEventArg*>(&arg);\r
-       SysTryReturnVoidResult(NID_APP, pEventArg != null, E_INVALID_STATE, "Invalid arg : listener(0x%x), arg(0x%x)", &listener, &arg);\r
-\r
-       pListener->OnAppLifecycleEventReceived(pEventArg->GetAppId(), pEventArg->GetAppLifecycleEventType());\r
-}\r
-\r
-} } // Tizen::App\r
-\r