Fri Jun 17 12:47:24 UTC 2011 Marcel Smit <msmit@remedy.nl>

        * examples/Hello/step-by-step.html:
          Update. Started rewriting Assemble.

        * examples/Null_Component/Null_Component.mpc:
        * examples/Null_Component_Glfa/Null_Component.mpc:
          Let the TAO IDL compiler generate the executor files.

        * examples/Null_Component/Null_Component_exec.h:
        * examples/Null_Component/Null_Component_exec.cpp:
        * examples/Null_Component/plan.h:
        * examples/Null_Component_Glfa/Null_Component_exec.h:
        * examples/Null_Component_Glfa/Null_Component_exec.cpp:
          Removed since the TAO IDL compiler generates these files 
          on the fly.

        * examples/Philosophers:
        * examples/Philosophers/Philosophers.idl:
        * examples/Philosophers/README:
          Removed these files.

11 files changed, 37 insertions, 782 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index b89059f7202..d078a6f6932 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,25 @@
+Fri Jun 17 12:47:24 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * examples/Hello/step-by-step.html:
+          Update. Started rewriting Assemble.
+
+        * examples/Null_Component/Null_Component.mpc:
+        * examples/Null_Component_Glfa/Null_Component.mpc:
+          Let the TAO IDL compiler generate the executor files.
+
+        * examples/Null_Component/Null_Component_exec.h:
+        * examples/Null_Component/Null_Component_exec.cpp:
+        * examples/Null_Component/plan.h:
+        * examples/Null_Component_Glfa/Null_Component_exec.h:
+        * examples/Null_Component_Glfa/Null_Component_exec.cpp:
+          Removed since the TAO IDL compiler generates these files 
+          on the fly.
+
+        * examples/Philosophers:
+        * examples/Philosophers/Philosophers.idl:
+        * examples/Philosophers/README:
+          Removed these files.
+
 Fri Jun 17 12:21:03 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
         * examples/Hello/step-by-step.html:
diff --git a/CIAO/examples/Hello/step-by-step.html b/CIAO/examples/Hello/step-by-step.html
index 0fcd3649d0a..992a4c44a3a 100644
--- a/CIAO/examples/Hello/step-by-step.html
+++ b/CIAO/examples/Hello/step-by-step.html
@@ -228,31 +228,17 @@ build the simplest case only, which is 1 Receiver and 1 Sender. If you
 are interested in CIAO you could try 1 Sender with multiple
 Receivers. However, you need to change the Sender.idl to make it
 <em>publishes</em> timeout event instead of <em>emits</em> event.<br>
-Note: Creating the deployment plan descriptor is a tedious and
-    error-prone job, you can download <a
-    href="http://www.dre.vanderbilt.edu/cosmic">CoSMIC</a> to assist
-    you in this step. <P>
-
-<UL>
-<li>You need to create an XML descriptor file to describe your <em>deployment plan</em>, which is
-	defined in a <EM>Deployment Plan Descriptor</EM> (.cdp) (see <a href="./descriptors/DeploymentPlan.cdp">Hello deployment plan<a>).
-	In this file, you need to declaratively specify how the component assembly is constructed. Specificly, you need to specify
-	the component types, component instances, component connections, implementation artifact descriptions, and whether you
-  want to register component instances with naming service.<P>
-
-<li> Please make sure that the Modified_Deployment.xsd and XMI.xsd files are in the Hello/descriptors directory.
-The former file can be found in $CIAO_ROOT/docs/schema directory. <P>
-
-<li> Create the <em>NodeManagerMap.cdd</em> file containing the CORBALOC IIOP address of each <code>NodeManager</code>
-     where it is running. Please refer to the existing <a href="./descriptors/NodeManagerMap.cdd">
-     <code>NodeManagerMap.cdd</code></a> for details. Alwyas use for the property name "edu.vanderbilt.dre.DAnCE.StringIOR" and for the
-     resourceType "edu.vanderbilt.dre.DAnCE.NodeAddress".
-     As you can see, we only specify 2 <code>NodeManagers</code>, which means these two components
-     will be installed in the different <code>NodeApplication</code> server. Please refer to the
-     <em>flattened_deploymentplan.cdp</em> file to see how a deployer
-     could specify the mapping between components and nodes.</li>
-</li>
-</UL>
+Note: Creating the deployment plan descriptor is a tedious and error-prone job,
+you can download <a href="http://www.dre.vanderbilt.edu/cosmic">CoSMIC</a> to
+assist you in this step.
+<br/><br/>
+You need to create an XML descriptor file to describe your <em>deployment plan</em>,
+which is defined in a <em>Deployment Plan Descriptor</em> (.cdp)
+(see <a href="./descriptors/DeploymentPlan.cdp">Hello deployment plan<a>).
+In this file, you need to declaratively specify how the component assembly is
+constructed. Specificly, you need to specify the component types, component instances,
+component connections, implementation artifact descriptions, and whether you
+want to register component instances with naming service.
 
 <hr>
 
diff --git a/CIAO/examples/Null_Component/Null_Component.mpc b/CIAO/examples/Null_Component/Null_Component.mpc
index d0bfec4ee74..c30a953737c 100644
--- a/CIAO/examples/Null_Component/Null_Component.mpc
+++ b/CIAO/examples/Null_Component/Null_Component.mpc
@@ -12,7 +12,8 @@ project(Null_Component_idl_gen) : componentidldefaults {
               -Wb,exec_export_macro=NULL_COMPONENT_EXEC_Export \
               -Wb,exec_export_include=Null_Component_exec_export.h \
               -Wb,svnt_export_macro=NULL_COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Null_Component_svnt_export.h
+              -Wb,svnt_export_include=Null_Component_svnt_export.h \
+              -Gex
 
   IDL_Files {
     Null_Component.idl
diff --git a/CIAO/examples/Null_Component/Null_Component_exec.cpp b/CIAO/examples/Null_Component/Null_Component_exec.cpp
deleted file mode 100644
index 7fb0db8c876..00000000000
--- a/CIAO/examples/Null_Component/Null_Component_exec.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.6
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- *       http://doc.ece.uci.edu/
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.cs.wustl.edu/~schmidt/TAO.html
- **/
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:1278
-
-#include "Null_Component_exec.h"
-
-namespace CIAO_Null_Component_Impl
-{
-  //============================================================
-  // Facet Executor Implementation Class: Null_Interface_exec_i
-  //============================================================
-
-  Null_Interface_exec_i::Null_Interface_exec_i (void)
-  {
-  }
-
-  Null_Interface_exec_i::~Null_Interface_exec_i (void)
-  {
-  }
-
-  // Operations from ::Null_Interface
-
-  void
-  Null_Interface_exec_i::null_operation (void)
-  {
-    /* Your code here. */
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Null_Component_exec_i
-  //============================================================
-
-  Null_Component_exec_i::Null_Component_exec_i (void)
-  {
-  }
-
-  Null_Component_exec_i::~Null_Component_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::CCM_Null_Interface_ptr
-  Null_Component_exec_i::get_null_facet (void)
-  {
-    /* Your code here. */
-    return ::CCM_Null_Interface::_nil ();
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Null_Component_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::CCM_Null_Component_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Null_Component_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Null_Component_exec_i::ccm_activate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Null_Component_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Null_Component_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" NULL_COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Null_Component_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Null_Component_exec_i);
-
-    return retval;
-  }
-}
-
-namespace CIAO_Null_Component_Impl
-{
-  //============================================================
-  // Home Executor Implementation Class: Null_ComponentHome_exec_i
-  //============================================================
-
-  Null_ComponentHome_exec_i::Null_ComponentHome_exec_i (void)
-  {
-  }
-
-  Null_ComponentHome_exec_i::~Null_ComponentHome_exec_i (void)
-  {
-  }
-
-  // All operations and attributes.
-
-  // Factory operations.
-
-  // Finder operations.
-
-  // Implicit operations.
-
-  ::Components::EnterpriseComponent_ptr
-  Null_ComponentHome_exec_i::create (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_THROW_EX (
-      retval,
-      Null_Component_exec_i,
-      ::CORBA::NO_MEMORY ());
-
-    return retval;
-  }
-
-  extern "C" NULL_COMPONENT_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Null_ComponentHome_Impl (void)
-  {
-    ::Components::HomeExecutorBase_ptr retval =
-      ::Components::HomeExecutorBase::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Null_ComponentHome_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/examples/Null_Component/Null_Component_exec.h b/CIAO/examples/Null_Component/Null_Component_exec.h
deleted file mode 100644
index d6019544528..00000000000
--- a/CIAO/examples/Null_Component/Null_Component_exec.h
+++ /dev/null
@@ -1,140 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.6
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- *       http://doc.ece.uci.edu/
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.cs.wustl.edu/~schmidt/TAO.html
- **/
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:1217
-
-#ifndef CIAO_NULL_COMPONENT_EXEC_H_
-#define CIAO_NULL_COMPONENT_EXEC_H_
-
-
-#include "Null_ComponentEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Null_Component_exec_export.h"
-#include "tao/LocalObject.h"
-
-
-namespace CIAO_Null_Component_Impl
-{
-  // TAO_IDL - Generated from
-  // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_component/facet_exh.cpp:58
-
-  class NULL_COMPONENT_EXEC_Export Null_Interface_exec_i
-    : public virtual ::CCM_Null_Interface,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Null_Interface_exec_i (void);
-    virtual ~Null_Interface_exec_i (void);
-
-    // Operations and attributes from Null_Interface
-
-    // TAO_IDL - Generated from
-    // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42
-
-    virtual void
-    null_operation (void);
-  };
-
-  class NULL_COMPONENT_EXEC_Export Null_Component_exec_i
-    : public virtual Null_Component_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Null_Component_exec_i (void);
-    virtual ~Null_Component_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-
-    virtual ::CCM_Null_Interface_ptr
-    get_null_facet (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-
-  private:
-    ::CCM_Null_Component_Context_var context_;
-  };
-
-  extern "C" NULL_COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Null_Component_Impl (void);
-}
-
-namespace CIAO_Null_Component_Impl
-{
-  class NULL_COMPONENT_EXEC_Export Null_ComponentHome_exec_i
-    : public virtual Null_ComponentHome_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Null_ComponentHome_exec_i (void);
-
-    virtual ~Null_ComponentHome_exec_i (void);
-
-    // All operations and attributes.
-
-    // Factory operations.
-
-    // Finder operations.
-
-    // Implicit operations.
-
-    virtual ::Components::EnterpriseComponent_ptr
-    create (void);
-  };
-
-  extern "C" NULL_COMPONENT_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Null_ComponentHome_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/examples/Null_Component/plan.h b/CIAO/examples/Null_Component/plan.h
deleted file mode 100644
index 6f29a6e2aab..00000000000
--- a/CIAO/examples/Null_Component/plan.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// $Id$
-
-#include "Session_Container.h"
-
-extern "C"
-::Components::HomeExecutorBase_ptr create_Null_ComponentHome_Impl (void);
-
-extern "C"
-::PortableServer::Servant create_Null_ComponentHome_Servant (
-  ::Components::HomeExecutorBase_ptr p,
-  ::CIAO::Session_Container *c,
-  const char*);
-
-struct HomeAttributes
-{
-  char const * component_instance_name_;
-  /// Specify the entrypoint to component executor DLL.
-  char const * executor_entrypt_;
-  ::CIAO::HomeFactory executor_fptr_;
-  /// Specify the entrypoint to component servant DLL.
-  char const * servant_entrypt_;
-  ::CIAO::ServantFactory servant_fptr_;
-};
-
-/// Homes
-HomeAttributes homes_table[] =
-{
-  {
-    "Null_Component.ComponentImplementations.Null_Assembly_Container."
-    "Null_Assembly.Null_Component",
-    "create_Null_ComponentHome_Impl",
-    create_Null_ComponentHome_Impl,
-    "create_Null_ComponentHome_Servant",
-    create_Null_ComponentHome_Servant
-  }
-};
-
diff --git a/CIAO/examples/Null_Component_Glfa/Null_Component.mpc b/CIAO/examples/Null_Component_Glfa/Null_Component.mpc
index 3350cf5cb15..6ac1fa4cd13 100644
--- a/CIAO/examples/Null_Component_Glfa/Null_Component.mpc
+++ b/CIAO/examples/Null_Component_Glfa/Null_Component.mpc
@@ -11,7 +11,8 @@ project(Null_Component_Glfa_idl_gen) : componentidldefaults {
               -Wb,exec_export_macro=NULL_COMPONENT_EXEC_Export \
               -Wb,exec_export_include=Null_Component_exec_export.h \
               -Wb,svnt_export_macro=NULL_COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Null_Component_svnt_export.h
+              -Wb,svnt_export_include=Null_Component_svnt_export.h \
+              -Gex
 
   IDL_Files {
     Null_Component.idl
diff --git a/CIAO/examples/Null_Component_Glfa/Null_Component_exec.cpp b/CIAO/examples/Null_Component_Glfa/Null_Component_exec.cpp
deleted file mode 100644
index 7fb0db8c876..00000000000
--- a/CIAO/examples/Null_Component_Glfa/Null_Component_exec.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.6
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- *       http://doc.ece.uci.edu/
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.cs.wustl.edu/~schmidt/TAO.html
- **/
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:1278
-
-#include "Null_Component_exec.h"
-
-namespace CIAO_Null_Component_Impl
-{
-  //============================================================
-  // Facet Executor Implementation Class: Null_Interface_exec_i
-  //============================================================
-
-  Null_Interface_exec_i::Null_Interface_exec_i (void)
-  {
-  }
-
-  Null_Interface_exec_i::~Null_Interface_exec_i (void)
-  {
-  }
-
-  // Operations from ::Null_Interface
-
-  void
-  Null_Interface_exec_i::null_operation (void)
-  {
-    /* Your code here. */
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Null_Component_exec_i
-  //============================================================
-
-  Null_Component_exec_i::Null_Component_exec_i (void)
-  {
-  }
-
-  Null_Component_exec_i::~Null_Component_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::CCM_Null_Interface_ptr
-  Null_Component_exec_i::get_null_facet (void)
-  {
-    /* Your code here. */
-    return ::CCM_Null_Interface::_nil ();
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Null_Component_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::CCM_Null_Component_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Null_Component_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Null_Component_exec_i::ccm_activate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Null_Component_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Null_Component_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" NULL_COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Null_Component_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Null_Component_exec_i);
-
-    return retval;
-  }
-}
-
-namespace CIAO_Null_Component_Impl
-{
-  //============================================================
-  // Home Executor Implementation Class: Null_ComponentHome_exec_i
-  //============================================================
-
-  Null_ComponentHome_exec_i::Null_ComponentHome_exec_i (void)
-  {
-  }
-
-  Null_ComponentHome_exec_i::~Null_ComponentHome_exec_i (void)
-  {
-  }
-
-  // All operations and attributes.
-
-  // Factory operations.
-
-  // Finder operations.
-
-  // Implicit operations.
-
-  ::Components::EnterpriseComponent_ptr
-  Null_ComponentHome_exec_i::create (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_THROW_EX (
-      retval,
-      Null_Component_exec_i,
-      ::CORBA::NO_MEMORY ());
-
-    return retval;
-  }
-
-  extern "C" NULL_COMPONENT_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Null_ComponentHome_Impl (void)
-  {
-    ::Components::HomeExecutorBase_ptr retval =
-      ::Components::HomeExecutorBase::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Null_ComponentHome_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/examples/Null_Component_Glfa/Null_Component_exec.h b/CIAO/examples/Null_Component_Glfa/Null_Component_exec.h
deleted file mode 100644
index d6019544528..00000000000
--- a/CIAO/examples/Null_Component_Glfa/Null_Component_exec.h
+++ /dev/null
@@ -1,140 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.6
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- *       http://doc.ece.uci.edu/
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.cs.wustl.edu/~schmidt/TAO.html
- **/
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:1217
-
-#ifndef CIAO_NULL_COMPONENT_EXEC_H_
-#define CIAO_NULL_COMPONENT_EXEC_H_
-
-
-#include "Null_ComponentEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Null_Component_exec_export.h"
-#include "tao/LocalObject.h"
-
-
-namespace CIAO_Null_Component_Impl
-{
-  // TAO_IDL - Generated from
-  // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_component/facet_exh.cpp:58
-
-  class NULL_COMPONENT_EXEC_Export Null_Interface_exec_i
-    : public virtual ::CCM_Null_Interface,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Null_Interface_exec_i (void);
-    virtual ~Null_Interface_exec_i (void);
-
-    // Operations and attributes from Null_Interface
-
-    // TAO_IDL - Generated from
-    // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42
-
-    virtual void
-    null_operation (void);
-  };
-
-  class NULL_COMPONENT_EXEC_Export Null_Component_exec_i
-    : public virtual Null_Component_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Null_Component_exec_i (void);
-    virtual ~Null_Component_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-
-    virtual ::CCM_Null_Interface_ptr
-    get_null_facet (void);
-    //@}
-
-    //@{
-    /** Operations from Components::SessionComponent. */
-
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-
-  private:
-    ::CCM_Null_Component_Context_var context_;
-  };
-
-  extern "C" NULL_COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Null_Component_Impl (void);
-}
-
-namespace CIAO_Null_Component_Impl
-{
-  class NULL_COMPONENT_EXEC_Export Null_ComponentHome_exec_i
-    : public virtual Null_ComponentHome_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Null_ComponentHome_exec_i (void);
-
-    virtual ~Null_ComponentHome_exec_i (void);
-
-    // All operations and attributes.
-
-    // Factory operations.
-
-    // Finder operations.
-
-    // Implicit operations.
-
-    virtual ::Components::EnterpriseComponent_ptr
-    create (void);
-  };
-
-  extern "C" NULL_COMPONENT_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Null_ComponentHome_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/examples/Philosophers/Philosophers.idl b/CIAO/examples/Philosophers/Philosophers.idl
deleted file mode 100644
index 7a29bc03c23..00000000000
--- a/CIAO/examples/Philosophers/Philosophers.idl
+++ /dev/null
@@ -1,75 +0,0 @@
-// $Id$
-
-// The famous Dining Philosopher example in CCM tutorial slides
-
-module Example
-{
-  exception InUse {};
-
-  interface Fork
-  /**
-   * Provided facet interface definition.
-   * It should be defined by the IDL file.
-   */
-  {
-    void get () raises (InUse);
-
-    void release ();
-  };
-
-  component ForkManager
-  {
-    provides Fork the_fork;
-  };
-
-  home ForkHome manages ForkManager
-  {
-  };
-
-  enum PhilosopherState
-    {
-      EATING,
-      THINKING,
-      HUNGRY,
-      STARVING,
-      DEAD
-    };
-
-  eventtype StatusInfo
-  {
-      public string name;
-      public PhilosopherState state;
-      public unsigned long ticks_since_last_meal;
-      public boolean has_left_fork;
-      public boolean has_right_fork;
-  };
-
-  component Philosopher
-  {
-    attribute string name;
-
-    // The left fork receptacle.
-    uses Fork left;
-
-    // The right fork receptacle.
-    uses Fork right;
-
-    // The status info event source.
-    publishes StatusInfo info;
-  };
-
-  home PhilosopherHome manages Philosopher
-  {
-    factory new (in string name);
-  };
-
-  component Observer
-  {
-    // The status info sink port.
-    consumes StatusInfo info;
-  };
-
-  home ObserverHome manages Observer
-  {
-  };
-};
diff --git a/CIAO/examples/Philosophers/README b/CIAO/examples/Philosophers/README
deleted file mode 100644
index 96a56e61b73..00000000000
--- a/CIAO/examples/Philosophers/README
+++ /dev/null
@@ -1 +0,0 @@
-This example is unfinished.
\ No newline at end of file