merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:17:58 +0000 (01:17 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:17:58 +0000 (01:17 +0900)
commit37a0aed5cebf4e0d1a7751f21928cd20c4315741
tree645f9caf8d43caa2b8fc8ff3a725ff8f3fa38554
parent9452ee5554bc6bef9d91b228aded847f80d57734
merge with master
222 files changed:
CMakeLists.txt
LICENSE [moved from LICENSE.APLv2.0 with 98% similarity]
NOTICE
ace/CMakeLists.txt [deleted file]
ace/DESCRIPTION [deleted file]
ace/configuration/TizenPolicy.xml [deleted file]
ace/configuration/UnrestrictedPolicy.xml [deleted file]
ace/configuration/WAC2.0Policy.xml [deleted file]
ace/configuration/bondixml.xsd [deleted file]
ace/dao/AceDAO.cpp [deleted file]
ace/dao/AceDAOConversions.cpp [deleted file]
ace/dao/AceDAOReadOnly.cpp [deleted file]
ace/dao/AceDAOUtilities.cpp [deleted file]
ace/dao/AceDatabase.cpp [deleted file]
ace/dao/BaseAttribute.cpp [deleted file]
ace/dao/CMakeLists.txt [deleted file]
ace/dao/PromptModel.cpp [deleted file]
ace/engine/Attribute.cpp [deleted file]
ace/engine/CombinerImpl.cpp [deleted file]
ace/engine/Condition.cpp [deleted file]
ace/engine/ConfigurationManager.cpp [deleted file]
ace/engine/Policy.cpp [deleted file]
ace/engine/PolicyEnforcementPoint.cpp [deleted file]
ace/engine/PolicyEvaluator.cpp [deleted file]
ace/engine/PolicyInformationPoint.cpp [deleted file]
ace/engine/Rule.cpp [deleted file]
ace/engine/SettingsLogic.cpp [deleted file]
ace/engine/Subject.cpp [deleted file]
ace/engine/TreeNode.cpp [deleted file]
ace/engine/parser.cpp [deleted file]
ace/include/ace-dao-ro/AceDAOConversions.h [deleted file]
ace/include/ace-dao-ro/AceDAOReadOnly.h [deleted file]
ace/include/ace-dao-ro/AceDAOUtilities.h [deleted file]
ace/include/ace-dao-ro/AceDatabase.h [deleted file]
ace/include/ace-dao-ro/AppTypes.h [deleted file]
ace/include/ace-dao-ro/BaseAttribute.h [deleted file]
ace/include/ace-dao-ro/BasePermission.h [deleted file]
ace/include/ace-dao-ro/IRequest.h [deleted file]
ace/include/ace-dao-ro/PreferenceTypes.h [deleted file]
ace/include/ace-dao-ro/PromptModel.h [deleted file]
ace/include/ace-dao-ro/TimedVerdict.h [deleted file]
ace/include/ace-dao-ro/ValidityTypes.h [deleted file]
ace/include/ace-dao-ro/VerdictTypes.h [deleted file]
ace/include/ace-dao-ro/common_dao_types.h [deleted file]
ace/include/ace-dao-rw/AceDAO.h [deleted file]
ace/include/ace/AbstractPolicyEnforcementPoint.h [deleted file]
ace/include/ace/AbstractPolicyInformationPoint.h [deleted file]
ace/include/ace/AbstractTreeElement.h [deleted file]
ace/include/ace/AsyncVerdictResultListener.h [deleted file]
ace/include/ace/Attribute.h [deleted file]
ace/include/ace/Combiner.h [deleted file]
ace/include/ace/CombinerImpl.h [deleted file]
ace/include/ace/Condition.h [deleted file]
ace/include/ace/ConfigurationManager.h [deleted file]
ace/include/ace/Constants.h [deleted file]
ace/include/ace/Effect.h [deleted file]
ace/include/ace/PermissionTriple.h [deleted file]
ace/include/ace/Policy.h [deleted file]
ace/include/ace/PolicyEffect.h [deleted file]
ace/include/ace/PolicyEnforcementPoint.h [deleted file]
ace/include/ace/PolicyEvaluator.h [deleted file]
ace/include/ace/PolicyEvaluatorFactory.h [deleted file]
ace/include/ace/PolicyInformationPoint.h [deleted file]
ace/include/ace/PolicyResult.h [deleted file]
ace/include/ace/PolicySet.h [deleted file]
ace/include/ace/Preference.h [deleted file]
ace/include/ace/PromptDecision.h [deleted file]
ace/include/ace/Request.h [deleted file]
ace/include/ace/Rule.h [deleted file]
ace/include/ace/SettingsLogic.h [deleted file]
ace/include/ace/Subject.h [deleted file]
ace/include/ace/TestTimer.h [deleted file]
ace/include/ace/TreeNode.h [deleted file]
ace/include/ace/UserDecision.h [deleted file]
ace/include/ace/Verdict.h [deleted file]
ace/include/ace/WRT_INTERFACE.h [deleted file]
ace/include/ace/WidgetUsageModel.h [deleted file]
ace/include/ace/acf_consts.h [deleted file]
ace/include/ace/parser.h [deleted file]
ace/orm/ace_db [deleted file]
ace/orm/ace_db_definitions [deleted file]
ace/orm/ace_db_sql_generator.h [deleted file]
ace/orm/gen_db_md5.sh [deleted file]
ace/orm/orm_generator_ace.h [deleted file]
ace/orm/version_db [deleted file]
ace_client/CMakeLists.txt [deleted file]
ace_client/include/ace-client/ace_client.h [deleted file]
ace_client/include/ace-client/ace_client_helper.h [deleted file]
ace_client/include/ace-client/ace_client_types.h [deleted file]
ace_client/include/ace_api_client.h [deleted file]
ace_client/include/ace_popup_handler.h [deleted file]
ace_client/src/CMakeLists.txt [deleted file]
ace_client/src/ace_api_client.cpp [deleted file]
ace_client/src/ace_client.cpp [deleted file]
ace_client/src/example/CMakeLists.txt [deleted file]
ace_client/src/example/ace-thin-client-example.cpp [deleted file]
ace_common/CMakeLists.txt [deleted file]
ace_common/include/ace_api_common.h [deleted file]
ace_install/CMakeLists.txt [deleted file]
ace_install/include/ace_api_install.h [deleted file]
ace_install/src/CMakeLists.txt [deleted file]
ace_install/src/ace_api_install.cpp [deleted file]
ace_popup_validation/CMakeLists.txt [deleted file]
ace_popup_validation/include/ace_api_popup_validation.h [deleted file]
ace_popup_validation/src/CMakeLists.txt [deleted file]
ace_popup_validation/src/ace_api_popup_validation.cpp [deleted file]
ace_settings/CMakeLists.txt [deleted file]
ace_settings/include/ace_api_settings.h [deleted file]
ace_settings/src/CMakeLists.txt [deleted file]
ace_settings/src/ace_api_settings.cpp [deleted file]
build/CMakeLists.txt
build/ace/CMakeLists.txt [deleted file]
build/ace/security-dao-ro.pc.in [deleted file]
build/ace/security-dao-rw.pc.in [deleted file]
build/ace/security.pc.in [deleted file]
build/ace_client/CMakeLists.txt [deleted file]
build/ace_client/security-client.pc.in [deleted file]
build/ace_install/CMakeLists.txt [deleted file]
build/ace_install/security-install.pc.in [deleted file]
build/ace_popup_validation/CMakeLists.txt [deleted file]
build/ace_popup_validation/security-popup-validation.pc.in [deleted file]
build/ace_settings/CMakeLists.txt [deleted file]
build/ace_settings/security-settings.pc.in [deleted file]
build/communication_client/CMakeLists.txt [deleted file]
build/communication_client/security-communication-client.pc.in [deleted file]
build/wrt-security/CMakeLists.txt [deleted file]
build/wrt-security/security-core.pc.in [deleted file]
build/wrt_ocsp/CMakeLists.txt [deleted file]
build/wrt_ocsp/security-wrt-ocsp.pc.in [deleted file]
communication_client/include/SecurityCommunicationClient.h [deleted file]
communication_client/src/SecurityCommunicationClient.cpp [deleted file]
etc/CMakeLists.txt [deleted file]
etc/certificates/CMakeLists.txt [deleted file]
etc/certificates/orange.production.pem [deleted file]
etc/certificates/tizen-developer-root-ca.pem [deleted file]
etc/certificates/tizen-distributor-root-ca-partner.pem [deleted file]
etc/certificates/tizen-distributor-root-ca-public.pem [deleted file]
etc/certificates/tizen.root.preproduction.cert.pem [deleted file]
etc/certificates/wac.publisherid.pem [deleted file]
etc/certificates/wac.root.preproduction.pem [deleted file]
etc/certificates/wac.root.production.pem [deleted file]
etc/fingerprint_list.xml [deleted file]
etc/fingerprint_list.xsd [deleted file]
etc/schema.xsd [deleted file]
etc/wrt_security_change_policy.sh [deleted file]
etc/wrt_security_create_clean_db.sh [deleted file]
packaging/security-server.service [new file with mode: 0644]
packaging/security-server.spec
socket_connection/client/SecuritySocketClient.cpp [deleted file]
socket_connection/client/SecuritySocketClient.h [deleted file]
socket_connection/connection/SocketConnection.cpp [deleted file]
socket_connection/connection/SocketConnection.h [deleted file]
socket_connection/connection/SocketStream.cpp [deleted file]
socket_connection/connection/SocketStream.h [deleted file]
src/CMakeLists.txt
src/client/security-server-client.c [moved from src/security-srv/client/security-server-client.c with 91% similarity]
src/communication/security-server-comm.c [moved from src/security-srv/communication/security-server-comm.c with 89% similarity]
src/daemon/dbus/org.tizen.SecurityDaemon.service [deleted file]
src/daemon/dbus/security_daemon_dbus_config.h [deleted file]
src/daemon/dbus/security_dbus_service.cpp [deleted file]
src/daemon/dbus/security_dbus_service.h [deleted file]
src/daemon/security_daemon.cpp [deleted file]
src/daemon/security_daemon.h [deleted file]
src/daemon/sockets/api/callback_api.h [deleted file]
src/daemon/sockets/security_daemon_socket_config.h [deleted file]
src/daemon/sockets/security_socket_service.cpp [deleted file]
src/daemon/sockets/security_socket_service.h [deleted file]
src/include/SLP_security-model_PG.h [moved from src/security-srv/include/SLP_security-model_PG.h with 100% similarity]
src/include/SLP_security-server_PG.h [moved from src/security-srv/include/SLP_security-server_PG.h with 100% similarity]
src/include/security-server-comm.h [moved from src/security-srv/include/security-server-comm.h with 93% similarity]
src/include/security-server-common.h [moved from src/security-srv/include/security-server-common.h with 96% similarity]
src/include/security-server-cookie.h [moved from src/security-srv/include/security-server-cookie.h with 96% similarity]
src/include/security-server-password.h [moved from src/security-srv/include/security-server-password.h with 97% similarity]
src/include/security-server-util.h [moved from src/security-srv/include/security-server-util.h with 100% similarity]
src/include/security-server.h [moved from src/security-srv/include/security-server.h with 97% similarity]
src/main.cpp [deleted file]
src/mw-list [moved from src/security-srv/mw-list with 62% similarity]
src/security-serverd [moved from src/security-srv/security-serverd with 70% similarity]
src/security-srv/CMakeLists.txt--original [deleted file]
src/server/security-server-cookie.c [moved from src/security-srv/server/security-server-cookie.c with 89% similarity]
src/server/security-server-main.c [moved from src/security-srv/server/security-server-main.c with 87% similarity]
src/server/security-server-password.c [moved from src/security-srv/server/security-server-password.c with 99% similarity]
src/services/ace/ace_server_api.h [deleted file]
src/services/ace/ace_service.cpp [deleted file]
src/services/ace/dbus/ace_server_dbus_interface.cpp [deleted file]
src/services/ace/dbus/ace_server_dbus_interface.h [deleted file]
src/services/ace/dbus/api/ace_server_dbus_api.h [deleted file]
src/services/ace/logic/acf_consts.h [deleted file]
src/services/ace/logic/attribute_facade.cpp [deleted file]
src/services/ace/logic/attribute_facade.h [deleted file]
src/services/ace/logic/security_controller.cpp [deleted file]
src/services/ace/logic/security_controller.h [deleted file]
src/services/ace/logic/security_logic.cpp [deleted file]
src/services/ace/logic/security_logic.h [deleted file]
src/services/ace/logic/simple_roaming_agent.cpp [deleted file]
src/services/ace/logic/simple_roaming_agent.h [deleted file]
src/services/ace/socket/ace_service_callbacks.cpp [deleted file]
src/services/ace/socket/ace_service_callbacks.h [deleted file]
src/services/ace/socket/api/ace_service_callbacks_api.h [deleted file]
src/services/caller/security_caller.cpp [deleted file]
src/services/caller/security_caller.h [deleted file]
src/services/ocsp/dbus/api/ocsp_server_dbus_api.h [deleted file]
src/services/ocsp/dbus/ocsp_server_dbus_interface.cpp [deleted file]
src/services/ocsp/dbus/ocsp_server_dbus_interface.h [deleted file]
src/services/ocsp/ocsp_server_api.h [deleted file]
src/services/ocsp/ocsp_service.cpp [deleted file]
src/services/ocsp/socket/api/ocsp_service_callbacks_api.h [deleted file]
src/services/ocsp/socket/ocsp_service_callbacks.cpp [deleted file]
src/services/ocsp/socket/ocsp_service_callbacks.h [deleted file]
src/services/popup/dbus/popup_response_dbus_interface.cpp [deleted file]
src/services/popup/dbus/popup_response_dbus_interface.h [deleted file]
src/services/popup/popup_ace_data_types.h [deleted file]
src/services/popup/popup_response_server_api.h [deleted file]
src/services/popup/socket/api/popup_service_callbacks_api.h [deleted file]
src/services/popup/socket/popup_service_callbacks.cpp [deleted file]
src/services/popup/socket/popup_service_callbacks.h [deleted file]
src/util/security-server-util-common.c [moved from src/security-srv/util/security-server-util-common.c with 99% similarity]
src/util/security-server-util.c [moved from src/security-srv/util/security-server-util.c with 100% similarity]
wrt_ocsp/CMakeLists.txt [deleted file]
wrt_ocsp/include/wrt_ocsp_api.h [deleted file]
wrt_ocsp/src/CMakeLists.txt [deleted file]
wrt_ocsp/src/wrt_ocsp_api.cpp [deleted file]