ChangeLogTag: Tue Jan 27 12:05:13 2004 Boris Kolpackov <boris@dre.vanderbilt.edu>

5 files changed, 287 insertions, 307 deletions

diff --git a/TAO/CIAO/CIDLC/CIDLC.sln b/TAO/CIAO/CIDLC/CIDLC.sln
index 6092c161d3e..540e86456b2 100644
--- a/TAO/CIAO/CIDLC/CIDLC.sln
+++ b/TAO/CIAO/CIDLC/CIDLC.sln
@@ -1,21 +1,21 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CIDLC", "CIDLC.vcproj", "{8F2A74C0-C995-4BE2-8FD7-538F64BF98FD}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{8F2A74C0-C995-4BE2-8FD7-538F64BF98FD}.Debug.ActiveCfg = Debug|Win32
-		{8F2A74C0-C995-4BE2-8FD7-538F64BF98FD}.Debug.Build.0 = Debug|Win32
-		{8F2A74C0-C995-4BE2-8FD7-538F64BF98FD}.Release.ActiveCfg = Release|Win32
-		{8F2A74C0-C995-4BE2-8FD7-538F64BF98FD}.Release.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 8.00

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CIDLC", "CIDLC.vcproj", "{8F2A74C0-C995-4BE2-8FD7-538F64BF98FD}"

+	ProjectSection(ProjectDependencies) = postProject

+	EndProjectSection

+EndProject

+Global

+	GlobalSection(SolutionConfiguration) = preSolution

+		Debug = Debug

+		Release = Release

+	EndGlobalSection

+	GlobalSection(ProjectConfiguration) = postSolution

+		{8F2A74C0-C995-4BE2-8FD7-538F64BF98FD}.Debug.ActiveCfg = Debug|Win32

+		{8F2A74C0-C995-4BE2-8FD7-538F64BF98FD}.Debug.Build.0 = Debug|Win32

+		{8F2A74C0-C995-4BE2-8FD7-538F64BF98FD}.Release.ActiveCfg = Release|Win32

+		{8F2A74C0-C995-4BE2-8FD7-538F64BF98FD}.Release.Build.0 = Release|Win32

+	EndGlobalSection

+	GlobalSection(ExtensibilityGlobals) = postSolution

+	EndGlobalSection

+	GlobalSection(ExtensibilityAddIns) = postSolution

+	EndGlobalSection

+EndGlobal

diff --git a/TAO/CIAO/CIDLC/CIDLC.vcproj b/TAO/CIAO/CIDLC/CIDLC.vcproj
index 2c5ed2644a8..85d8341f650 100644
--- a/TAO/CIAO/CIDLC/CIDLC.vcproj
+++ b/TAO/CIAO/CIDLC/CIDLC.vcproj
@@ -1,229 +1,199 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="CIDLC"
-	ProjectGUID="{8F2A74C0-C995-4BE2-8FD7-538F64BF98FD}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../bin"
-			IntermediateDirectory="$(ProjectDir)/Debug"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4290 /wd4800 /wd4250 /wd4355"
-				Optimization="0"
-				AdditionalIncludeDirectories="../CCF"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				ForceConformanceInForLoopScope="TRUE"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="CompilerElements.lib CodeGenerationKit.lib IDL2.lib IDL3.lib CIDL.lib libboost_filesystem_debug.lib libboost_regex_debug.lib"
-				OutputFile="$(OutDir)/cidlc.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="../CCF/CCF/CompilerElements;../CCF/CCF/CodeGenerationKit;../CCF/CCF/IDL2;../CCF/CCF/IDL3;../CCF/CCF/CIDL"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/CIDLC.pdb"
-				SubSystem="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ProjectDir)"
-			IntermediateDirectory="$(ProjectDir)/Release"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4290 /wd4800 /wd4250 /wd4355"
-				AdditionalIncludeDirectories="../CCF"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="4"
-				ForceConformanceInForLoopScope="TRUE"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="CompilerElements.lib CodeGenerationKit.lib IDL2.lib IDL3.lib CIDL.lib"
-				OutputFile="$(OutDir)/CIDLC.exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="../CCF/CCF/CompilerElements;../CCF/CCF/CodeGenerationKit;../CCF/CCF/IDL2;../CCF/CCF/IDL3;../CCF/CCF/CIDL"
-				GenerateDebugInformation="TRUE"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath=".\cidlc.cpp">
-			</File>
-			<File
-				RelativePath=".\DescriptorGenerator.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\ExecutorMappingGenerator.cpp">
-			</File>
-			<File
-				RelativePath=".\RepositoryIdGenerator.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\ServantGenerator.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\ServantHeaderGenerator.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\ServantSourceGenerator.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\SizeTypeCalculator.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\TypeNameEmitter.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath=".\Collectors.hpp">
-			</File>
-			<File
-				RelativePath=".\DescriptorGenerator.hpp">
-			</File>
-			<File
-				RelativePath=".\ExecutorMappingGenerator.hpp">
-			</File>
-			<File
-				RelativePath=".\Literals.hpp">
-			</File>
-			<File
-				RelativePath=".\RepositoryIdGenerator.hpp">
-			</File>
-			<File
-				RelativePath=".\ServantGenerator.hpp">
-			</File>
-			<File
-				RelativePath=".\ServantHeaderGenerator.hpp">
-			</File>
-			<File
-				RelativePath=".\ServantSourceGenerator.hpp">
-			</File>
-			<File
-				RelativePath=".\SizeTypeCalculator.hpp">
-			</File>
-			<File
-				RelativePath=".\TypeNameEmitter.hpp">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="7.10"

+	Name="CIDLC"

+	ProjectGUID="{8F2A74C0-C995-4BE2-8FD7-538F64BF98FD}"

+	Keyword="Win32Proj">

+	<Platforms>

+		<Platform

+			Name="Win32"/>

+	</Platforms>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="../bin"

+			IntermediateDirectory="$(ProjectDir)/Debug"

+			ConfigurationType="1"

+			CharacterSet="2">

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalOptions="/wd4290 /wd4800 /wd4250 /wd4355"

+				Optimization="0"

+				AdditionalIncludeDirectories="../CCF"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_REGEX_NO_LIB;BOOST_REGEX_STATIC_LINK"

+				MinimalRebuild="TRUE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				ForceConformanceInForLoopScope="TRUE"

+				RuntimeTypeInfo="TRUE"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="FALSE"

+				DebugInformationFormat="4"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="CompilerElements.lib CodeGenerationKit.lib IDL2.lib IDL3.lib CIDL.lib libboost_filesystem_debug.lib libboost_regex_debug.lib"

+				OutputFile="$(OutDir)/cidlc.exe"

+				LinkIncremental="2"

+				AdditionalLibraryDirectories="../CCF/CCF/CompilerElements;../CCF/CCF/CodeGenerationKit;../CCF/CCF/IDL2;../CCF/CCF/IDL3;../CCF/CCF/CIDL"

+				GenerateDebugInformation="TRUE"

+				ProgramDatabaseFile="$(OutDir)/CIDLC.pdb"

+				SubSystem="1"

+				TargetMachine="1"/>

+			<Tool

+				Name="VCMIDLTool"/>

+			<Tool

+				Name="VCPostBuildEventTool"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"/>

+			<Tool

+				Name="VCWebDeploymentTool"/>

+			<Tool

+				Name="VCManagedWrapperGeneratorTool"/>

+			<Tool

+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="$(ProjectDir)"

+			IntermediateDirectory="$(ProjectDir)/Release"

+			ConfigurationType="1"

+			CharacterSet="2">

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalOptions="/wd4290 /wd4800 /wd4250 /wd4355"

+				AdditionalIncludeDirectories="../CCF"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				RuntimeLibrary="4"

+				ForceConformanceInForLoopScope="TRUE"

+				RuntimeTypeInfo="TRUE"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="FALSE"

+				DebugInformationFormat="3"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="CompilerElements.lib CodeGenerationKit.lib IDL2.lib IDL3.lib CIDL.lib"

+				OutputFile="$(OutDir)/CIDLC.exe"

+				LinkIncremental="1"

+				AdditionalLibraryDirectories="../CCF/CCF/CompilerElements;../CCF/CCF/CodeGenerationKit;../CCF/CCF/IDL2;../CCF/CCF/IDL3;../CCF/CCF/CIDL"

+				GenerateDebugInformation="TRUE"

+				SubSystem="1"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				TargetMachine="1"/>

+			<Tool

+				Name="VCMIDLTool"/>

+			<Tool

+				Name="VCPostBuildEventTool"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"/>

+			<Tool

+				Name="VCWebDeploymentTool"/>

+			<Tool

+				Name="VCManagedWrapperGeneratorTool"/>

+			<Tool

+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

+			<File

+				RelativePath=".\cidlc.cpp">

+			</File>

+			<File

+				RelativePath=".\DescriptorGenerator.cpp">

+			</File>

+			<File

+				RelativePath=".\ExecutorMappingGenerator.cpp">

+			</File>

+			<File

+				RelativePath=".\RepositoryIdGenerator.cpp">

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="TRUE">

+					<Tool

+						Name="VCCLCompilerTool"/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath=".\ServantGenerator.cpp">

+			</File>

+			<File

+				RelativePath=".\ServantHeaderGenerator.cpp">

+			</File>

+			<File

+				RelativePath=".\ServantSourceGenerator.cpp">

+			</File>

+			<File

+				RelativePath=".\SizeTypeCalculator.cpp">

+			</File>

+			<File

+				RelativePath=".\TypeNameEmitter.cpp">

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl;inc;xsd"

+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

+			<File

+				RelativePath=".\Collectors.hpp">

+			</File>

+			<File

+				RelativePath=".\DescriptorGenerator.hpp">

+			</File>

+			<File

+				RelativePath=".\ExecutorMappingGenerator.hpp">

+			</File>

+			<File

+				RelativePath=".\Literals.hpp">

+			</File>

+			<File

+				RelativePath=".\RepositoryIdGenerator.hpp">

+			</File>

+			<File

+				RelativePath=".\ServantGenerator.hpp">

+			</File>

+			<File

+				RelativePath=".\ServantHeaderGenerator.hpp">

+			</File>

+			<File

+				RelativePath=".\ServantSourceGenerator.hpp">

+			</File>

+			<File

+				RelativePath=".\SizeTypeCalculator.hpp">

+			</File>

+			<File

+				RelativePath=".\TypeNameEmitter.hpp">

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 39ea387bf5a..f16d975282d 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,15 @@
+Tue Jan 27 12:05:13 2004  Boris Kolpackov  <boris@dre.vanderbilt.edu>
+
+	* examples/Hello/Sender/Sender_exec.cpp:
+	* examples/Hello/Sender/Sender_exec.h:
+
+	  New EI-less implementation.
+
+	* CIDLC/CIDLC.sln:
+        * CIDLC/CIDLC.vcproj:
+
+	  Updated projects to compile with boost out-of-the-box.
+
 Tue Jan 27 11:33:39 2004  Tao Lu  <lu@dre.vanderbilt.edu>
 
 	* examples/Hello/Sender/Sender_exec.h:
diff --git a/TAO/CIAO/examples/Hello/Sender/Sender_exec.cpp b/TAO/CIAO/examples/Hello/Sender/Sender_exec.cpp
index 4ef08db81eb..f25fbf82530 100644
--- a/TAO/CIAO/examples/Hello/Sender/Sender_exec.cpp
+++ b/TAO/CIAO/examples/Hello/Sender/Sender_exec.cpp
@@ -7,25 +7,24 @@
 
 #include "Sender_exec.h"
 
-void
-MyImpl::message_impl::set_message (const char * message)
-{
-  message_ = CORBA::string_dup(message);
-}
-
-char *
+// message_impl
+//
+//
+char*
 MyImpl::message_impl::get_message (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "Sender sending out message. \n"));
-  //return CORBA::string_dup(this->message_.in ());
-  return CORBA::string_dup (this->message_.in ());
+  ACE_DEBUG ((LM_DEBUG, "Sender sending out message. \n"));
+
+  return CORBA::string_dup (component_.message_.in ());
 }
 
+
+// Sender_exec_i
+//
+//
 MyImpl::Sender_exec_i::~Sender_exec_i ()
 {
-  delete message_impl_i;
 }
 
 void
@@ -48,8 +47,7 @@ Hello::CCM_message_ptr
 MyImpl::Sender_exec_i::get_push_message (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  //return Hello::CCM_message::_duplicate (this);
-  return Hello::CCM_message::_duplicate(this->message_impl_i);
+  return new message_impl (*this);
 }
 
 
@@ -59,12 +57,9 @@ MyImpl::Sender_exec_i::start (ACE_ENV_SINGLE_ARG_DECL)
 {
   Hello::timeout_var event = new OBV_Hello::timeout;
 
-  ACE_DEBUG ((LM_DEBUG,
-              "Sender initiates the process.\n"));
+  ACE_DEBUG ((LM_DEBUG, "Sender initiates the process.\n"));
 
-  this->context_->push_click_out (event
-                                       ACE_ENV_ARG_PARAMETER);
-  return;
+  this->context_->push_click_out (event ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -112,6 +107,9 @@ MyImpl::Sender_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 
+// SenderHome_exec_i
+//
+//
 MyImpl::SenderHome_exec_i::SenderHome_exec_i ()
 {
 }
@@ -128,7 +126,9 @@ MyImpl::SenderHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL)
   return new MyImpl::Sender_exec_i;
 }
 
-
+//
+//
+//
 extern "C" SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr
 createSenderHome_Impl (void)
 {
diff --git a/TAO/CIAO/examples/Hello/Sender/Sender_exec.h b/TAO/CIAO/examples/Hello/Sender/Sender_exec.h
index 1920ba0aac4..1ea19063fe2 100644
--- a/TAO/CIAO/examples/Hello/Sender/Sender_exec.h
+++ b/TAO/CIAO/examples/Hello/Sender/Sender_exec.h
@@ -17,28 +17,6 @@
 
 namespace MyImpl
 {
-
-
-  class message_impl :
-    public virtual Hello::CCM_message,
-    public virtual TAO_Local_RefCounted_Object
-  {
-  public:
-    message_impl () : message_ ("Default Message") {}
-
-    message_impl (const char* message_ptr)
-      : message_ (message_ptr) {}
-
-    virtual char *
-    get_message (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    void set_message (const char * message);
-
-  private:
-    CORBA::String_var message_;
-  };
-
   /**
    * @class Sender_exec_i
    *
@@ -46,19 +24,23 @@ namespace MyImpl
    */
 
   class SENDER_EXEC_Export Sender_exec_i :
-      public virtual Hello::Sender_Exec,
-      public virtual TAO_Local_RefCounted_Object  {
+      public virtual Hello::CCM_Sender,
+      public virtual Component::SessionComponent,
+      public virtual TAO_Local_RefCounted_Object
+  {
 
   public:
     /// Default constructor.
     Sender_exec_i ()
-      : message_("Default Message"),
-      message_impl_i(new message_impl (message_.in() )) {}
+        : message_("Default Message")
+    {
+    }
 
     /// Secondary construction.
     Sender_exec_i (const char* local_message)
-      : message_ (local_message),
-      message_impl_i (new message_impl (message_.in() )) {}
+        : message_ (local_message)
+    {
+    }
 
     /// Default destructor.
     virtual ~Sender_exec_i ();
@@ -82,15 +64,9 @@ namespace MyImpl
     get_push_message (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    // Operation which will be called upon the interface call(by the receptacle)
-    //    virtual char *
-    //get_message (ACE_ENV_SINGLE_ARG_DECL)
-    //  ACE_THROW_SPEC ((CORBA::SystemException));
-
 
     // Operation inside of the trigger interface.
-    virtual void
-      start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Operations from Components::SessionComponent
@@ -117,7 +93,29 @@ namespace MyImpl
 
   private:
     CORBA::String_var message_;
-    message_impl * message_impl_i;
+
+    friend class message_impl;
+  };
+
+
+  //
+  //
+  //
+  class message_impl : public virtual Hello::CCM_message,
+                       public virtual TAO_Local_RefCounted_Object
+  {
+  public:
+    message_impl (Sender_exec_i& component)
+        : component_ (component)
+    {
+    }
+
+    virtual char *
+    get_message (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+  private:
+    Sender_exec_i& component_;
   };
 
   /**
@@ -134,7 +132,7 @@ namespace MyImpl
     SenderHome_exec_i ();
 
     /// Default dtor.
-    ~SenderHome_exec_i ();
+    virtual ~SenderHome_exec_i ();
 
     // Implicit home operations.