OpenRTM · Nobu19800 · Jan 18, 2022 · Jan 19, 2022 · Jan 20, 2022 · Jan 20, 2022
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,6 +18,8 @@ if(CCACHE_PROGRAM)
    set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PROGRAM}")
 endif()
 
+set(SSL_ENABLE FALSE CACHE BOOL "set SSL_ENABLE")
+
 if(NOT ORB_ROOT)
 	if(CORBA STREQUAL "omniORB")
 		if(UNIX)
@@ -46,6 +48,9 @@ if(NOT ORB_ROOT)
 			set(ACE_TAO_INCLUDE_DIRS ${TAO_Svc_Utils_INCLUDE_DIRS} ${TAO_CosNaming_INCLUDE_DIRS} ${TAO_IORTable_INCLUDE_DIRS} ${TAO_Utils_INCLUDE_DIRS} ${TAO_Strategies_INCLUDE_DIRS})
 			set(ACE_TAO_CFLAGS ${TAO_Svc_Utils_CFLAGS} ${TAO_CosNaming_CFLAGS} ${TAO_IORTable_CFLAGS} ${TAO_Utils_CFLAGS} ${TAO_Strategies_CFLAGS})
 			set(ACE_TAO_DIR ${TAO_Svc_Utils_PREFIX})
+			if(SSL_ENABLE)
+				set(ACE_TAO_LIBRARIES ${ACE_TAO_LIBRARIES} TAO_Security)
+			endif()
 		else(UNIX)
 			message(FATAL_ERROR "Please set ORB_ROOT.")
 		endif(UNIX)		
@@ -119,7 +124,7 @@ else()
 	set(INSTALL_RTM_SHARE_DIR share)
 endif(MSVC)
 
-set(SSL_ENABLE FALSE CACHE BOOL "set SSL_ENABLE")
+set(HTTP_ENABLE FALSE CACHE BOOL "set HTTP_ENABLE")
 set(OBSERVER_ENABLE FALSE CACHE BOOL "set OBSERVER_ENABLE")
 
 set(LOGGING_ENABLE TRUE CACHE BOOL "set LOGGING_ENABLE")
@@ -160,8 +165,8 @@ elseif(CORBA STREQUAL "omniORB")
 			message(FATAL_ERROR "can not find THIS_IS_OMNIORB_*_*_*.")
 		endif()
 		get_filename_component(OMNIORB_VERSIONFILE "${OMNIORB_VERSIONFILEPATH}" NAME)
-		string(REGEX REPLACE "THIS_IS_OMNIORB_([0-9])_([0-9])_([0-9])$" "\\1\\2" OMNI_VERSION ${OMNIORB_VERSIONFILE})
-		string(REGEX REPLACE "THIS_IS_OMNIORB_([0-9])_([0-9])_([0-9])$" "\\3" OMNI_MINOR ${OMNIORB_VERSIONFILE})
+		string(REGEX REPLACE "THIS_IS_OMNIORB_([0-9])_([0-9])_([0-9]).*$" "\\1\\2" OMNI_VERSION ${OMNIORB_VERSIONFILE})
+		string(REGEX REPLACE "THIS_IS_OMNIORB_([0-9])_([0-9])_([0-9]).*$" "\\3" OMNI_MINOR ${OMNIORB_VERSIONFILE})
 		string(REGEX REPLACE "([0-9])([0-9])$" "\\1" OMNI_VERSION1 ${OMNI_VERSION})
 		string(REGEX REPLACE "([0-9])([0-9])$" "\\2" OMNI_VERSION2 ${OMNI_VERSION})
 	endif()
@@ -267,6 +272,9 @@ elseif(CORBA STREQUAL "omniORB")
 		set(ORB_LIBRARIES omniDynamic4 omniORB4 omnithread)
 		if(SSL_ENABLE)
 			set(ORBSSL_LIBRARIES omnisslTP4)
+			if(HTTP_ENABLE)
+				set(ORBHTTP_LIBRARIES omnihttpCrypto4 omnihttpTP4)
+			endif(HTTP_ENABLE)
 		endif(SSL_ENABLE)
 
 
@@ -302,13 +310,18 @@ elseif(CORBA STREQUAL "omniORB")
 		set(ORB_LIBRARIES optimized;omniDynamic${OMNI_VERSION}${OMNI_MINOR}_rt;optimized;omniORB${OMNI_VERSION}${OMNI_MINOR}_rt;optimized;omnithread${OMNITHREAD_VERSION}_rt;debug;omniDynamic${OMNI_VERSION}${OMNI_MINOR}_rtd;debug;omniORB${OMNI_VERSION}${OMNI_MINOR}_rtd;debug;omnithread${OMNITHREAD_VERSION}_rtd)
 		if(SSL_ENABLE)
 			set(ORBSSL_LIBRARIES optimized;omnisslTP${OMNI_VERSION}${OMNI_MINOR}_rt;debug;omnisslTP${OMNI_VERSION}${OMNI_MINOR}_rtd)
+			if(HTTP_ENABLE)
+				set(ORBHTTP_LIBRARIES 
+					optimized;omnihttpCrypto${OMNI_VERSION}${OMNI_MINOR}_rt;debug;omnihttpCrypto${OMNI_VERSION}${OMNI_MINOR}_rtd;
+					optimized;omnihttpTP${OMNI_VERSION}${OMNI_MINOR}_rt;debug;omnihttpTP${OMNI_VERSION}${OMNI_MINOR}_rtd)
+			endif(HTTP_ENABLE)
 		endif(SSL_ENABLE)
 
 
 
 		set(ORB_INSTALL_DIR ${OPENRTM_VERSION}/omniORB/${OMNI_VERSION1}.${OMNI_VERSION2}.${OMNI_MINOR}_${RTM_VC_VER}/)
 
-		foreach(library ${ORB_LIBRARIES};${ORBSSL_LIBRARIES})
+		foreach(library ${ORB_LIBRARIES};${ORBSSL_LIBRARIES};${ORBHTTP_LIBRARIES})
 			if((NOT (${library} STREQUAL "optimized")) AND (NOT (${library} STREQUAL "debug")))
 				string(REPLACE "_rt" "*" dll "${library}")
 				file(GLOB OMNIORB_DLLS "${OMNIORB_BINARY_DIR}/${dll}.dll")
@@ -366,6 +379,9 @@ elseif(CORBA STREQUAL "omniORB")
 	endif(VXWORKS)
 elseif(CORBA STREQUAL "TAO")
 	set(CORBA_NAME "TAO" CACHE STRING "CORBA name.")
+	if(SSL_ENABLE)
+		set(ORB_C_FLAGS_LIST ${ORB_C_FLAGS_LIST} -DSSL_ENABLE)
+	endif()
 
 	if(VXWORKS)
 		if("${VX_CPU_FAMILY}" STREQUAL "ppc")
@@ -376,7 +392,7 @@ elseif(CORBA STREQUAL "TAO")
 		SET(ORB_C_FLAGS_LIST ${ORB_C_FLAGS_LIST} -DACE_VXWORKS=0x690 -DACE_HAS_PTHREADS -DACE_HAS_AIO_CALLS -DACE_LACKS_ISBLANK)
 
 		set(ORB_LINK_DIR ${ORB_ROOT}/lib)
-		set(ORB_LIBRARIES TAO_AnyTypeCode TAO_PortableServer TAO_Svc_Utils TAO_CosNaming TAO_DynamicInterface TAO_PI TAO_Utils TAO_PortableServer TAO_DiffServPolicy TAO_DynamicInterface TAO_Strategies TAO ACE)
+		set(ORB_LIBRARIES TAO_AnyTypeCode TAO_PortableServer TAO_Svc_Utils TAO_CosNaming TAO_DynamicInterface TAO_PI TAO_Utils TAO_PortableServer TAO_DiffServPolicy TAO_Strategies TAO ACE)
 		set(ORB_INCLUDE_DIR ${ORB_ROOT} ${ORB_ROOT}/TAO ${ORB_ROOT}/TAO/orbsvcs)
 	elseif(UNIX)
 		if(ORB_ROOT)
@@ -397,7 +413,7 @@ elseif(CORBA STREQUAL "TAO")
 		set(ORB_INCLUDE_DIR ${ORB_ROOT} ${ORB_ROOT}/TAO ${ORB_ROOT}/TAO/orbsvcs)
 		SET(ORB_C_FLAGS_LIST ${ORB_C_FLAGS_LIST} -DWIN32_LEAN_AND_MEAN -DWITH_ACE)
 
-		set(ORB_LIBRARIES_INSTALL ${ORB_LIBRARIES1};TAO_IDL_FE;TAO_IDL_FEd;TAO_IDL_BE;TAO_IDL_BEd;)
+		set(ORB_LIBRARIES_INSTALL ${ORB_LIBRARIES1};TAO_IDL_FE;TAO_IDL_FEd;TAO_IDL_BE;TAO_IDL_BEd;TAO_Codeset;TAO_Codesetd;TAO_CosNaming_Skel;TAO_CosNaming_Serv;TAO_CosNaming_Servd;TAO_ImR_Client;TAO_ImR_Clientd;TAO_Messaging;TAO_Messagingd;TAO_Valuetype;TAO_Valuetyped;TAO_IORManip;TAO_IORManipd;TAO_CosNaming_Skeld;TAO_HTIOP;TAO_HTIOPd;ACE_HTBP;ACE_HTBPd;)
 		set(ORB_INSTALL_DIR ${OPENRTM_VERSION}/ACE/${RTM_VC_VER}/)
 		foreach(library ${ORB_LIBRARIES_INSTALL})
 			if((NOT (${library} STREQUAL "optimized")) AND (NOT (${library} STREQUAL "debug")))

diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt
@@ -5,5 +5,73 @@ cmake_minimum_required (VERSION 3.5.1)
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/rtc.conf.sample DESTINATION ${INSTALL_RTM_ETC_DIR} COMPONENT ext)
 
 if(CORBA STREQUAL "TAO")
-	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/tao_udp/svc.conf DESTINATION ${INSTALL_RTM_ETC_DIR}/tao_udp COMPONENT ext)
+	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/tao_diop/svc.diop.conf DESTINATION ${INSTALL_RTM_ETC_DIR}/tao_diop COMPONENT ext)
+
+	configure_file(
+		${CMAKE_CURRENT_SOURCE_DIR}/tao_diop/rtc.diop.conf.in ${PROJECT_BINARY_DIR}/rtc.diop.conf @ONLY)
+	install(
+		FILES ${PROJECT_BINARY_DIR}/rtc.diop.conf
+		DESTINATION ${INSTALL_RTM_ETC_DIR}/tao_diop
+		COMPONENT ext)
+
+
+
+	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/tao_htiop/HT_Config.conf DESTINATION ${INSTALL_RTM_ETC_DIR}/tao_htiop COMPONENT ext)
+
+	configure_file(
+		${CMAKE_CURRENT_SOURCE_DIR}/tao_htiop/svc.htiop.conf.in ${PROJECT_BINARY_DIR}/svc.htiop.conf @ONLY)
+	install(
+		FILES ${PROJECT_BINARY_DIR}/svc.htiop.conf
+		DESTINATION ${INSTALL_RTM_ETC_DIR}/tao_htiop
+		COMPONENT ext)
+
+	configure_file(
+		${CMAKE_CURRENT_SOURCE_DIR}/tao_htiop/rtc.htiop.conf.in ${PROJECT_BINARY_DIR}/rtc.htiop.conf @ONLY)
+	install(
+		FILES ${PROJECT_BINARY_DIR}/rtc.htiop.conf
+		DESTINATION ${INSTALL_RTM_ETC_DIR}/tao_htiop
+		COMPONENT ext)
+
+
+
+	configure_file(
+		${CMAKE_CURRENT_SOURCE_DIR}/tao_ssliop/rtc.ssliop.conf.in ${PROJECT_BINARY_DIR}/rtc.ssliop.conf @ONLY)
+	install(
+		FILES ${PROJECT_BINARY_DIR}/rtc.ssliop.conf
+		DESTINATION ${INSTALL_RTM_ETC_DIR}/tao_ssliop
+		COMPONENT ext)
+
+	configure_file(
+		${CMAKE_CURRENT_SOURCE_DIR}/tao_ssliop/svc.ssliop.conf.in ${PROJECT_BINARY_DIR}/svc.ssliop.conf @ONLY)
+	install(
+		FILES ${PROJECT_BINARY_DIR}/svc.ssliop.conf
+		DESTINATION ${INSTALL_RTM_ETC_DIR}/tao_ssliop
+		COMPONENT ext)
+
+
+	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/tao_shmiop/svc.shmiop.conf DESTINATION ${INSTALL_RTM_ETC_DIR}/tao_shmiop COMPONENT ext)
+
+	configure_file(
+		${CMAKE_CURRENT_SOURCE_DIR}/tao_shmiop/rtc.shmiop.conf.in ${PROJECT_BINARY_DIR}/rtc.shmiop.conf @ONLY)
+	install(
+		FILES ${PROJECT_BINARY_DIR}/rtc.shmiop.conf
+		DESTINATION ${INSTALL_RTM_ETC_DIR}/tao_shmiop
+		COMPONENT ext)
+
+
+	configure_file(
+		${CMAKE_CURRENT_SOURCE_DIR}/svc.names.htiop.conf.in ${PROJECT_BINARY_DIR}/svc.names.htiop.conf @ONLY)
+	install(
+		FILES ${PROJECT_BINARY_DIR}/svc.names.htiop.conf
+		DESTINATION ${INSTALL_RTM_ETC_DIR}
+		COMPONENT ext)
+
+	configure_file(
+		${CMAKE_CURRENT_SOURCE_DIR}/svc.names.ssliop.conf.in ${PROJECT_BINARY_DIR}/svc.names.ssliop.conf @ONLY)
+	install(
+		FILES ${PROJECT_BINARY_DIR}/svc.names.ssliop.conf
+		DESTINATION ${INSTALL_RTM_ETC_DIR}
+		COMPONENT ext)
+
+
 endif()
diff --git a/etc/HT_Config.conf b/etc/HT_Config.conf
@@ -0,0 +1,10 @@
+
+[htbp]
+# The Proxy_port and proxy_host values control how the HTIOP "inside" peers
+# to connect to "outside" peers. In situations where the process inside a
+# protected enclave is required to vector all HTTP traffic through some
+# third-party proxy, such as Squid, then put the host and port for that
+# proxy here.
+
+#proxy_port=3128
+#proxy_host=rtai.ociweb.com
diff --git a/etc/svc.names.htiop.conf.in b/etc/svc.names.htiop.conf.in
@@ -0,0 +1,6 @@
+
+dynamic HTIOP_Factory Service_Object *
+        TAO_HTIOP:_make_TAO_HTIOP_Protocol_Factory ()
+        "-config @CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_ETC_DIR@/HT_Config.conf"
+
+static Resource_Factory "-ORBProtocolFactory HTIOP_Factory"
diff --git a/etc/svc.names.ssliop.conf.in b/etc/svc.names.ssliop.conf.in
@@ -0,0 +1,4 @@
+dynamic SSLIOP_Factory Service_Object *
+        TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
+        "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:@CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_ETC_DIR@/ssl/server.pem -SSLCertificate PEM:@CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_ETC_DIR@/ssl/root.crt -SSLPassword passward -SSLCAfile PEM:@CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_ETC_DIR@/ssl/root.crt"
+static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/etc/tao_diop/rtc.diop.conf.in b/etc/tao_diop/rtc.diop.conf.in
@@ -0,0 +1,5 @@
+logger.enable: YES
+logger.log_level: DEBUG
+#logger.file_name: stdout
+
+corba.args: -ORBEndpoint iiop://: -ORBEndpoint diop://: -ORBSvcConf @CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_ETC_DIR@/tao_diop/svc.diop.conf
diff --git a/etc/tao_udp/svc.conf → etc/tao_diop/svc.diop.conf b/etc/tao_udp/svc.conf → etc/tao_diop/svc.diop.conf
diff --git a/etc/tao_htiop/HT_Config.conf b/etc/tao_htiop/HT_Config.conf
@@ -0,0 +1,10 @@
+
+[htbp]
+# The Proxy_port and proxy_host values control how the HTIOP "inside" peers
+# to connect to "outside" peers. In situations where the process inside a
+# protected enclave is required to vector all HTTP traffic through some
+# third-party proxy, such as Squid, then put the host and port for that
+# proxy here.
+
+#proxy_port=3128
+#proxy_host=rtai.ociweb.com
diff --git a/etc/tao_htiop/rtc.htiop.conf.in b/etc/tao_htiop/rtc.htiop.conf.in
@@ -0,0 +1,8 @@
+logger.enable: YES
+logger.log_level: DEBUG
+#logger.file_name: stdout
+
+corba.args: -ORBEndpoint htiop:// -ORBSvcConf @CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_ETC_DIR@/tao_htiop/svc.htiop.conf
+
+corba.nameservers: corbaloc:htiop:127.0.0.1:2809
+corba.master_manager: htiop://127.0.0.1:2810
diff --git a/etc/tao_htiop/svc.htiop.conf.in b/etc/tao_htiop/svc.htiop.conf.in
@@ -0,0 +1,6 @@
+
+dynamic HTIOP_Factory Service_Object *
+        TAO_HTIOP:_make_TAO_HTIOP_Protocol_Factory ()
+        "-config @CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_ETC_DIR@/tao_htiop/HT_Config.conf"
+
+static Advanced_Resource_Factory "-ORBProtocolFactory HTIOP_Factory"
diff --git a/etc/tao_shmiop/rtc.shmiop.conf.in b/etc/tao_shmiop/rtc.shmiop.conf.in
@@ -0,0 +1,9 @@
+logger.enable: YES
+logger.log_level: DEBUG
+#logger.file_name: stdout
+
+corba.args: -ORBEndpoint shmiop:// -ORBSvcConf @CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_ETC_DIR@/tao_shmiop/svc.shmiop.conf
+
+
+#corba.nameservers: corbaloc:shmiop:1.0@:2809
+#corba.master_manager: shmiop://1.0@hostname:2810
diff --git a/etc/tao_shmiop/svc.shmiop.conf b/etc/tao_shmiop/svc.shmiop.conf
@@ -0,0 +1 @@
+static Advanced_Resource_Factory "-ORBProtocolFactory SHMIOP_Factory -ORBProtocolFactory IIOP_Factory -ORBReactorType select_st"
diff --git a/etc/tao_ssliop/rtc.ssliop.conf.in b/etc/tao_ssliop/rtc.ssliop.conf.in
@@ -0,0 +1,8 @@
+logger.enable: YES
+logger.log_level: DEBUG
+#logger.file_name: stdout
+
+corba.args: -ORBEndpoint ssliop://: -ORBSvcConf @CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_ETC_DIR@/tao_ssliop/svc.ssliop.conf
+
+corba.nameservers: corbaloc:ssliop:127.0.0.1:2809
+corba.master_manager: ssliop://127.0.0.1:2810
diff --git a/etc/tao_ssliop/svc.ssliop.conf.in b/etc/tao_ssliop/svc.ssliop.conf.in
@@ -0,0 +1,4 @@
+dynamic SSLIOP_Factory Service_Object *
+        TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
+        "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:@CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_ETC_DIR@/ssl/server.pem -SSLCertificate PEM:@CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_ETC_DIR@/ssl/root.crt -SSLPassword passward -SSLCAfile PEM:@CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_ETC_DIR@/ssl/root.crt"
+static Advanced_Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/src/ext/CMakeLists.txt b/src/ext/CMakeLists.txt
@@ -16,4 +16,7 @@ endif(VXWORKS)
 
 if(SSL_ENABLE)
 	add_subdirectory(ssl)
+	if(HTTP_ENABLE)
+		add_subdirectory(http)
+	endif(HTTP_ENABLE)
 endif(SSL_ENABLE)
diff --git a/src/ext/http/CMakeLists.txt b/src/ext/http/CMakeLists.txt
@@ -0,0 +1,57 @@
+cmake_minimum_required (VERSION 3.5.1)
+
+project (HTTPTransport
+	VERSION ${RTM_VERSION}
+	LANGUAGES CXX)
+
+
+set(OPENSSL_ROOT ${OPENSSL_ROOT} CACHE PATH "set OPENSSL_ROOT")
+
+if(OPENSSL_ROOT)
+	set(OPENSSL_ROOT_DIR ${OPENSSL_ROOT})
+endif(OPENSSL_ROOT)
+
+find_package(OpenSSL REQUIRED)
+
+
+link_directories(${ORB_LINK_DIR} ${SSL_LINK_DIR})
+add_definitions(${ORB_C_FLAGS_LIST})
+add_definitions(${COIL_C_FLAGS_LIST})
+if(WIN32)
+	add_definitions(-DRTM_SKEL_IMPORT_SYMBOL)
+endif()
+
+
+set(target HTTPTransport)
+
+set(srcs HTTPTransport.cpp )
+
+
+set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${OPENSSL_LIBRARIES} ${ORBSSL_LIBRARIES} ${ORBHTTP_LIBRARIES} ${DATATYPE_FACTORIES})
+
+add_library(${target} SHARED ${srcs})
+openrtm_set_link_props_shared(${target})
+openrtm_common_set_compile_props(${target})
+openrtm_include_rtm(${target})
+target_include_directories(${target} SYSTEM
+	PRIVATE ${OPENSSL_INCLUDE_DIR})
+target_link_libraries(${target} PRIVATE ${libs} ${RTM_LINKER_OPTION})
+set_target_properties(${target} PROPERTIES PREFIX "")
+
+
+install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/http
+			RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/http
+			COMPONENT ext)
+
+set(INSTALL_HTTPTRANSPORT_DIR ${INSTALL_RTM_EXT_DIR}/http)
+
+set(PROTOCOLS ${PROTOCOLS} http https ws wss)
+
+foreach(PROTOCOL ${PROTOCOLS})
+	configure_file(
+		${CMAKE_CURRENT_SOURCE_DIR}/rtc.${PROTOCOL}.conf.in ${PROJECT_BINARY_DIR}/rtc.${PROTOCOL}.conf @ONLY)
+	install(
+		FILES ${PROJECT_BINARY_DIR}/rtc.${PROTOCOL}.conf
+		DESTINATION ${INSTALL_RTM_ETC_DIR}/http
+		COMPONENT ext)
+endforeach()
diff --git a/src/ext/http/HTTPTransport.cpp b/src/ext/http/HTTPTransport.cpp
@@ -0,0 +1,53 @@
+#include <rtm/Manager.h>
+#include <omniORB4/httpContext.h>
+
+
+
+void HTTPTransportSet(RTC::Manager* manager)
+{
+	coil::Properties &prop = manager->getConfig();
+
+	std::string http_certificate_authority_file = prop["corba.http.certificate_authority_file"];
+  std::string http_key_file = prop["corba.http.key_file"];
+  std::string http_key_file_password = prop["corba.http.key_file_password"];
+  if(!http_certificate_authority_file.empty())
+    omni::httpContext::certificate_authority_file = CORBA::string_dup(http_certificate_authority_file.c_str());
+  if(!http_key_file.empty())
+    omni::httpContext::key_file = CORBA::string_dup(http_key_file.c_str());
+  if(!http_key_file_password.empty())
+    omni::httpContext::key_file_password = CORBA::string_dup(http_key_file_password.c_str());
+
+
+	std::string corba_args = prop["corba.args"];
+
+	if (corba_args.find("giop:http") == std::string::npos)
+	{
+		corba_args += " -ORBendPoint giop:http:ws:///ws";
+	}
+
+	if (!coil::toBool(prop["manager.is_master"], "YES", "NO", true))
+	{
+		if (prop.getProperty("corba.endpoints").empty())
+		{
+			if (prop.getProperty("corba.endpoint").empty())
+			{
+				if (prop["corba.args"].find("-ORBendPoint") == std::string::npos)
+				{
+					corba_args += " -ORBendPoint giop:tcp::";
+				}
+			}
+		}
+	}
+	prop.setProperty("corba.args", corba_args);
+
+}
+
+
+extern "C"
+{
+ 	DLL_EXPORT void HTTPTransportInit(RTC::Manager* manager)
+	{
+
+		HTTPTransportSet(manager);
+	}
+}
diff --git a/src/ext/http/rtc.conf b/src/ext/http/rtc.conf
@@ -0,0 +1,10 @@
+logger.enable: YES
+logger.log_level: DEBUG
+#logger.file_name: stdout
+
+manager.modules.load_path:./,../../../src/ext/http/Release/
+manager.preload.modules: HTTPTransport.dll
+corba.http.certificate_authority_file:root.crt
+corba.http.key_file:server.pem
+corba.http.key_file_password:password
+corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		static Advanced_Resource_Factory "-ORBProtocolFactory SHMIOP_Factory -ORBProtocolFactory IIOP_Factory -ORBReactorType select_st"