Bug#628571: Public method TAO::ORB::default_svc_conf_entries() is not exported

[Tommi Vainikainen]

Package: libtao-2.0.1
Version: 6.0.1-2
Severity: normal
Tags: patch

The document "Configuring TAO's Components" describes that one can use
static method TAO_Internal::default_svc_conf_entries() to define some
ORB defaults in source code level without external svc.conf file.

However TAO_Internal.cpp does not export this method, and thus trying
to use the method fails at linking phase.

Also the method has been moved from TAO_Internal namespace to TAO::ORB
namespace.

Attached is a patch for the issue.


-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (101, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.39-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=fi_FI.UTF-8, LC_CTYPE=fi_FI.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

diff -ur ACE_wrappers.orig//TAO/docs/configurations.html ACE_wrappers/TAO/docs/configurations.html --- ACE_wrappers.orig//TAO/docs/configurations.html 2008-06-17 16:45:08.000000000 +0300 +++ ACE_wrappers/TAO/docs/configurations.html 2011-05-30 13:00:29.000000000 +0300 @@ -696,7 +696,7 @@

If you don't want the application users to worry about setting up or knowing about svc.conf files, you can - call TAO_Internal::default_svc_conf_entries() + call TAO::ORB::default_svc_conf_entries() before calling the first ORB_init() in your program to set up the default svc.conf entries. In this case, if a TAO application cannot find a svc.conf file, it will configure TAO's @@ -713,7 +713,7 @@ svc.conf in the start-up directory will be evaluated, if one exist.

Default entries set by - TAO_Internal::default_svc_conf_entries(), if + TAO::ORB::default_svc_conf_entries(), if ones exist.

Default configuration as specified in this document. @@ -723,7 +723,7 @@ always the ones take effect. For example, if you set the entries for Resource_Factory and Server_Strategy_Factory using - TAO_Internal::default_svc_conf_entries() in a + TAO::ORB::default_svc_conf_entries() in a program and you also have a file called svc.conf which has an entry for Resource_Factory. This program will use the entry for Resource_Factory in diff -ur ACE_wrappers.orig//TAO/tao/TAO_Internal.h ACE_wrappers/TAO/tao/TAO_Internal.h --- ACE_wrappers.orig//TAO/tao/TAO_Internal.h 2010-06-02 16:52:08.000000000 +0300 +++ ACE_wrappers/TAO/tao/TAO_Internal.h 2011-05-30 12:59:43.000000000 +0300 @@ -18,6 +18,7 @@ #include /**/ "ace/pre.h" #include "tao/orbconf.h" +#include "tao/TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -76,6 +77,7 @@ * Set default @c `svc.conf' content. * This function must be called before first ORB initialization. */ + TAO_Export void default_svc_conf_entries (char const * rf_args, char const * ssf_args, char const * csf_args);